Upgrade Core to 375cdcacefe7f8bedb038c761fce1802e4954244 (#441)

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

Author: jviotti

DEPENDENCIES

@@ -1,3 +1,3 @@
 vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
-core https://github.com/sourcemeta/core 1aa4a617548bf482420e8757ecd10308cddae7a2
+core https://github.com/sourcemeta/core 375cdcacefe7f8bedb038c761fce1802e4954244
 jsonschema-test-suite https://github.com/json-schema-org/JSON-Schema-Test-Suite bc919bdb266a4949f8a2425f2f540371604d82b4

src/compiler/compile.cc

@@ -108,14 +108,12 @@ auto compile(const sourcemeta::core::JSON &schema,
              const std::optional<std::string> &default_dialect) -> Template {
   assert(is_schema(schema));
 
-  const std::string base{sourcemeta::core::URI{
+  const std::string base{sourcemeta::core::URI::canonicalize(
       sourcemeta::core::identify(
           schema, resolver,
           sourcemeta::core::SchemaIdentificationStrategy::Strict,
           default_dialect)
-          .value_or("")}
-                             .canonicalize()
-                             .recompose()};
+          .value_or(""))};
 
   assert(frame.locations().contains(
       {sourcemeta::core::SchemaReferenceType::Static, base}));
@@ -137,7 +135,7 @@ auto compile(const sourcemeta::core::JSON &schema,
       sourcemeta::core::empty_pointer,
       schema,
       vocabularies(schema, resolver, root_frame_entry.dialect),
-      sourcemeta::core::URI{root_frame_entry.base}.canonicalize().recompose(),
+      sourcemeta::core::URI::canonicalize(root_frame_entry.base),
       {},
       {}};
 
@@ -295,7 +293,7 @@ auto compile(const Context &context, const SchemaContext &schema_context,
   // Determine URI of the destination after recursion
   const std::string destination{
       uri.has_value()
-          ? sourcemeta::core::URI{uri.value()}.canonicalize().recompose()
+          ? sourcemeta::core::URI::canonicalize(uri.value())
           : to_uri(schema_context.relative_pointer.concat(schema_suffix),
                    schema_context.base)
                 .canonicalize()

src/compiler/compile_helpers.h

@@ -31,9 +31,9 @@ inline auto property_relative_dynamic_context() -> DynamicContext {
 
 inline auto schema_resource_id(const Context &context,
                                const std::string &resource) -> std::size_t {
-  const auto iterator{
-      std::find(context.resources.cbegin(), context.resources.cend(),
-                sourcemeta::core::URI{resource}.canonicalize().recompose())};
+  const auto iterator{std::find(context.resources.cbegin(),
+                                context.resources.cend(),
+                                sourcemeta::core::URI::canonicalize(resource))};
   if (iterator == context.resources.cend()) {
     assert(resource.empty());
     return 0;

test/evaluator/evaluator_draft4_test.cc

@@ -2119,12 +2119,12 @@ TEST(Evaluator_draft4, patternProperties_11) {
                      "#/patternProperties", "");
   EVALUATE_TRACE_PRE(1, AssertionTypeStrict, "/patternProperties/^[a-z]+$/type",
                      // Note that the caret needs to be URI escaped
-                     "#/patternProperties/%5E%5Ba-z%5D%2B$/type", "/foo");
+                     "#/patternProperties/%5E%5Ba-z%5D+$/type", "/foo");
 
   EVALUATE_TRACE_POST_SUCCESS(
       0, AssertionTypeStrict, "/patternProperties/^[a-z]+$/type",
       // Note that the caret needs to be URI escaped
-      "#/patternProperties/%5E%5Ba-z%5D%2B$/type", "/foo");
+      "#/patternProperties/%5E%5Ba-z%5D+$/type", "/foo");
   EVALUATE_TRACE_POST_SUCCESS(1, LoopPropertiesRegexClosed,
                               "/patternProperties", "#/patternProperties", "");
 
@@ -2153,14 +2153,14 @@ TEST(Evaluator_draft4, patternProperties_11_exhaustive) {
                      "#/patternProperties", "");
   EVALUATE_TRACE_PRE(1, AssertionTypeStrict, "/patternProperties/^[a-z]+$/type",
                      // Note that the caret needs to be URI escaped
-                     "#/patternProperties/%5E%5Ba-z%5D%2B$/type", "/foo");
+                     "#/patternProperties/%5E%5Ba-z%5D+$/type", "/foo");
   EVALUATE_TRACE_PRE(2, LoopPropertiesExcept, "/additionalProperties",
                      "#/additionalProperties", "");
 
   EVALUATE_TRACE_POST_SUCCESS(
       0, AssertionTypeStrict, "/patternProperties/^[a-z]+$/type",
       // Note that the caret needs to be URI escaped
-      "#/patternProperties/%5E%5Ba-z%5D%2B$/type", "/foo");
+      "#/patternProperties/%5E%5Ba-z%5D+$/type", "/foo");
   EVALUATE_TRACE_POST_SUCCESS(1, LoopPropertiesRegex, "/patternProperties",
                               "#/patternProperties", "");
   EVALUATE_TRACE_POST_SUCCESS(2, LoopPropertiesExcept, "/additionalProperties",
@@ -2196,12 +2196,12 @@ TEST(Evaluator_draft4, patternProperties_12) {
     EVALUATE_TRACE_PRE(1, AssertionTypeStrict,
                        "/patternProperties/^[a-z]+$/type",
                        // Note that the caret needs to be URI escaped
-                       "#/patternProperties/%5E%5Ba-z%5D%2B$/type", "/foo");
+                       "#/patternProperties/%5E%5Ba-z%5D+$/type", "/foo");
 
     EVALUATE_TRACE_POST_SUCCESS(
         0, AssertionTypeStrict, "/patternProperties/^[a-z]+$/type",
         // Note that the caret needs to be URI escaped
-        "#/patternProperties/%5E%5Ba-z%5D%2B$/type", "/foo");
+        "#/patternProperties/%5E%5Ba-z%5D+$/type", "/foo");
     EVALUATE_TRACE_POST_FAILURE(1, LoopPropertiesRegexClosed,
                                 "/patternProperties", "#/patternProperties",
                                 "");