Update JSON Toolkit to fc68c8a8

Signed-off-by: Juan Cruz Viotti <[email protected]>

DEPENDENCIES

@@ -1,5 +1,5 @@
 vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
 noa https://github.com/sourcemeta/noa 7e26abce7a4e31e86a16ef2851702a56773ca527
-jsontoolkit https://github.com/sourcemeta/jsontoolkit 2b5158f237584fff7e35d520c2e5a722d01fd678
+jsontoolkit https://github.com/sourcemeta/jsontoolkit fc68c8a8a30f8f7dfc5468589aa39745115aeb26
 hydra https://github.com/sourcemeta/hydra 3c53d3fdef79e9ba603d48470a508cc45472a0dc
 alterschema https://github.com/sourcemeta/alterschema a31722f04ae2d7e57f2fe5bbb0613670866c0840

src/command_compile.cc

@@ -23,8 +23,7 @@ auto sourcemeta::jsonschema::cli::compile(
   const auto compiled_schema{sourcemeta::jsontoolkit::compile(
       schema, sourcemeta::jsontoolkit::default_schema_walker,
       resolver(options, options.contains("h") || options.contains("http")),
-      sourcemeta::jsontoolkit::default_schema_compiler,
-      sourcemeta::jsontoolkit::SchemaCompilerCompilationMode::Optimized)};
+      sourcemeta::jsontoolkit::default_schema_compiler)};
 
   const sourcemeta::jsontoolkit::JSON result{
       sourcemeta::jsontoolkit::to_json(compiled_schema)};

src/command_metaschema.cc

@@ -37,8 +37,7 @@ auto sourcemeta::jsonschema::cli::metaschema(
     if (!cache.contains(dialect.value())) {
       const auto metaschema_template{sourcemeta::jsontoolkit::compile(
           metaschema, sourcemeta::jsontoolkit::default_schema_walker,
-          custom_resolver, sourcemeta::jsontoolkit::default_schema_compiler,
-          sourcemeta::jsontoolkit::SchemaCompilerCompilationMode::Optimized)};
+          custom_resolver, sourcemeta::jsontoolkit::default_schema_compiler)};
       cache.insert({dialect.value(), metaschema_template});
     }
 

src/command_test.cc

@@ -142,8 +142,7 @@ auto sourcemeta::jsonschema::cli::test(
     try {
       schema_template = sourcemeta::jsontoolkit::compile(
           schema.value(), sourcemeta::jsontoolkit::default_schema_walker,
-          test_resolver, sourcemeta::jsontoolkit::default_schema_compiler,
-          sourcemeta::jsontoolkit::SchemaCompilerCompilationMode::Optimized);
+          test_resolver, sourcemeta::jsontoolkit::default_schema_compiler);
     } catch (const sourcemeta::jsontoolkit::SchemaReferenceError &error) {
       if (error.location().empty() && error.id() == schema_uri.recompose()) {
         std::cout << "\n";

src/command_validate.cc

@@ -50,8 +50,7 @@ auto sourcemeta::jsonschema::cli::validate(
   const auto benchmark{options.contains("b") || options.contains("benchmark")};
   const auto schema_template{sourcemeta::jsontoolkit::compile(
       schema, sourcemeta::jsontoolkit::default_schema_walker, custom_resolver,
-      sourcemeta::jsontoolkit::default_schema_compiler,
-      sourcemeta::jsontoolkit::SchemaCompilerCompilationMode::Optimized)};
+      sourcemeta::jsontoolkit::default_schema_compiler)};
 
   bool result{true};
 

test/compile/pass_1.sh

@@ -21,21 +21,21 @@ EOF
 cat << 'EOF' > "$TMP/expected.json"
 [
   {
-    "category": "logical",
-    "type": "and",
-    "value": null,
+    "category": "loop",
+    "type": "properties-match",
+    "value": {
+      "category": "value",
+      "type": "named-indexes",
+      "value": {
+        "foo": 0
+      }
+    },
     "schemaResource": "",
     "absoluteKeywordLocation": "#/properties",
     "relativeSchemaLocation": "/properties",
     "relativeInstanceLocation": "",
-    "target": {
-      "category": "target",
-      "type": "instance",
-      "location": ""
-    },
     "report": true,
     "dynamic": false,
-    "condition": [],
     "children": [
       {
         "category": "logical",
@@ -45,36 +45,8 @@ cat << 'EOF' > "$TMP/expected.json"
         "absoluteKeywordLocation": "#/properties",
         "relativeSchemaLocation": "",
         "relativeInstanceLocation": "",
-        "target": {
-          "category": "target",
-          "type": "instance",
-          "location": ""
-        },
         "report": false,
         "dynamic": false,
-        "condition": [
-          {
-            "category": "assertion",
-            "type": "defines",
-            "value": {
-              "category": "value",
-              "type": "string",
-              "value": "foo"
-            },
-            "schemaResource": "",
-            "absoluteKeywordLocation": "#/properties",
-            "relativeSchemaLocation": "",
-            "relativeInstanceLocation": "",
-            "target": {
-              "category": "target",
-              "type": "instance",
-              "location": ""
-            },
-            "report": false,
-            "dynamic": false,
-            "condition": []
-          }
-        ],
         "children": [
           {
             "category": "assertion",
@@ -88,14 +60,8 @@ cat << 'EOF' > "$TMP/expected.json"
             "absoluteKeywordLocation": "#/properties/foo/type",
             "relativeSchemaLocation": "/foo/type",
             "relativeInstanceLocation": "/foo",
-            "target": {
-              "category": "target",
-              "type": "instance",
-              "location": ""
-            },
             "report": true,
-            "dynamic": false,
-            "condition": []
+            "dynamic": false
           }
         ]
       }