Upgrade Core to b97cf5b157022765ae54380bbb0b65b8b2d1792f (#776)

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

Author: jviotti

DEPENDENCIES

@@ -1,12 +1,12 @@
 vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
 uwebsockets https://github.com/uNetworking/uWebSockets v20.76.0
-core https://github.com/sourcemeta/core 3c800567cf63aea812b03d97d39adff1f9530d16
-blaze https://github.com/sourcemeta/blaze e13f882afb70da70bcfa8df2bf0374220567a61e
-jsonbinpack https://github.com/sourcemeta/jsonbinpack c9038f1ca016890cf0dc6929e668b77784f91332
+core https://github.com/sourcemeta/core b97cf5b157022765ae54380bbb0b65b8b2d1792f
+blaze https://github.com/sourcemeta/blaze 983545b134e5fcd64a5820088339699af5df9010
+jsonbinpack https://github.com/sourcemeta/jsonbinpack 73ce1ed4df479094c2876458494c8f3417fc08dc
 hydra https://github.com/sourcemeta/hydra eef9a60014ec16f00bbebb5f272522207d48a9f8
 codegen https://github.com/sourcemeta/codegen 615532845e07353c3a4a95af40d0f4ad1a03b6ec
 libdeflate https://github.com/ebiggers/libdeflate v1.25
-jsonschema https://github.com/sourcemeta/jsonschema v14.13.4
+jsonschema https://github.com/sourcemeta/jsonschema 220af0a37b98a05be34012ba6184f80e2c50900a
 bootstrap https://github.com/twbs/bootstrap v5.3.3
 bootstrap-icons https://github.com/twbs/icons v1.11.3
 collections/sourcemeta/std/v0 https://github.com/sourcemeta/std v0.4.0

src/index/generators.h

@@ -184,7 +184,9 @@ struct GENERATE_POINTER_POSITIONS {
     std::ostringstream schema_stream;
     sourcemeta::core::prettify(schema, schema_stream);
     sourcemeta::core::PointerPositionTracker tracker;
-    sourcemeta::core::parse_json(schema_stream.str(), std::ref(tracker));
+    sourcemeta::core::JSON parsed{nullptr};
+    sourcemeta::core::parse_json(schema_stream.str(), parsed,
+                                 std::ref(tracker));
     const auto result{sourcemeta::core::to_json(tracker)};
     const auto timestamp_end{std::chrono::steady_clock::now()};
     sourcemeta::one::metapack_write_pretty_json(
@@ -210,7 +212,9 @@ struct GENERATE_FRAME_LOCATIONS {
     std::ostringstream contents_stream;
     sourcemeta::core::prettify(contents, contents_stream);
     sourcemeta::core::PointerPositionTracker tracker;
-    sourcemeta::core::parse_json(contents_stream.str(), std::ref(tracker));
+    sourcemeta::core::JSON parsed{nullptr};
+    sourcemeta::core::parse_json(contents_stream.str(), parsed,
+                                 std::ref(tracker));
     sourcemeta::core::SchemaFrame frame{
         sourcemeta::core::SchemaFrame::Mode::Locations};
     frame.analyse(contents, sourcemeta::core::schema_walker,

src/index/index.cc

@@ -524,6 +524,10 @@ auto main(int argc, char *argv[]) noexcept -> int {
   } catch (const sourcemeta::one::CustomRuleError &error) {
     std::cerr << "error: " << error.what() << "\n";
     return EXIT_FAILURE;
+  } catch (const sourcemeta::blaze::LinterInvalidNamePatternError &error) {
+    std::cerr << "error: The schema rule name must match " << error.regex()
+              << "\n  at name " << error.identifier() << "\n";
+    return EXIT_FAILURE;
   } catch (const sourcemeta::blaze::LinterInvalidNameError &error) {
     std::cerr << "error: " << error.what() << "\n  at name "
               << error.identifier() << "\n";

src/server/action_jsonschema_evaluate.h

@@ -43,13 +43,14 @@ auto trace(sourcemeta::blaze::Evaluator &evaluator,
   const auto &static_locations{locations.at("static")};
 
   sourcemeta::core::PointerPositionTracker tracker;
-  const auto instance_json{
-      sourcemeta::core::parse_json(instance, std::ref(tracker))};
+  sourcemeta::core::JSON instance_json{nullptr};
+  sourcemeta::core::parse_json(instance, instance_json, std::ref(tracker));
   const auto result{evaluator.validate(
       schema_template, instance_json,
       [&steps, &tracker, &static_locations, &instance_json](
           const sourcemeta::blaze::EvaluationType type, const bool valid,
           const sourcemeta::blaze::Instruction &instruction,
+          const sourcemeta::blaze::InstructionExtra &extra,
           const sourcemeta::core::WeakPointer &evaluate_path,
           const sourcemeta::core::WeakPointer &instance_location,
           const sourcemeta::core::JSON &annotation) {
@@ -82,7 +83,7 @@ auto trace(sourcemeta::blaze::Evaluator &evaluator,
             "instancePositions",
             sourcemeta::core::to_json(std::move(instance_positions).value()));
         step.assign("keywordLocation",
-                    sourcemeta::core::to_json(instruction.keyword_location));
+                    sourcemeta::core::to_json(extra.keyword_location));
         step.assign("annotation", annotation);
 
         if (type == sourcemeta::blaze::EvaluationType::Pre) {
@@ -96,7 +97,7 @@ auto trace(sourcemeta::blaze::Evaluator &evaluator,
 
         // Determine keyword vocabulary
         const auto &current_location{
-            static_locations.at(instruction.keyword_location)};
+            static_locations.at(extra.keyword_location)};
         if (!current_location.is_object() ||
             !current_location.defines("baseDialect") ||
             !current_location.defines("dialect")) {