Upgrade Core to 243b56e2fa8b91549008b31d2e52596e6d8c941e (#678)

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

DEPENDENCIES

@@ -1,3 +1,3 @@
 vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
-core https://github.com/sourcemeta/core 05a5080eb32ceed5bc4dd8593dd163fbda6fde7a
+core https://github.com/sourcemeta/core 243b56e2fa8b91549008b31d2e52596e6d8c941e
 jsonschema-test-suite https://github.com/json-schema-org/JSON-Schema-Test-Suite 06481b143722c8c06671bd40dcde99b422ffd531

src/output/output_standard.cc

@@ -34,13 +34,15 @@ auto handle_standard(Evaluator &evaluator, const Template &schema,
         auto unit{sourcemeta::core::JSON::make_object()};
         unit.assign_assume_new(
             "keywordLocation",
-            sourcemeta::core::to_json(annotation.first.evaluate_path));
+            sourcemeta::core::JSON{
+                sourcemeta::core::to_string(annotation.first.evaluate_path)});
         unit.assign_assume_new(
             "absoluteKeywordLocation",
             sourcemeta::core::JSON{annotation.first.schema_location});
         unit.assign_assume_new(
             "instanceLocation",
-            sourcemeta::core::to_json(annotation.first.instance_location));
+            sourcemeta::core::JSON{sourcemeta::core::to_string(
+                annotation.first.instance_location)});
 
         if (tracker != nullptr) {
           const auto position{tracker->get(sourcemeta::core::to_pointer(
@@ -67,13 +69,16 @@ auto handle_standard(Evaluator &evaluator, const Template &schema,
       auto errors{sourcemeta::core::JSON::make_array()};
       for (const auto &entry : output) {
         auto unit{sourcemeta::core::JSON::make_object()};
-        unit.assign_assume_new("keywordLocation",
-                               sourcemeta::core::to_json(entry.evaluate_path));
+        unit.assign_assume_new(
+            "keywordLocation",
+            sourcemeta::core::JSON{
+                sourcemeta::core::to_string(entry.evaluate_path)});
         unit.assign_assume_new("absoluteKeywordLocation",
                                sourcemeta::core::JSON{entry.schema_location});
         unit.assign_assume_new(
             "instanceLocation",
-            sourcemeta::core::to_json(entry.instance_location));
+            sourcemeta::core::JSON{
+                sourcemeta::core::to_string(entry.instance_location)});
 
         if (tracker != nullptr) {
           const auto position{tracker->get(

test/compiler/compiler_json_test.cc

@@ -38,8 +38,8 @@ TEST(Compiler_JSON, example_1) {
       [
         [
           11,
-          "/type",
-          "",
+          [ "type" ],
+          [],
           "#/type",
           0,
           [ 8, 4 ]
@@ -74,24 +74,24 @@ TEST(Compiler_JSON, example_2) {
       [
         [
           61,
-          "/additionalProperties",
-          "",
+          [ "additionalProperties" ],
+          [],
           "#/additionalProperties",
           0,
           [ 0 ],
           [
             [
               34,
-              "/multipleOf",
-              "",
+              [ "multipleOf" ],
+              [],
               "#/additionalProperties/multipleOf",
               0,
               [ 1, 2 ]
             ],
             [
               10,
-              "/type",
-              "",
+              [ "type" ],
+              [],
               "#/additionalProperties/type",
               0,
               [ 7, 156 ]
@@ -125,8 +125,8 @@ TEST(Compiler_JSON, example_3) {
       [
         [
           19,
-          "/pattern",
-          "",
+          [ "pattern" ],
+          [],
           "#/pattern",
           0,
           [ 9, "^f" ]
@@ -163,24 +163,24 @@ TEST(Compiler_JSON, example_4) {
       [
         [
           61,
-          "/additionalProperties",
-          "",
+          [ "additionalProperties" ],
+          [],
           "#/additionalProperties",
           1,
           [ 0 ],
           [
             [
               34,
-              "/multipleOf",
-              "",
+              [ "multipleOf" ],
+              [],
               "#/multipleOf",
               2,
               [ 1, 2 ]
             ],
             [
               10,
-              "/type",
-              "",
+              [ "type" ],
+              [],
               "#/type",
               2,
               [ 7, 156 ]
@@ -240,8 +240,8 @@ TEST(Compiler_JSON, example_5) {
       [
         [
           44,
-          "/foo%",
-          "",
+          [ "foo%" ],
+          [],
           "#/foo%25",
           1,
           [ 1, true ]
@@ -285,24 +285,24 @@ TEST(Compiler_JSON, example_6) {
       [
         [
           61,
-          "/additionalProperties",
-          "",
+          [ "additionalProperties" ],
+          [],
           "#/additionalProperties",
           1,
           [ 0 ],
           [
             [
               11,
-              "/type",
-              "",
+              [ "type" ],
+              [],
               "#/additionalProperties/type",
               1,
               [ 8, 4 ]
             ],
             [
               46,
-              "",
-              "",
+              [],
+              [],
               "#/additionalProperties",
               1,
               [ 0 ]