Teuchos: improve support for bool parsing

trilinos · Jan 18, 2024 · 492d668 · 492d668
1 parent 9eddcb7
commit 492d668
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 9 deletions.
diff --git a/packages/teuchos/parameterlist/src/Teuchos_YamlParser.cpp b/packages/teuchos/parameterlist/src/Teuchos_YamlParser.cpp
@@ -1339,18 +1339,29 @@ void processKeyValueNode(const std::string& key, const ::YAML::Node& node, Teuch
         }
         catch(...)
         {
-          std::string raw_string = quoted_as<std::string>(node);
-          if(raw_string == "true" || raw_string == "yes")
-          {
-            safe_set_entry<bool>(parent, key, true);
-          }
-          else if(raw_string == "false" || raw_string == "no")
+          try
           {
-            safe_set_entry<bool>(parent, key, false);
+            bool raw_bool = quoted_as<bool>(node);
+
+            /* yaml-cpp parses ON/OFF as a bool, but the in-house parser does not.
+               To preserve backwards compatibility, make sure the string passes
+               the in-house parser's is_parseable_as<bool> function (which protects
+               against the ON/OFF case).
+               Otherwise, a failure is observed in YAML_ConvertFromXML unit test.*/
+
+            std::string raw_string = quoted_as<std::string>(node);
+            if (is_parseable_as<bool>(raw_string))
+            {
+              safe_set_entry<bool>(parent, key, raw_bool);
+            }
+            else
+            {
+              safe_set_entry<std::string>(parent, key, raw_string);
+            }
           }
-          else
+          catch(...)
           {
-            safe_set_entry<std::string>(parent, key, raw_string);
+            safe_set_entry<std::string>(parent, key, quoted_as<std::string>(node));
           }
         }
       }

diff --git a/packages/teuchos/parameterlist/test/yaml/YamlParameterList.cpp b/packages/teuchos/parameterlist/test/yaml/YamlParameterList.cpp
@@ -296,17 +296,29 @@ namespace TeuchosTests
       "List:\n"
       " input_true: true\n"
       " input_false: false\n"
+      " input_TRUE: TRUE\n"
+      " input_FALSE: FALSE\n"
+      " input_True: True\n"
+      " input_False: False\n"
       " input_yes: yes\n"
       " input_no: no\n"
     );
     TEST_EQUALITY(pl->isType<bool>("input_true"), true);
     TEST_EQUALITY(pl->isType<bool>("input_false"), true);
     TEST_EQUALITY(pl->isType<bool>("input_yes"), true);
     TEST_EQUALITY(pl->isType<bool>("input_no"), true);
+    TEST_EQUALITY(pl->isType<bool>("input_TRUE"), true);
+    TEST_EQUALITY(pl->isType<bool>("input_True"), true);
+    TEST_EQUALITY(pl->isType<bool>("input_FALSE"), true);
+    TEST_EQUALITY(pl->isType<bool>("input_False"), true);
     TEST_EQUALITY(pl->get<bool>("input_true"), true);
     TEST_EQUALITY(pl->get<bool>("input_false"), false);
     TEST_EQUALITY(pl->get<bool>("input_yes"), true);
     TEST_EQUALITY(pl->get<bool>("input_no"), false);
+    TEST_EQUALITY(pl->get<bool>("input_TRUE"), true);
+    TEST_EQUALITY(pl->get<bool>("input_True"), true);
+    TEST_EQUALITY(pl->get<bool>("input_FALSE"), false);
+    TEST_EQUALITY(pl->get<bool>("input_False"), false);
   }
 
   TEUCHOS_UNIT_TEST(YAML, flow_map)