Upgrade JSON Toolkit to 2e2d2042fe3cb7e7066d29847859d889b2ccab6a (#326)

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

Author: jviotti

DEPENDENCIES

@@ -1,6 +1,6 @@
 vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
 noa https://github.com/sourcemeta/noa 99f8b42d5f1a8b0f9b3c024f5957dc399bc0262f
-jsontoolkit https://github.com/sourcemeta/jsontoolkit 2fc390f4a4e568691aea62cd85bae94c5d81494d
+jsontoolkit https://github.com/sourcemeta/jsontoolkit 2e2d2042fe3cb7e7066d29847859d889b2ccab6a
 googletest https://github.com/google/googletest a7f443b80b105f940225332ed3c31f2790092f47
 googlebenchmark https://github.com/google/benchmark 378fe693a1ef51500db21b11ff05a8018c5f0e55
 jsonschema-test-suite https://github.com/json-schema-org/JSON-Schema-Test-Suite c2badb1298a8698f86dadf1aea7b44b3a894e5ac

src/compiler/compile.cc

@@ -63,7 +63,7 @@ auto precompile(
     const sourcemeta::blaze::Context &context,
     sourcemeta::blaze::SchemaContext &schema_context,
     const sourcemeta::blaze::DynamicContext &dynamic_context,
-    const sourcemeta::jsontoolkit::ReferenceFrame::value_type &entry)
+    const sourcemeta::jsontoolkit::FrameLocations::value_type &entry)
     -> sourcemeta::blaze::Instructions {
   const sourcemeta::jsontoolkit::URI anchor_uri{entry.first.second};
   const auto label{sourcemeta::blaze::Evaluator{}.hash(
@@ -115,8 +115,8 @@ auto compile(const sourcemeta::jsontoolkit::JSON &schema,
       default_dialect)};
 
   // Perform framing to resolve references later on
-  sourcemeta::jsontoolkit::ReferenceFrame frame;
-  sourcemeta::jsontoolkit::ReferenceMap references;
+  sourcemeta::jsontoolkit::FrameLocations frame;
+  sourcemeta::jsontoolkit::FrameReferences references;
   sourcemeta::jsontoolkit::frame(result, frame, references, walker, resolver,
                                  default_dialect);
 
@@ -232,7 +232,7 @@ auto compile(const sourcemeta::jsontoolkit::JSON &schema,
   std::vector<std::string> resources;
   for (const auto &entry : frame) {
     if (entry.second.type ==
-        sourcemeta::jsontoolkit::ReferenceEntryType::Resource) {
+        sourcemeta::jsontoolkit::FrameLocationType::Resource) {
       resources.push_back(entry.first.second);
     }
   }
@@ -246,6 +246,7 @@ auto compile(const sourcemeta::jsontoolkit::JSON &schema,
          std::set<std::string>(resources.cbegin(), resources.cend()).size());
 
   // Calculate the top static reference destinations for precompilation purposes
+  // TODO: Replace this logic with `.frame()` `destination_of` information
   std::map<std::string, std::size_t> static_references_count;
   for (const auto &reference : references) {
     if (reference.first.first !=
@@ -316,7 +317,7 @@ auto compile(const sourcemeta::jsontoolkit::JSON &schema,
     for (const auto &entry : frame) {
       // We are only trying to find dynamic anchors
       if (entry.second.type !=
-              sourcemeta::jsontoolkit::ReferenceEntryType::Anchor ||
+              sourcemeta::jsontoolkit::FrameLocationType::Anchor ||
           entry.first.first !=
               sourcemeta::jsontoolkit::ReferenceType::Dynamic) {
         continue;

src/compiler/compile_helpers.h

@@ -113,7 +113,7 @@ unsigned_integer_property(const sourcemeta::jsontoolkit::JSON &document,
 
 inline auto static_frame_entry(const Context &context,
                                const SchemaContext &schema_context)
-    -> const sourcemeta::jsontoolkit::ReferenceFrameEntry & {
+    -> const sourcemeta::jsontoolkit::FrameLocationsEntry & {
   const auto type{sourcemeta::jsontoolkit::ReferenceType::Static};
   const auto current{
       to_uri(schema_context.relative_pointer, schema_context.base).recompose()};

src/compiler/default_compiler_draft4.h

@@ -184,6 +184,7 @@ auto compiler_draft4_core_ref(const Context &context,
   auto new_schema_context{schema_context};
   new_schema_context.references.insert(reference.destination);
 
+  // TODO: Replace this logic with `.frame()` `destination_of` information
   std::size_t direct_children_references{0};
   if (context.frame.contains({type, reference.destination})) {
     for (const auto &reference_entry : context.references) {
@@ -197,6 +198,9 @@ auto compiler_draft4_core_ref(const Context &context,
   // If the reference is not a recursive one, we can avoid the extra
   // overhead of marking the location for future jumps, and pretty much
   // just expand the reference destination in place.
+  // TODO: Elevate the calculation required to detect recursive references
+  // to JSON Toolkit's `.frame()`
+  // See: https://github.com/sourcemeta/jsontoolkit/issues/1394
   const bool is_recursive{
       // This means the reference is directly recursive, by jumping to
       // a parent of the reference itself.

src/compiler/include/sourcemeta/blaze/compiler.h

@@ -88,9 +88,9 @@ struct Context {
   /// The root schema resource
   const sourcemeta::jsontoolkit::JSON &root;
   /// The reference frame of the entire schema
-  const sourcemeta::jsontoolkit::ReferenceFrame &frame;
+  const sourcemeta::jsontoolkit::FrameLocations &frame;
   /// The references of the entire schema
-  const sourcemeta::jsontoolkit::ReferenceMap &references;
+  const sourcemeta::jsontoolkit::FrameReferences &references;
   /// The set of all schema resources in the schema without duplicates
   const std::vector<std::string> resources;
   /// The schema walker in use