Skip to content

Commit 56dd83b

Browse files
authored
Upgrade Core to 1f23fc7df56f41ceb140719bbcf94ee6f4d6f066 (#892)
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
1 parent ba1c4b7 commit 56dd83b

File tree

101 files changed

+1565
-1093
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+1565
-1093
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 1e83e267f00bd5686d9546fb20877bf6e4b20dc5
2+
core https://github.com/sourcemeta/core 1f23fc7df56f41ceb140719bbcf94ee6f4d6f066
33
bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e

src/compiler/compiler.cc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
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 {
9+
static auto
10+
transformer_callback_noop(const sourcemeta::core::Pointer &,
11+
const std::string_view, const std::string_view,
12+
const sourcemeta::core::SchemaTransformRule::Result &)
13+
-> void {
1314
// This callback should never be called, as all the transformation rules
1415
// we define in this project can indeed be transformed
1516
assert(false);

src/compiler/mapper/enum_8_bit.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ class Enum8Bit final : public sourcemeta::core::SchemaTransformRule {
2020
is_byte(schema.at("enum").size() - 1);
2121
}
2222

23-
auto transform(sourcemeta::core::JSON &schema) const -> void override {
23+
auto transform(sourcemeta::core::JSON &schema,
24+
const sourcemeta::core::SchemaTransformRule::Result &) const
25+
-> void override {
2426
auto options = sourcemeta::core::JSON::make_object();
2527
options.assign("choices", schema.at("enum"));
2628
make_encoding(schema, "BYTE_CHOICE_INDEX", options);

src/compiler/mapper/enum_8_bit_top_level.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ class Enum8BitTopLevel final : public sourcemeta::core::SchemaTransformRule {
2020
is_byte(schema.at("enum").size() - 1);
2121
}
2222

23-
auto transform(sourcemeta::core::JSON &schema) const -> void override {
23+
auto transform(sourcemeta::core::JSON &schema,
24+
const sourcemeta::core::SchemaTransformRule::Result &) const
25+
-> void override {
2426
auto options = sourcemeta::core::JSON::make_object();
2527
options.assign("choices", schema.at("enum"));
2628
make_encoding(schema, "TOP_LEVEL_BYTE_CHOICE_INDEX", options);

src/compiler/mapper/enum_arbitrary.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ class EnumArbitrary final : public sourcemeta::core::SchemaTransformRule {
2121
!is_byte(schema.at("enum").size() - 1);
2222
}
2323

24-
auto transform(sourcemeta::core::JSON &schema) const -> void override {
24+
auto transform(sourcemeta::core::JSON &schema,
25+
const sourcemeta::core::SchemaTransformRule::Result &) const
26+
-> void override {
2527
auto options = sourcemeta::core::JSON::make_object();
2628
options.assign("choices", schema.at("enum"));
2729
make_encoding(schema, "LARGE_CHOICE_INDEX", options);

src/compiler/mapper/enum_singleton.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ class EnumSingleton final : public sourcemeta::core::SchemaTransformRule {
1919
schema.at("enum").size() == 1;
2020
}
2121

22-
auto transform(sourcemeta::core::JSON &schema) const -> void override {
22+
auto transform(sourcemeta::core::JSON &schema,
23+
const sourcemeta::core::SchemaTransformRule::Result &) const
24+
-> void override {
2325
auto options = sourcemeta::core::JSON::make_object();
2426
options.assign("value", schema.at("enum").at(0));
2527
make_encoding(schema, "CONST_NONE", options);

src/compiler/mapper/integer_bounded_8_bit.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ class IntegerBounded8Bit final : public sourcemeta::core::SchemaTransformRule {
2323
!schema.defines("multipleOf");
2424
}
2525

26-
auto transform(sourcemeta::core::JSON &schema) const -> void override {
26+
auto transform(sourcemeta::core::JSON &schema,
27+
const sourcemeta::core::SchemaTransformRule::Result &) const
28+
-> void override {
2729
auto minimum = schema.at("minimum");
2830
auto maximum = schema.at("maximum");
2931
auto options = sourcemeta::core::JSON::make_object();

src/compiler/mapper/integer_bounded_greater_than_8_bit.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ class IntegerBoundedGreaterThan8Bit final
2525
!schema.defines("multipleOf");
2626
}
2727

28-
auto transform(sourcemeta::core::JSON &schema) const -> void override {
28+
auto transform(sourcemeta::core::JSON &schema,
29+
const sourcemeta::core::SchemaTransformRule::Result &) const
30+
-> void override {
2931
auto minimum = schema.at("minimum");
3032
auto options = sourcemeta::core::JSON::make_object();
3133
options.assign("minimum", std::move(minimum));

src/compiler/mapper/integer_bounded_multiplier_8_bit.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ class IntegerBoundedMultiplier8Bit final
3030
schema.at("multipleOf").to_integer()));
3131
}
3232

33-
auto transform(sourcemeta::core::JSON &schema) const -> void override {
33+
auto transform(sourcemeta::core::JSON &schema,
34+
const sourcemeta::core::SchemaTransformRule::Result &) const
35+
-> void override {
3436
auto minimum = schema.at("minimum");
3537
auto maximum = schema.at("maximum");
3638
auto multiplier = schema.at("multipleOf");

src/compiler/mapper/integer_bounded_multiplier_greater_than_8_bit.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ class IntegerBoundedMultiplierGreaterThan8Bit final
3030
schema.at("multipleOf").to_integer()));
3131
}
3232

33-
auto transform(sourcemeta::core::JSON &schema) const -> void override {
33+
auto transform(sourcemeta::core::JSON &schema,
34+
const sourcemeta::core::SchemaTransformRule::Result &) const
35+
-> void override {
3436
auto minimum = schema.at("minimum");
3537
auto multiplier = schema.at("multipleOf");
3638
auto options = sourcemeta::core::JSON::make_object();

0 commit comments

Comments
 (0)