Skip to content

Commit

Permalink
Teuchos: throw exception at duplicate YAML names
Browse files Browse the repository at this point in the history 
[trilinos#2306]
  • Loading branch information
@ibaned
ibaned committed Feb 27, 2018
1 parent 16a74fd commit 29def6b
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 39 deletions.
79 changes: 40 additions & 39 deletions packages/teuchos/parameterlist/src/Teuchos_YamlParser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,14 @@ struct Scalar {
}
return STRING;
}
bool operator==(Scalar const&) const { return false; }
};

bool operator==(PLPair const&, PLPair const&) { return false; }
std::ostream& operator<<(std::ostream& os, PLPair const&) { return os; }

bool operator==(Scalar const&, Scalar const&) { return false; }
std::ostream& operator<<(std::ostream& os, Scalar const&) { return os; }
void safe_set_entry(ParameterList& list, std::string const& name_in, ParameterEntry const& entry_in) {
TEUCHOS_TEST_FOR_EXCEPTION(list.isParameter(name_in), ParserFail,
"Parameter \"" << name_in << "\" already exists in list \"" << list.name() << "\"\n");
list.setEntry(name_in, entry_in);
}

namespace YAMLParameterList {

Expand Down Expand Up @@ -277,8 +278,8 @@ class Reader : public Teuchos::Reader {
break;
}
case Teuchos::YAML::PROD_BMAP_FSEQ: {
TEUCHOS_ASSERT(rhs.at(4).type() == typeid(Array<Scalar>) ||
rhs.at(4).type() == typeid(Array<Array<Scalar> >));
TEUCHOS_ASSERT(rhs.at(4).type() == typeid(std::vector<Scalar>) ||
rhs.at(4).type() == typeid(std::vector<std::vector<Scalar>>));
int scalar_type = interpret_tag(rhs.at(3));
map_item(result_any, rhs.at(0), rhs.at(4), scalar_type);
break;
Expand Down Expand Up @@ -328,12 +329,12 @@ class Reader : public Teuchos::Reader {
}
case Teuchos::YAML::PROD_FSEQ: {
swap(result_any, rhs.at(2));
TEUCHOS_ASSERT(result_any.type() == typeid(Array<Scalar>) ||
result_any.type() == typeid(Array<Array<Scalar> >));
TEUCHOS_ASSERT(result_any.type() == typeid(std::vector<Scalar>) ||
result_any.type() == typeid(std::vector<std::vector<Scalar>>));
break;
}
case Teuchos::YAML::PROD_FSEQ_EMPTY: {
result_any = Array<Scalar>();
result_any = std::vector<Scalar>();
break;
}
case Teuchos::YAML::PROD_FSEQ_FIRST: {
Expand Down Expand Up @@ -599,14 +600,14 @@ class Reader : public Teuchos::Reader {
ParameterList& list = make_any_ref<ParameterList>(result_any);
TEUCHOS_ASSERT(!first_item.empty());
PLPair& pair = any_ref_cast<PLPair>(first_item);
list.setEntry(pair.key, pair.value);
safe_set_entry(list, pair.key, pair.value);
}
void map_next_item(any& result_any, any& items, any& next_item) {
using std::swap;
swap(result_any, items);
ParameterList& list = any_ref_cast<ParameterList>(result_any);
PLPair& pair = any_ref_cast<PLPair>(next_item);
list.setEntry(pair.key, pair.value);
safe_set_entry(list, pair.key, pair.value);
}
void map_item(any& result_any, any& key_any, any& value_any, int scalar_type = -1) {
using std::swap;
Expand Down Expand Up @@ -675,8 +676,8 @@ class Reader : public Teuchos::Reader {
} else {
value_any = scalar_value.text;
}
} else if (value_any.type() == typeid(Array<Scalar>)) {
Array<Scalar>& scalars = any_ref_cast<Array<Scalar> >(value_any);
} else if (value_any.type() == typeid(std::vector<Scalar>)) {
std::vector<Scalar>& scalars = any_ref_cast<std::vector<Scalar> >(value_any);
if (scalar_type == -1) {
if (scalars.size() == 0) {
throw ParserFail("implicitly typed arrays can't be empty\n"
Expand All @@ -685,31 +686,31 @@ class Reader : public Teuchos::Reader {
/* Teuchos::Array uses std::vector but doesn't account for std::vector<bool>,
so it can't store bools */
scalar_type = Scalar::INT;
for (Teuchos_Ordinal i = 0; i < scalars.size(); ++i) {
for (std::size_t i = 0; i < scalars.size(); ++i) {
scalar_type = std::min(scalar_type, scalars[i].infer_type());
}
}
if (scalar_type == Scalar::INT) {
Array<int> result(scalars.size());
for (Teuchos_Ordinal i = 0; i < scalars.size(); ++i) {
for (std::size_t i = 0; i < scalars.size(); ++i) {
result[i] = parse_as<int>(scalars[i].text);
}
value_any = result;
} else if (scalar_type == Scalar::DOUBLE) {
Array<double> result(scalars.size());
for (Teuchos_Ordinal i = 0; i < scalars.size(); ++i) {
for (std::size_t i = 0; i < scalars.size(); ++i) {
result[i] = parse_as<double>(scalars[i].text);
}
value_any = result;
} else if (scalar_type == Scalar::STRING) {
Array<std::string> result(scalars.size());
for (Teuchos_Ordinal i = 0; i < scalars.size(); ++i) {
for (std::size_t i = 0; i < scalars.size(); ++i) {
result[i] = scalars[i].text;
}
value_any = result;
}
} else if (value_any.type() == typeid(Array<Array<Scalar> >)) {
Array<Array<Scalar> >& scalars = any_ref_cast<Array<Array<Scalar> > >(value_any);
} else if (value_any.type() == typeid(std::vector<std::vector<Scalar>>)) {
std::vector<std::vector<Scalar>>& scalars = any_ref_cast<std::vector<std::vector<Scalar>> >(value_any);
if (scalar_type == -1) {
if (scalars.size() == 0) {
throw ParserFail("implicitly typed 2D arrays can't be empty\n"
Expand All @@ -718,40 +719,40 @@ class Reader : public Teuchos::Reader {
/* Teuchos::Array uses std::vector but doesn't account for std::vector<bool>,
so it can't store bools */
scalar_type = Scalar::INT;
for (Teuchos_Ordinal i = 0; i < scalars.size(); ++i) {
for (std::size_t i = 0; i < scalars.size(); ++i) {
if (scalars[0].size() == 0) {
throw ParserFail("implicitly typed 2D arrays can't have empty rows\n"
"(need to determine their element type)\n");
}
if (scalars[i].size() != scalars[0].size()) {
throw ParserFail("2D array: sub-arrays are different sizes");
}
for (Teuchos_Ordinal j = 0; j < scalars[i].size(); ++j) {
for (std::size_t j = 0; j < scalars[i].size(); ++j) {
int item_type = scalars[i][j].infer_type();
scalar_type = std::min(scalar_type, item_type);
}
}
}
if (scalar_type == Scalar::INT) {
TwoDArray<int> result(scalars.size(), scalars[0].size());
for (Teuchos_Ordinal i = 0; i < scalars.size(); ++i) {
for (Teuchos_Ordinal j = 0; j < scalars[0].size(); ++j) {
for (std::size_t i = 0; i < scalars.size(); ++i) {
for (std::size_t j = 0; j < scalars[0].size(); ++j) {
result(i, j) = parse_as<int>(scalars[i][j].text);
}
}
value_any = result;
} else if (scalar_type == Scalar::DOUBLE) {
TwoDArray<double> result(scalars.size(), scalars[0].size());
for (Teuchos_Ordinal i = 0; i < scalars.size(); ++i) {
for (Teuchos_Ordinal j = 0; j < scalars[0].size(); ++j) {
for (std::size_t i = 0; i < scalars.size(); ++i) {
for (std::size_t j = 0; j < scalars[0].size(); ++j) {
result(i, j) = parse_as<double>(scalars[i][j].text);
}
}
value_any = result;
} else if (scalar_type == Scalar::STRING) {
TwoDArray<std::string> result(scalars.size(), scalars[0].size());
for (Teuchos_Ordinal i = 0; i < scalars.size(); ++i) {
for (Teuchos_Ordinal j = 0; j < scalars[0].size(); ++j) {
for (std::size_t i = 0; i < scalars.size(); ++i) {
for (std::size_t j = 0; j < scalars[0].size(); ++j) {
result(i, j) = scalars[i][j].text;
}
}
Expand All @@ -776,14 +777,14 @@ class Reader : public Teuchos::Reader {
void seq_first_item(any& result_any, any& first_any) {
using std::swap;
if (first_any.type() == typeid(Scalar)) {
Array<Scalar>& a = make_any_ref<Array<Scalar> >(result_any);
std::vector<Scalar>& a = make_any_ref<std::vector<Scalar> >(result_any);
Scalar& v = any_ref_cast<Scalar>(first_any);
a.push_back(Scalar());
swap(a.back(), v);
} else if (first_any.type() == typeid(Array<Scalar>)) {
Array<Array<Scalar> >& a = make_any_ref<Array<Array<Scalar> > >(result_any);
Array<Scalar>& v = any_ref_cast<Array<Scalar> >(first_any);
a.push_back(Array<Scalar>());
} else if (first_any.type() == typeid(std::vector<Scalar>)) {
std::vector<std::vector<Scalar>>& a = make_any_ref<std::vector<std::vector<Scalar>> >(result_any);
std::vector<Scalar>& v = any_ref_cast<std::vector<Scalar> >(first_any);
a.push_back(std::vector<Scalar>());
swap(a.back(), v);
} else {
throw Teuchos::ParserFail(
Expand All @@ -793,15 +794,15 @@ class Reader : public Teuchos::Reader {
void seq_next_item(any& result_any, any& items, any& next_item) {
using std::swap;
swap(result_any, items);
if (result_any.type() == typeid(Array<Scalar>)) {
Array<Scalar>& a = any_ref_cast<Array<Scalar> >(result_any);
if (result_any.type() == typeid(std::vector<Scalar>)) {
std::vector<Scalar>& a = any_ref_cast<std::vector<Scalar> >(result_any);
Scalar& val = any_ref_cast<Scalar>(next_item);
a.push_back(Scalar());
swap(a.back(), val);
} else if (result_any.type() == typeid(Array<Array<Scalar> >)) {
Array<Array<Scalar> >& a = any_ref_cast<Array<Array<Scalar> > >(result_any);
Array<Scalar>& v = any_ref_cast<Array<Scalar> >(next_item);
a.push_back(Array<Scalar>());
} else if (result_any.type() == typeid(std::vector<std::vector<Scalar>>)) {
std::vector<std::vector<Scalar>>& a = any_ref_cast<std::vector<std::vector<Scalar>> >(result_any);
std::vector<Scalar>& v = any_ref_cast<std::vector<Scalar> >(next_item);
a.push_back(std::vector<Scalar>());
swap(a.back(), v);
} else {
throw Teuchos::ParserFail(
Expand Down
12 changes: 12 additions & 0 deletions packages/teuchos/parameterlist/test/yaml/YamlParameterList.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,5 +245,17 @@ namespace TeuchosTests
"ES_POTENTIAL= factor*log(r_sq) +3*xin-3*yin;\n");
}

TEUCHOS_UNIT_TEST(YAML, Issue2306)
{
// ensure that duplicate names throw an exception
TEST_THROW(Teuchos::getParametersFromYamlString(
"Foo:\n"
" Bar:\n"
" Value: 1\n"
" Bar:\n"
" Value: 2\n"),
Teuchos::ParserFail);
}

} //namespace TeuchosTests

0 comments on commit 29def6b

Please sign in to comment.