Upgrade Core to 47ba2307b9bfab9fb378386207b3172c97ed1363

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
sourcemeta · Jan 30, 2025 · 6441c56 · 6441c56
1 parent 6bbf79b
commit 6441c56
Show file tree

Hide file tree

Showing 39 changed files with 296 additions and 208 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -1,3 +1,3 @@
 vendorpull /~https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
-core /~https://github.com/sourcemeta/core 1257bcddc2797de7c95dedefebf6c2fb1e00717a
+core /~https://github.com/sourcemeta/core 47ba2307b9bfab9fb378386207b3172c97ed1363
 jsonschema-test-suite /~https://github.com/json-schema-org/JSON-Schema-Test-Suite 4ba013d58e747ecaf48c8bb7cf248cb0d564afbc
diff --git a/benchmark/compiler_2019_09.cc b/benchmark/compiler_2019_09.cc
@@ -15,7 +15,7 @@ static void Compiler_2019_09_OMC_JSON_V2(benchmark::State &state) {
   for (auto _ : state) {
     auto result{sourcemeta::blaze::compile(
         schema, sourcemeta::core::schema_official_walker,
-        sourcemeta::core::official_resolver,
+        sourcemeta::core::schema_official_resolver,
         sourcemeta::blaze::default_schema_compiler)};
     assert(!result.instructions.empty());
     benchmark::DoNotOptimize(result.instructions);

diff --git a/benchmark/compiler_draft6.cc b/benchmark/compiler_draft6.cc
@@ -15,7 +15,7 @@ static void Compiler_Draft6_AdaptiveCard(benchmark::State &state) {
   for (auto _ : state) {
     auto result{sourcemeta::blaze::compile(
         schema, sourcemeta::core::schema_official_walker,
-        sourcemeta::core::official_resolver,
+        sourcemeta::core::schema_official_resolver,
         sourcemeta::blaze::default_schema_compiler)};
     assert(!result.instructions.empty());
     benchmark::DoNotOptimize(result.instructions);

diff --git a/benchmark/evaluator_2019_09.cc b/benchmark/evaluator_2019_09.cc
@@ -35,7 +35,7 @@ static void Evaluator_2019_09_Unevaluated_Properties(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {
@@ -56,7 +56,7 @@ static void Evaluator_2019_09_OMC_JSON_V2_1(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {

diff --git a/benchmark/evaluator_2020_12.cc b/benchmark/evaluator_2020_12.cc
@@ -59,7 +59,7 @@ static void Evaluator_2020_12_Dynamic_Ref(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {
@@ -86,7 +86,7 @@ static void Evaluator_2020_12_Dynamic_Ref_Single(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {
@@ -107,7 +107,7 @@ static void Evaluator_2020_12_CQL_1(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {
@@ -128,7 +128,7 @@ static void Evaluator_2020_12_OpenAPI(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {

diff --git a/benchmark/evaluator_draft4.cc b/benchmark/evaluator_draft4.cc
@@ -18,10 +18,10 @@ static void Evaluator_Draft4_Meta_1_No_Callback(benchmark::State &state) {
   })JSON")};
 
   const auto metaschema{sourcemeta::core::metaschema(
-      schema, sourcemeta::core::official_resolver)};
+      schema, sourcemeta::core::schema_official_resolver)};
   const auto metaschema_template{sourcemeta::blaze::compile(
       metaschema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
 
   sourcemeta::blaze::Evaluator evaluator;
@@ -101,7 +101,7 @@ static void Evaluator_Draft4_Required_Properties(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
 
   sourcemeta::blaze::Evaluator evaluator;
@@ -152,7 +152,7 @@ static void Evaluator_Draft4_Many_Optional_Properties_Minimal_Match(
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
 
   sourcemeta::blaze::Evaluator evaluator;
@@ -203,7 +203,7 @@ static void Evaluator_Draft4_Few_Optional_Properties_Minimal_Match(
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
 
   sourcemeta::blaze::Evaluator evaluator;
@@ -281,7 +281,7 @@ static void Evaluator_Draft4_Items_Schema(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
 
   sourcemeta::blaze::Evaluator evaluator;
@@ -417,7 +417,7 @@ static void Evaluator_Draft4_Nested_Object(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
 
   sourcemeta::blaze::Evaluator evaluator;
@@ -460,7 +460,7 @@ Evaluator_Draft4_Properties_Triad_Optional(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
 
   sourcemeta::blaze::Evaluator evaluator;
@@ -504,7 +504,7 @@ Evaluator_Draft4_Properties_Triad_Required(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
 
   sourcemeta::blaze::Evaluator evaluator;
@@ -543,7 +543,7 @@ static void Evaluator_Draft4_Properties_Triad_Closed(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
 
   sourcemeta::blaze::Evaluator evaluator;
@@ -589,7 +589,7 @@ static void Evaluator_Draft4_Properties_Closed(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
 
   sourcemeta::blaze::Evaluator evaluator;
@@ -634,7 +634,7 @@ static void Evaluator_Draft4_Non_Recursive_Ref(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
 
   sourcemeta::blaze::Evaluator evaluator;
@@ -674,7 +674,7 @@ static void Evaluator_Draft4_Pattern_Properties_True(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
 
   sourcemeta::blaze::Evaluator evaluator;
@@ -732,7 +732,7 @@ static void Evaluator_Draft4_Ref_To_Single_Property(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
 
   sourcemeta::blaze::Evaluator evaluator;
@@ -781,7 +781,7 @@ Evaluator_Draft4_Additional_Properties_Type(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
 
   sourcemeta::blaze::Evaluator evaluator;
@@ -823,7 +823,7 @@ static void Evaluator_Draft4_Nested_Oneof(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {
@@ -843,7 +843,7 @@ static void Evaluator_Draft4_Short_Enum(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {
@@ -905,7 +905,7 @@ static void Evaluator_Draft4_Long_Enum(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {
@@ -967,7 +967,7 @@ static void Evaluator_Draft4_Long_Enum_Short_Strings(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {
@@ -987,7 +987,7 @@ static void Evaluator_Draft4_Type_Object(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {

diff --git a/benchmark/evaluator_draft6.cc b/benchmark/evaluator_draft6.cc
@@ -47,7 +47,7 @@ static void Evaluator_Draft6_Property_Names(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {

diff --git a/benchmark/evaluator_draft7.cc b/benchmark/evaluator_draft7.cc
@@ -30,7 +30,7 @@ static void Evaluator_Draft7_If_Then_Else(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {
@@ -51,7 +51,7 @@ static void Evaluator_Draft7_Vercel_1(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {
@@ -72,7 +72,7 @@ static void Evaluator_Draft7_Helm_Chart_Lock_1(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {
@@ -93,7 +93,7 @@ static void Evaluator_Draft7_Helm_Chart_Lock_2(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {
@@ -114,7 +114,7 @@ static void Evaluator_Draft7_Jasmine_1(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {
@@ -135,7 +135,7 @@ static void Evaluator_Draft7_Dependabot_1(benchmark::State &state) {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   sourcemeta::blaze::Evaluator evaluator;
   for (auto _ : state) {

diff --git a/contrib/perf.cc b/contrib/perf.cc
@@ -180,7 +180,7 @@ auto main(int argc, char **argv) noexcept -> int {
 
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler,
       sourcemeta::blaze::Mode::FastValidation)};
 

diff --git a/contrib/trace.cc b/contrib/trace.cc
@@ -42,7 +42,7 @@ auto main(int argc, char **argv) noexcept -> int {
   const auto schema{sourcemeta::core::read_json(argv[1])};
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   const std::filesystem::path instance_path{argv[2]};
   const auto instance{sourcemeta::core::read_json(instance_path)};

diff --git a/contrib/validate.cc b/contrib/validate.cc
@@ -27,7 +27,7 @@ auto main(int argc, char **argv) noexcept -> int {
   const auto compile_start{std::chrono::high_resolution_clock::now()};
   const auto schema_template{sourcemeta::blaze::compile(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       sourcemeta::blaze::default_schema_compiler)};
   const auto compile_end{std::chrono::high_resolution_clock::now()};
   const auto compile_duration{

diff --git a/src/compiler/include/sourcemeta/blaze/compiler.h b/src/compiler/include/sourcemeta/blaze/compiler.h
@@ -136,7 +136,7 @@ auto SOURCEMETA_BLAZE_COMPILER_EXPORT default_schema_compiler(
 ///
 /// const auto schema_template{sourcemeta::blaze::compile(
 ///     schema, sourcemeta::core::schema_official_walker,
-///     sourcemeta::core::official_resolver,
+///     sourcemeta::core::schema_official_resolver,
 ///     sourcemeta::core::default_schema_compiler)};
 ///
 /// // Evaluate or encode

diff --git a/src/compiler/include/sourcemeta/blaze/compiler_output.h b/src/compiler/include/sourcemeta/blaze/compiler_output.h
@@ -40,7 +40,7 @@ namespace sourcemeta::blaze {
 ///
 /// const auto schema_template{sourcemeta::blaze::compile(
 ///     schema, sourcemeta::core::schema_official_walker,
-///     sourcemeta::core::official_resolver,
+///     sourcemeta::core::schema_official_resolver,
 ///     sourcemeta::core::default_schema_compiler)};
 ///
 /// const sourcemeta::core::JSON instance{5};
@@ -127,7 +127,7 @@ class SOURCEMETA_BLAZE_COMPILER_EXPORT ErrorOutput {
 ///
 /// const auto schema_template{sourcemeta::blaze::compile(
 ///     schema, sourcemeta::core::schema_official_walker,
-///     sourcemeta::core::official_resolver,
+///     sourcemeta::core::schema_official_resolver,
 ///     sourcemeta::core::default_schema_compiler)};
 ///
 /// const sourcemeta::core::JSON instance{5};

diff --git a/src/evaluator/include/sourcemeta/blaze/evaluator.h b/src/evaluator/include/sourcemeta/blaze/evaluator.h
@@ -80,7 +80,7 @@ class SOURCEMETA_BLAZE_EVALUATOR_EXPORT Evaluator {
   ///
   /// const auto schema_template{sourcemeta::blaze::compile(
   ///     schema, sourcemeta::core::schema_official_walker,
-  ///     sourcemeta::core::official_resolver,
+  ///     sourcemeta::core::schema_official_resolver,
   ///     sourcemeta::core::default_schema_compiler)};
   ///
   /// sourcemeta::blaze::Evaluator evaluator;
@@ -112,7 +112,7 @@ class SOURCEMETA_BLAZE_EVALUATOR_EXPORT Evaluator {
   ///
   /// const auto schema_template{sourcemeta::blaze::compile(
   ///     schema, sourcemeta::core::schema_official_walker,
-  ///     sourcemeta::core::official_resolver,
+  ///     sourcemeta::core::schema_official_resolver,
   ///     sourcemeta::core::default_schema_compiler)};
   ///
   /// static auto callback(