Improve YAML parsing of quoted numbers (#1583)

See: sourcemeta/jsonschema#241
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

src/core/yaml/yaml.cc

@@ -1,6 +1,6 @@
 #include <sourcemeta/core/yaml.h>
 
-#include <sstream>     // std::ostringstream
+#include <sstream>     // std::ostringstream, std::istringstream
 #include <string_view> // std::string_view
 
 // See https://pyyaml.org/wiki/LibYAML for basic documentation
@@ -21,9 +21,24 @@ static auto yaml_node_to_json(yaml_node_t *const node,
           reinterpret_cast<char *>(node->data.scalar.value),
           node->data.scalar.length};
 
+      if (node->data.scalar.style == YAML_SINGLE_QUOTED_SCALAR_STYLE ||
+          node->data.scalar.style == YAML_DOUBLE_QUOTED_SCALAR_STYLE) {
+        return sourcemeta::core::JSON{input};
+      }
+
+      // TODO: Avoid this std::string transformation
+      std::istringstream stream{std::string{input}};
+
       try {
-        // TODO: Avoid this std::string transformation
-        return sourcemeta::core::parse_json(std::string{input});
+        auto result{sourcemeta::core::parse_json(stream)};
+
+        // If the entire input was not consumed, then we are missing
+        // something
+        if (stream.peek() != std::char_traits<char>::eof()) {
+          return sourcemeta::core::JSON{input};
+        }
+
+        return result;
         // Looks like it is very hard in YAML, given a scalar value, to
         // determine whether it is a string or something else without attempting
         // to parsing it and potentially failing to do so

test/yaml/yaml_parse_test.cc

@@ -12,6 +12,13 @@ TEST(YAML_parse, scalar_1) {
   EXPECT_EQ(result, expected);
 }
 
+TEST(YAML_parse, scalar_2) {
+  const std::string input{"   1    "};
+  const auto result{sourcemeta::core::parse_yaml(input)};
+  const sourcemeta::core::JSON expected{1};
+  EXPECT_EQ(result, expected);
+}
+
 TEST(YAML_parse, object_1) {
   const std::string input{"hello: world\nfoo: 1\nbar: true"};
 
@@ -38,6 +45,66 @@ TEST(YAML_parse, object_2) {
   EXPECT_EQ(result, expected);
 }
 
+TEST(YAML_parse, object_3) {
+  const std::string input{"version: \"1.29.2\""};
+
+  const auto result{sourcemeta::core::parse_yaml(input)};
+
+  const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
+    "version": "1.29.2"
+  })JSON");
+
+  EXPECT_EQ(result, expected);
+}
+
+TEST(YAML_parse, object_4) {
+  const std::string input{"version: \'1.29.2\'"};
+
+  const auto result{sourcemeta::core::parse_yaml(input)};
+
+  const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
+    "version": "1.29.2"
+  })JSON");
+
+  EXPECT_EQ(result, expected);
+}
+
+TEST(YAML_parse, object_5) {
+  const std::string input{"version: 1.29.2"};
+
+  const auto result{sourcemeta::core::parse_yaml(input)};
+
+  const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
+    "version": "1.29.2"
+  })JSON");
+
+  EXPECT_EQ(result, expected);
+}
+
+TEST(YAML_parse, object_6) {
+  const std::string input{"version: v1.29.2"};
+
+  const auto result{sourcemeta::core::parse_yaml(input)};
+
+  const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
+    "version": "v1.29.2"
+  })JSON");
+
+  EXPECT_EQ(result, expected);
+}
+
+TEST(YAML_parse, object_7) {
+  const std::string input{"version: 1.29v"};
+
+  const auto result{sourcemeta::core::parse_yaml(input)};
+
+  const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
+    "version": "1.29v"
+  })JSON");
+
+  EXPECT_EQ(result, expected);
+}
+
 TEST(YAML_parse, array_1) {
   const std::string input{"- foo\n- true"};