Skip to content

Commit 5fb659a

Browse files
jviottijviotti
authored
Upgrade Core to 47ba2307b9bfab9fb378386207b3172c97ed1363 (#875)
Signed-off-by: Juan Cruz Viotti <[email protected]>
1 parent 8863c4c commit 5fb659a

30 files changed

+291
-203
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 1257bcddc2797de7c95dedefebf6c2fb1e00717a
2+
core https://github.com/sourcemeta/core 47ba2307b9bfab9fb378386207b3172c97ed1363
33
bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace sourcemeta::jsonbinpack {
4141
///
4242
/// sourcemeta::jsonbinpack::compile(
4343
/// schema, sourcemeta::core::schema_official_walker,
44-
/// sourcemeta::core::official_resolver);
44+
/// sourcemeta::core::schema_official_resolver);
4545
///
4646
/// sourcemeta::core::prettify(schema, std::cout);
4747
/// std::cout << std::endl;
@@ -74,7 +74,7 @@ auto compile(sourcemeta::core::JSON &schema,
7474
///
7575
/// sourcemeta::jsonbinpack::canonicalize(
7676
/// schema, sourcemeta::core::schema_official_walker,
77-
/// sourcemeta::core::official_resolver);
77+
/// sourcemeta::core::schema_official_resolver);
7878
///
7979
/// sourcemeta::core::prettify(schema, std::cout);
8080
/// std::cout << std::endl;

‎test/compiler/2020_12_canonicalizer_any_test.cc‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, if_without_then_else_1) {
1313

1414
sourcemeta::jsonbinpack::canonicalize(
1515
schema, sourcemeta::core::schema_official_walker,
16-
sourcemeta::core::official_resolver);
16+
sourcemeta::core::schema_official_resolver);
1717

1818
const auto expected = sourcemeta::core::parse_json(R"JSON({
1919
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -35,7 +35,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, then_else_without_if_1) {
3535

3636
sourcemeta::jsonbinpack::canonicalize(
3737
schema, sourcemeta::core::schema_official_walker,
38-
sourcemeta::core::official_resolver);
38+
sourcemeta::core::schema_official_resolver);
3939

4040
const auto expected = sourcemeta::core::parse_json(R"JSON({
4141
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -59,7 +59,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, duplicate_allof_branches_1) {
5959

6060
sourcemeta::jsonbinpack::canonicalize(
6161
schema, sourcemeta::core::schema_official_walker,
62-
sourcemeta::core::official_resolver);
62+
sourcemeta::core::schema_official_resolver);
6363

6464
const auto expected = sourcemeta::core::parse_json(R"JSON({
6565
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -84,7 +84,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, duplicate_allof_branches_2) {
8484

8585
sourcemeta::jsonbinpack::canonicalize(
8686
schema, sourcemeta::core::schema_official_walker,
87-
sourcemeta::core::official_resolver);
87+
sourcemeta::core::schema_official_resolver);
8888

8989
const auto expected = sourcemeta::core::parse_json(R"JSON({
9090
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -116,7 +116,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, duplicate_allof_branches_3) {
116116

117117
sourcemeta::jsonbinpack::canonicalize(
118118
schema, sourcemeta::core::schema_official_walker,
119-
sourcemeta::core::official_resolver);
119+
sourcemeta::core::schema_official_resolver);
120120

121121
const auto expected = sourcemeta::core::parse_json(R"JSON({
122122
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -141,7 +141,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, duplicate_anyof_branches_1) {
141141

142142
sourcemeta::jsonbinpack::canonicalize(
143143
schema, sourcemeta::core::schema_official_walker,
144-
sourcemeta::core::official_resolver);
144+
sourcemeta::core::schema_official_resolver);
145145

146146
const auto expected = sourcemeta::core::parse_json(R"JSON({
147147
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -166,7 +166,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, duplicate_anyof_branches_2) {
166166

167167
sourcemeta::jsonbinpack::canonicalize(
168168
schema, sourcemeta::core::schema_official_walker,
169-
sourcemeta::core::official_resolver);
169+
sourcemeta::core::schema_official_resolver);
170170

171171
const auto expected = sourcemeta::core::parse_json(R"JSON({
172172
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -198,7 +198,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, duplicate_anyof_branches_3) {
198198

199199
sourcemeta::jsonbinpack::canonicalize(
200200
schema, sourcemeta::core::schema_official_walker,
201-
sourcemeta::core::official_resolver);
201+
sourcemeta::core::schema_official_resolver);
202202

203203
const auto expected = sourcemeta::core::parse_json(R"JSON({
204204
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -219,7 +219,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, type_union_anyof_1) {
219219

220220
sourcemeta::jsonbinpack::canonicalize(
221221
schema, sourcemeta::core::schema_official_walker,
222-
sourcemeta::core::official_resolver);
222+
sourcemeta::core::schema_official_resolver);
223223

224224
const auto expected = sourcemeta::core::parse_json(R"JSON({
225225
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -248,7 +248,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, type_union_anyof_2) {
248248

249249
sourcemeta::jsonbinpack::canonicalize(
250250
schema, sourcemeta::core::schema_official_walker,
251-
sourcemeta::core::official_resolver);
251+
sourcemeta::core::schema_official_resolver);
252252

253253
const auto expected = sourcemeta::core::parse_json(R"JSON({
254254
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -282,7 +282,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, type_union_anyof_3) {
282282

283283
sourcemeta::jsonbinpack::canonicalize(
284284
schema, sourcemeta::core::schema_official_walker,
285-
sourcemeta::core::official_resolver);
285+
sourcemeta::core::schema_official_resolver);
286286

287287
const auto expected = sourcemeta::core::parse_json(R"JSON({
288288
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -315,7 +315,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, implicit_type_union_1) {
315315

316316
sourcemeta::jsonbinpack::canonicalize(
317317
schema, sourcemeta::core::schema_official_walker,
318-
sourcemeta::core::official_resolver);
318+
sourcemeta::core::schema_official_resolver);
319319

320320
const auto expected = sourcemeta::core::parse_json(R"JSON({
321321
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -354,7 +354,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, boolean_schema_1) {
354354

355355
sourcemeta::jsonbinpack::canonicalize(
356356
schema, sourcemeta::core::schema_official_walker,
357-
sourcemeta::core::official_resolver,
357+
sourcemeta::core::schema_official_resolver,
358358
"https://json-schema.org/draft/2020-12/schema");
359359

360360
const auto expected = sourcemeta::core::parse_json(R"JSON({
@@ -393,7 +393,7 @@ TEST(JSONBinPack_Canonicalizer_Any_2020_12, boolean_schema_2) {
393393

394394
sourcemeta::jsonbinpack::canonicalize(
395395
schema, sourcemeta::core::schema_official_walker,
396-
sourcemeta::core::official_resolver,
396+
sourcemeta::core::schema_official_resolver,
397397
"https://json-schema.org/draft/2020-12/schema");
398398

399399
const sourcemeta::core::JSON expected{false};

‎test/compiler/2020_12_canonicalizer_array_test.cc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ TEST(JSONBinPack_Canonicalizer_Array_2020_12, max_contains_without_contains_1) {
1313

1414
sourcemeta::jsonbinpack::canonicalize(
1515
schema, sourcemeta::core::schema_official_walker,
16-
sourcemeta::core::official_resolver);
16+
sourcemeta::core::schema_official_resolver);
1717

1818
const auto expected = sourcemeta::core::parse_json(R"JSON({
1919
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -34,7 +34,7 @@ TEST(JSONBinPack_Canonicalizer_Array_2020_12, max_contains_without_contains_2) {
3434

3535
sourcemeta::jsonbinpack::canonicalize(
3636
schema, sourcemeta::core::schema_official_walker,
37-
sourcemeta::core::official_resolver);
37+
sourcemeta::core::schema_official_resolver);
3838

3939
const auto expected = sourcemeta::core::parse_json(R"JSON({
4040
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -59,7 +59,7 @@ TEST(JSONBinPack_Canonicalizer_Array_2020_12, min_contains_without_contains_1) {
5959

6060
sourcemeta::jsonbinpack::canonicalize(
6161
schema, sourcemeta::core::schema_official_walker,
62-
sourcemeta::core::official_resolver);
62+
sourcemeta::core::schema_official_resolver);
6363

6464
const auto expected = sourcemeta::core::parse_json(R"JSON({
6565
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -80,7 +80,7 @@ TEST(JSONBinPack_Canonicalizer_Array_2020_12, min_contains_without_contains_2) {
8080

8181
sourcemeta::jsonbinpack::canonicalize(
8282
schema, sourcemeta::core::schema_official_walker,
83-
sourcemeta::core::official_resolver);
83+
sourcemeta::core::schema_official_resolver);
8484

8585
const auto expected = sourcemeta::core::parse_json(R"JSON({
8686
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -107,7 +107,7 @@ TEST(JSONBinPack_Canonicalizer_Array_2020_12, unsatisfiable_max_contains_1) {
107107

108108
sourcemeta::jsonbinpack::canonicalize(
109109
schema, sourcemeta::core::schema_official_walker,
110-
sourcemeta::core::official_resolver);
110+
sourcemeta::core::schema_official_resolver);
111111

112112
const auto expected = sourcemeta::core::parse_json(R"JSON({
113113
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -132,7 +132,7 @@ TEST(JSONBinPack_Canonicalizer_Array_2020_12, implicit_array_lower_bound_1) {
132132

133133
sourcemeta::jsonbinpack::canonicalize(
134134
schema, sourcemeta::core::schema_official_walker,
135-
sourcemeta::core::official_resolver);
135+
sourcemeta::core::schema_official_resolver);
136136

137137
const auto expected = sourcemeta::core::parse_json(R"JSON({
138138
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -153,7 +153,7 @@ TEST(JSONBinPack_Canonicalizer_Array_2020_12, drop_non_array_keywords_1) {
153153

154154
sourcemeta::jsonbinpack::canonicalize(
155155
schema, sourcemeta::core::schema_official_walker,
156-
sourcemeta::core::official_resolver);
156+
sourcemeta::core::schema_official_resolver);
157157

158158
const auto expected = sourcemeta::core::parse_json(R"JSON({
159159
"$schema": "https://json-schema.org/draft/2020-12/schema",

‎test/compiler/2020_12_canonicalizer_boolean_test.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ TEST(JSONBinPack_Canonicalizer_Boolean_2020_12, type_boolean) {
1212

1313
sourcemeta::jsonbinpack::canonicalize(
1414
schema, sourcemeta::core::schema_official_walker,
15-
sourcemeta::core::official_resolver);
15+
sourcemeta::core::schema_official_resolver);
1616

1717
const auto expected = sourcemeta::core::parse_json(R"JSON({
1818
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -32,7 +32,7 @@ TEST(JSONBinPack_Canonicalizer_Boolean_2020_12, drop_non_boolean_keywords_1) {
3232

3333
sourcemeta::jsonbinpack::canonicalize(
3434
schema, sourcemeta::core::schema_official_walker,
35-
sourcemeta::core::official_resolver);
35+
sourcemeta::core::schema_official_resolver);
3636

3737
const auto expected = sourcemeta::core::parse_json(R"JSON({
3838
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -52,7 +52,7 @@ TEST(JSONBinPack_Canonicalizer_Boolean_2020_12, drop_non_boolean_keywords_2) {
5252

5353
sourcemeta::jsonbinpack::canonicalize(
5454
schema, sourcemeta::core::schema_official_walker,
55-
sourcemeta::core::official_resolver);
55+
sourcemeta::core::schema_official_resolver);
5656

5757
const auto expected = sourcemeta::core::parse_json(R"JSON({
5858
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -71,7 +71,7 @@ TEST(JSONBinPack_Canonicalizer_Boolean_2020_12, drop_non_boolean_keywords_3) {
7171

7272
sourcemeta::jsonbinpack::canonicalize(
7373
schema, sourcemeta::core::schema_official_walker,
74-
sourcemeta::core::official_resolver);
74+
sourcemeta::core::schema_official_resolver);
7575

7676
const auto expected = sourcemeta::core::parse_json(R"JSON({
7777
"$schema": "https://json-schema.org/draft/2020-12/schema",

‎test/compiler/2020_12_canonicalizer_null_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ TEST(JSONBinPack_Canonicalizer_Null_2020_12, drop_non_null_keywords_1) {
1414

1515
sourcemeta::jsonbinpack::canonicalize(
1616
schema, sourcemeta::core::schema_official_walker,
17-
sourcemeta::core::official_resolver);
17+
sourcemeta::core::schema_official_resolver);
1818

1919
const auto expected = sourcemeta::core::parse_json(R"JSON({
2020
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -34,7 +34,7 @@ TEST(JSONBinPack_Canonicalizer_Null_2020_12, drop_non_null_keywords_2) {
3434

3535
sourcemeta::jsonbinpack::canonicalize(
3636
schema, sourcemeta::core::schema_official_walker,
37-
sourcemeta::core::official_resolver);
37+
sourcemeta::core::schema_official_resolver);
3838

3939
const auto expected = sourcemeta::core::parse_json(R"JSON({
4040
"$schema": "https://json-schema.org/draft/2020-12/schema",

0 commit comments

Comments
 (0)