Upgrade Core to 8fb7ba6f57bfa52ecdae83ada221e0aecc8e4e42 (#900)

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 e4d7ae9358710fc138d2afd3179db6d850e4190f
+core https://github.com/sourcemeta/core 8fb7ba6f57bfa52ecdae83ada221e0aecc8e4e42
 bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e

src/compiler/compiler.cc

@@ -23,7 +23,7 @@ namespace sourcemeta::jsonbinpack {
 auto canonicalize(sourcemeta::core::JSON &schema,
                   const sourcemeta::core::SchemaWalker &walker,
                   const sourcemeta::core::SchemaResolver &resolver,
-                  const std::optional<std::string> &default_dialect) -> void {
+                  const std::string_view default_dialect) -> void {
   sourcemeta::core::SchemaTransformer canonicalizer;
   sourcemeta::core::add(canonicalizer,
                         sourcemeta::core::AlterSchemaMode::Canonicalizer);
@@ -61,7 +61,7 @@ auto make_encoding(sourcemeta::core::JSON &document,
 auto compile(sourcemeta::core::JSON &schema,
              const sourcemeta::core::SchemaWalker &walker,
              const sourcemeta::core::SchemaResolver &resolver,
-             const std::optional<std::string> &default_dialect) -> void {
+             const std::string_view default_dialect) -> void {
   canonicalize(schema, walker, resolver, default_dialect);
 
   sourcemeta::core::SchemaTransformer mapper;
@@ -94,7 +94,7 @@ auto compile(sourcemeta::core::JSON &schema,
 
   // The "any" encoding is always the last resort
   const auto dialect{sourcemeta::core::dialect(schema)};
-  if (!dialect.has_value() || dialect.value() != ENCODING_V1) {
+  if (dialect.empty() || dialect != ENCODING_V1) {
     make_encoding(schema, "ANY_PACKED_TYPE_TAG_BYTE_PREFIX",
                   sourcemeta::core::JSON::make_object());
   }

src/compiler/include/sourcemeta/jsonbinpack/compiler.h

@@ -17,8 +17,7 @@
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
 
-#include <optional> // std::optional
-#include <string>   // std::string
+#include <string_view> // std::string_view
 
 namespace sourcemeta::jsonbinpack {
 
@@ -50,8 +49,7 @@ SOURCEMETA_JSONBINPACK_COMPILER_EXPORT
 auto compile(sourcemeta::core::JSON &schema,
              const sourcemeta::core::SchemaWalker &walker,
              const sourcemeta::core::SchemaResolver &resolver,
-             const std::optional<std::string> &default_dialect = std::nullopt)
-    -> void;
+             std::string_view default_dialect = "") -> void;
 
 /// @ingroup compiler
 ///
@@ -80,11 +78,10 @@ auto compile(sourcemeta::core::JSON &schema,
 /// std::cout << std::endl;
 /// ```
 SOURCEMETA_JSONBINPACK_COMPILER_EXPORT
-auto canonicalize(
-    sourcemeta::core::JSON &schema,
-    const sourcemeta::core::SchemaWalker &walker,
-    const sourcemeta::core::SchemaResolver &resolver,
-    const std::optional<std::string> &default_dialect = std::nullopt) -> void;
+auto canonicalize(sourcemeta::core::JSON &schema,
+                  const sourcemeta::core::SchemaWalker &walker,
+                  const sourcemeta::core::SchemaResolver &resolver,
+                  std::string_view default_dialect = "") -> void;
 
 } // namespace sourcemeta::jsonbinpack
 

test/compiler/canonicalizer_test.cc

@@ -27,7 +27,7 @@ TEST(JSONBinPack_Canonicalizer, unsupported_draft) {
 
   EXPECT_THROW(sourcemeta::jsonbinpack::canonicalize(
                    schema, sourcemeta::core::schema_walker, test_resolver),
-               sourcemeta::core::SchemaBaseDialectError);
+               sourcemeta::core::SchemaUnknownBaseDialectError);
 }
 
 TEST(JSONBinPack_Canonicalizer, unknown_draft) {