Upgrade Core to 47ba2307b9bfab9fb378386207b3172c97ed1363 (#875)

Signed-off-by: Juan Cruz Viotti <[email protected]>
sourcemeta · Jan 30, 2025 · 5fb659a · 5fb659a
1 parent 8863c4c
commit 5fb659a
Show file tree

Hide file tree

Showing 30 changed files with 291 additions and 203 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -1,3 +1,3 @@
 vendorpull https://github.com/sourcemeta/vendorpull 70342aaf458e6cb80baeb5b718901075fc42ede6
-core https://github.com/sourcemeta/core 1257bcddc2797de7c95dedefebf6c2fb1e00717a
+core https://github.com/sourcemeta/core 47ba2307b9bfab9fb378386207b3172c97ed1363
 bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e
diff --git a/src/compiler/include/sourcemeta/jsonbinpack/compiler.h b/src/compiler/include/sourcemeta/jsonbinpack/compiler.h
@@ -41,7 +41,7 @@ namespace sourcemeta::jsonbinpack {
 ///
 /// sourcemeta::jsonbinpack::compile(
 ///     schema, sourcemeta::core::schema_official_walker,
-///     sourcemeta::core::official_resolver);
+///     sourcemeta::core::schema_official_resolver);
 ///
 /// sourcemeta::core::prettify(schema, std::cout);
 /// std::cout << std::endl;
@@ -74,7 +74,7 @@ auto compile(sourcemeta::core::JSON &schema,
 ///
 /// sourcemeta::jsonbinpack::canonicalize(
 ///     schema, sourcemeta::core::schema_official_walker,
-///     sourcemeta::core::official_resolver);
+///     sourcemeta::core::schema_official_resolver);
 ///
 /// sourcemeta::core::prettify(schema, std::cout);
 /// std::cout << std::endl;

diff --git a/test/compiler/2020_12_canonicalizer_any_test.cc b/test/compiler/2020_12_canonicalizer_any_test.cc
@@ -13,7 +13,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, if_without_then_else_1) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -35,7 +35,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, then_else_without_if_1) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -59,7 +59,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, duplicate_allof_branches_1) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -84,7 +84,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, duplicate_allof_branches_2) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -116,7 +116,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, duplicate_allof_branches_3) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -141,7 +141,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, duplicate_anyof_branches_1) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -166,7 +166,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, duplicate_anyof_branches_2) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -198,7 +198,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, duplicate_anyof_branches_3) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -219,7 +219,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, type_union_anyof_1) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -248,7 +248,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, type_union_anyof_2) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -282,7 +282,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, type_union_anyof_3) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -315,7 +315,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, implicit_type_union_1) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -354,7 +354,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, boolean_schema_1) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       "https://json-schema.org/draft/2020-12/schema");
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
@@ -393,7 +393,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, boolean_schema_2) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver,
+      sourcemeta::core::schema_official_resolver,
       "https://json-schema.org/draft/2020-12/schema");
 
   const sourcemeta::core::JSON expected{false};

diff --git a/test/compiler/2020_12_canonicalizer_array_test.cc b/test/compiler/2020_12_canonicalizer_array_test.cc
@@ -13,7 +13,7 @@ TEST(JSONBinPack_Canonicalizer_Array_2020_12, max_contains_without_contains_1) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -34,7 +34,7 @@ TEST(JSONBinPack_Canonicalizer_Array_2020_12, max_contains_without_contains_2) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -59,7 +59,7 @@ TEST(JSONBinPack_Canonicalizer_Array_2020_12, min_contains_without_contains_1) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -80,7 +80,7 @@ TEST(JSONBinPack_Canonicalizer_Array_2020_12, min_contains_without_contains_2) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -107,7 +107,7 @@ TEST(JSONBinPack_Canonicalizer_Array_2020_12, unsatisfiable_max_contains_1) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -132,7 +132,7 @@ TEST(JSONBinPack_Canonicalizer_Array_2020_12, implicit_array_lower_bound_1) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -153,7 +153,7 @@ TEST(JSONBinPack_Canonicalizer_Array_2020_12, drop_non_array_keywords_1) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",

diff --git a/test/compiler/2020_12_canonicalizer_boolean_test.cc b/test/compiler/2020_12_canonicalizer_boolean_test.cc
@@ -12,7 +12,7 @@ TEST(JSONBinPack_Canonicalizer_Boolean_2020_12, type_boolean) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -32,7 +32,7 @@ TEST(JSONBinPack_Canonicalizer_Boolean_2020_12, drop_non_boolean_keywords_1) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -52,7 +52,7 @@ TEST(JSONBinPack_Canonicalizer_Boolean_2020_12, drop_non_boolean_keywords_2) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -71,7 +71,7 @@ TEST(JSONBinPack_Canonicalizer_Boolean_2020_12, drop_non_boolean_keywords_3) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",

diff --git a/test/compiler/2020_12_canonicalizer_null_test.cc b/test/compiler/2020_12_canonicalizer_null_test.cc
@@ -14,7 +14,7 @@ TEST(JSONBinPack_Canonicalizer_Null_2020_12, drop_non_null_keywords_1) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -34,7 +34,7 @@ TEST(JSONBinPack_Canonicalizer_Null_2020_12, drop_non_null_keywords_2) {
 
   sourcemeta::jsonbinpack::canonicalize(
       schema, sourcemeta::core::schema_official_walker,
-      sourcemeta::core::official_resolver);
+      sourcemeta::core::schema_official_resolver);
 
   const auto expected = sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",