Fix conversion of quoted strings in YAML sequences

Cantera · Jul 29, 2024 · 75bb717 · 75bb717
1 parent 6a5f6a2
commit 75bb717
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/base/AnyMap.cpp b/src/base/AnyMap.cpp
@@ -135,7 +135,10 @@ Type elementTypes(const YAML::Node& node)
             types = types | Type::Sequence;
         } else if (el.IsScalar()) {
             string nodestr = el.as<string>();
-            if (isInt(nodestr)) {
+            if (el.Tag() == "!") {
+                // Prevent implicit conversion of quoted strings to numeric types
+                types = types | Type::String;
+            } else if (isInt(nodestr)) {
                 types = types | Type::Integer;
             } else if (isFloat(nodestr)) {
                 types = types | Type::Double;

diff --git a/test/general/test_containers.cpp b/test/general/test_containers.cpp
@@ -286,6 +286,17 @@ TEST(AnyMap, conversion_to_anyvalue)
     EXPECT_EQ(n.at("strings").asVector<AnyValue>()[0].asString(), "foo");
 }
 
+TEST(AnyMap, conversion_from_quoted)
+{
+    AnyMap m = AnyMap::fromYamlString(
+        "{top: '99', mixed: [5.1, '122599', '3.140'], uniform: ['99', 100.1']}");
+    EXPECT_TRUE(m["top"].is<string>());
+    EXPECT_FALSE(m["top"].is<int>());
+    EXPECT_THROW(m["mixed"].asVector<double>(), InputFileError);
+    EXPECT_DOUBLE_EQ(m["mixed"].asVector<AnyValue>()[0].asDouble(), 5.1);
+    EXPECT_THROW(m["uniform"].asVector<double>(), InputFileError);
+}
+
 TEST(AnyMap, read_subnormal)
 {
     AnyMap m = AnyMap::fromYamlString(