Upgrade Core to 1c2f2011df7c37543265ad5d89153189b4649013 (#902)

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

Author: jviotti

DEPENDENCIES

@@ -1,3 +1,3 @@
 vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
-core https://github.com/sourcemeta/core 376f397db98e72be48d8401e2fbf2ee96f033966
+core https://github.com/sourcemeta/core 1c2f2011df7c37543265ad5d89153189b4649013
 bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e

src/compiler/mapper/enum_8_bit.h

@@ -15,8 +15,9 @@ class Enum8Bit final : public sourcemeta::core::SchemaTransformRule {
     return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
            vocabularies.contains(sourcemeta::core::Vocabularies::Known::
                                      JSON_Schema_2020_12_Validation) &&
-           schema.defines("enum") && schema.at("enum").is_array() &&
-           !location.pointer.empty() && schema.at("enum").size() > 1 &&
+           schema.is_object() && schema.defines("enum") &&
+           schema.at("enum").is_array() && !location.pointer.empty() &&
+           schema.at("enum").size() > 1 &&
            is_byte(schema.at("enum").size() - 1);
   }
 

src/compiler/mapper/enum_8_bit_top_level.h

@@ -15,8 +15,9 @@ class Enum8BitTopLevel final : public sourcemeta::core::SchemaTransformRule {
     return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
            vocabularies.contains(sourcemeta::core::Vocabularies::Known::
                                      JSON_Schema_2020_12_Validation) &&
-           schema.defines("enum") && schema.at("enum").is_array() &&
-           location.pointer.empty() && schema.at("enum").size() > 1 &&
+           schema.is_object() && schema.defines("enum") &&
+           schema.at("enum").is_array() && location.pointer.empty() &&
+           schema.at("enum").size() > 1 &&
            is_byte(schema.at("enum").size() - 1);
   }
 

src/compiler/mapper/enum_arbitrary.h

@@ -16,8 +16,9 @@ class EnumArbitrary final : public sourcemeta::core::SchemaTransformRule {
     return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
            vocabularies.contains(sourcemeta::core::Vocabularies::Known::
                                      JSON_Schema_2020_12_Validation) &&
-           schema.defines("enum") && schema.at("enum").is_array() &&
-           !location.pointer.empty() && schema.at("enum").size() > 1 &&
+           schema.is_object() && schema.defines("enum") &&
+           schema.at("enum").is_array() && !location.pointer.empty() &&
+           schema.at("enum").size() > 1 &&
            !is_byte(schema.at("enum").size() - 1);
   }
 

src/compiler/mapper/enum_singleton.h

@@ -15,8 +15,8 @@ class EnumSingleton final : public sourcemeta::core::SchemaTransformRule {
     return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
            vocabularies.contains(sourcemeta::core::Vocabularies::Known::
                                      JSON_Schema_2020_12_Validation) &&
-           schema.defines("enum") && schema.at("enum").is_array() &&
-           schema.at("enum").size() == 1;
+           schema.is_object() && schema.defines("enum") &&
+           schema.at("enum").is_array() && schema.at("enum").size() == 1;
   }
 
   auto transform(sourcemeta::core::JSON &schema,

src/compiler/mapper/integer_bounded_8_bit.h

@@ -15,7 +15,7 @@ class IntegerBounded8Bit final : public sourcemeta::core::SchemaTransformRule {
     return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
            vocabularies.contains(sourcemeta::core::Vocabularies::Known::
                                      JSON_Schema_2020_12_Validation) &&
-           schema.defines("type") &&
+           schema.is_object() && schema.defines("type") &&
            schema.at("type").to_string() == "integer" &&
            schema.defines("minimum") && schema.defines("maximum") &&
            is_byte(schema.at("maximum").to_integer() -

src/compiler/mapper/integer_bounded_greater_than_8_bit.h

@@ -17,7 +17,7 @@ class IntegerBoundedGreaterThan8Bit final
     return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
            vocabularies.contains(sourcemeta::core::Vocabularies::Known::
                                      JSON_Schema_2020_12_Validation) &&
-           schema.defines("type") &&
+           schema.is_object() && schema.defines("type") &&
            schema.at("type").to_string() == "integer" &&
            schema.defines("minimum") && schema.defines("maximum") &&
            !is_byte(schema.at("maximum").to_integer() -

src/compiler/mapper/integer_bounded_multiplier_8_bit.h

@@ -17,7 +17,8 @@ class IntegerBoundedMultiplier8Bit final
     if (location.dialect != "https://json-schema.org/draft/2020-12/schema" ||
         !vocabularies.contains(sourcemeta::core::Vocabularies::Known::
                                    JSON_Schema_2020_12_Validation) ||
-        !schema.defines("type") || schema.at("type").to_string() != "integer" ||
+        !schema.is_object() || !schema.defines("type") ||
+        schema.at("type").to_string() != "integer" ||
         !schema.defines("minimum") || !schema.at("minimum").is_integer() ||
         !schema.defines("maximum") || !schema.at("maximum").is_integer() ||
         !schema.defines("multipleOf") ||

src/compiler/mapper/integer_bounded_multiplier_greater_than_8_bit.h

@@ -17,7 +17,8 @@ class IntegerBoundedMultiplierGreaterThan8Bit final
     if (location.dialect != "https://json-schema.org/draft/2020-12/schema" ||
         !vocabularies.contains(sourcemeta::core::Vocabularies::Known::
                                    JSON_Schema_2020_12_Validation) ||
-        !schema.defines("type") || schema.at("type").to_string() != "integer" ||
+        !schema.is_object() || !schema.defines("type") ||
+        schema.at("type").to_string() != "integer" ||
         !schema.defines("minimum") || !schema.at("minimum").is_integer() ||
         !schema.defines("maximum") || !schema.at("maximum").is_integer() ||
         !schema.defines("multipleOf") ||

src/compiler/mapper/integer_lower_bound.h

@@ -15,7 +15,7 @@ class IntegerLowerBound final : public sourcemeta::core::SchemaTransformRule {
     return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
            vocabularies.contains(sourcemeta::core::Vocabularies::Known::
                                      JSON_Schema_2020_12_Validation) &&
-           schema.defines("type") &&
+           schema.is_object() && schema.defines("type") &&
            schema.at("type").to_string() == "integer" &&
            schema.defines("minimum") && !schema.defines("maximum") &&
            !schema.defines("multipleOf");