epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

FieldBuilder detect duplicate field names

Browse Source
This commit is contained in:
Michael Davidsaver
2017-05-12 13:24:37 -04:00
parent c5ce75888e
commit 81cdf071a8
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/factory/FieldCreateFactory.cpp
View File

@@ -730,44 +730,62 @@ FieldBuilderPtr FieldBuilder::setId(string const & id)
return shared_from_this();
}
void FieldBuilder::checkFieldName(const std::string& name)
{
// linear search on the theory that the number of fields is small
for(StringArray::const_iterator it = fieldNames.begin(), end = fieldNames.end();
it != end; ++it)
{
if(name==*it)
throw std::invalid_argument("duplicate fieldName "+name);
}
}
FieldBuilderPtr FieldBuilder::add(string const & name, ScalarType scalarType)
{
checkFieldName(name);
fields.push_back(fieldCreate->createScalar(scalarType)); fieldNames.push_back(name);
return shared_from_this();
}
FieldBuilderPtr FieldBuilder::addBoundedString(std::string const & name, std::size_t maxLength)
{
checkFieldName(name);
fields.push_back(fieldCreate->createBoundedString(maxLength)); fieldNames.push_back(name);
return shared_from_this();
}
FieldBuilderPtr FieldBuilder::add(string const & name, FieldConstPtr const & field)
{
checkFieldName(name);
fields.push_back(field); fieldNames.push_back(name);
return shared_from_this();
}
FieldBuilderPtr FieldBuilder::addArray(string const & name, ScalarType scalarType)
{
checkFieldName(name);
fields.push_back(fieldCreate->createScalarArray(scalarType)); fieldNames.push_back(name);
return shared_from_this();
}
FieldBuilderPtr FieldBuilder::addFixedArray(string const & name, ScalarType scalarType, size_t size)
{
checkFieldName(name);
fields.push_back(fieldCreate->createFixedScalarArray(scalarType, size)); fieldNames.push_back(name);
return shared_from_this();
}
FieldBuilderPtr FieldBuilder::addBoundedArray(string const & name, ScalarType scalarType, size_t size)
{
checkFieldName(name);
fields.push_back(fieldCreate->createBoundedScalarArray(scalarType, size)); fieldNames.push_back(name);
return shared_from_this();
}
FieldBuilderPtr FieldBuilder::addArray(string const & name, FieldConstPtr const & element)
{
checkFieldName(name);
switch (element->getType())
{
case structure: