Skip to content

Commit 98b573e

Browse files
authored
Upgrade Core to d7a93980ea86b0a36dfdadb7e80af79806d961e2 (#882)
Signed-off-by: Juan Cruz Viotti <[email protected]>
1 parent d92dce0 commit 98b573e

File tree

5 files changed

+78
-36
lines changed

5 files changed

+78
-36
lines changed

DEPENDENCIES

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
vendorpull https://github.com/sourcemeta/vendorpull 70342aaf458e6cb80baeb5b718901075fc42ede6
2-
core https://github.com/sourcemeta/core 9542de1f402025f49f58458f424d01d3f446a7e9
2+
core https://github.com/sourcemeta/core d7a93980ea86b0a36dfdadb7e80af79806d961e2
33
bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e

src/compiler/compiler.cc

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@
66

77
#include "encoding.h"
88

9+
static auto transformer_callback_noop(const sourcemeta::core::Pointer &,
10+
const std::string_view,
11+
const std::string_view,
12+
const std::string_view) -> void {
13+
// This callback should never be called, as all the transformation rules
14+
// we define in this project can indeed be transformed
15+
assert(false);
16+
}
17+
918
namespace sourcemeta::jsonbinpack {
1019

1120
auto canonicalize(sourcemeta::core::JSON &schema,
@@ -23,7 +32,8 @@ auto canonicalize(sourcemeta::core::JSON &schema,
2332
sourcemeta::core::AlterSchemaCategory::Implicit);
2433
sourcemeta::core::add(canonicalizer,
2534
sourcemeta::core::AlterSchemaCategory::Superfluous);
26-
canonicalizer.apply(schema, walker, make_resolver(resolver), default_dialect);
35+
canonicalizer.apply(schema, walker, make_resolver(resolver),
36+
transformer_callback_noop, default_dialect);
2737
}
2838

2939
auto make_encoding(sourcemeta::core::JSON &document,
@@ -80,7 +90,8 @@ auto compile(sourcemeta::core::JSON &schema,
8090
// Numbers
8191
mapper.add<NumberArbitrary>();
8292

83-
mapper.apply(schema, walker, make_resolver(resolver), default_dialect);
93+
mapper.apply(schema, walker, make_resolver(resolver),
94+
transformer_callback_noop, default_dialect);
8495

8596
// The "any" encoding is always the last resort
8697
const auto dialect{sourcemeta::core::dialect(schema)};

vendor/core/src/core/jsonschema/include/sourcemeta/core/jsonschema_error.h

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/core/src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h

Lines changed: 18 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/core/src/core/jsonschema/transformer.cc

Lines changed: 32 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)