Skip to content

Commit 3caa147

Browse files
jviottijviotti
authored
Upgrade Core and Blaze (#913)
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
1 parent 73414f1 commit 3caa147

374 files changed

Lines changed: 6487 additions & 3671 deletions

File tree

Some content is hidden

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

‎DEPENDENCIES‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
2-
core https://github.com/sourcemeta/core aa314809fdb59ed6fcb1b10b3087f32eebf708c5
3-
blaze https://github.com/sourcemeta/blaze 5554d3106d7920b28b852e929f0a31d7805effe1
2+
core https://github.com/sourcemeta/core 39431ca30471bb248effafb841f937962bf8291c
3+
blaze https://github.com/sourcemeta/blaze b10fca7344e3a11048587a7b904e5710fbb448d3
44
bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e

‎cmake/FindCore.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ if(NOT Core_FOUND)
55
set(SOURCEMETA_CORE_INSTALL OFF CACHE BOOL "disable installation")
66
endif()
77

8-
set(SOURCEMETA_CORE_TIME OFF CACHE BOOL "disable")
98
set(SOURCEMETA_CORE_UUID OFF CACHE BOOL "disable")
109
set(SOURCEMETA_CORE_GZIP OFF CACHE BOOL "disable")
1110
set(SOURCEMETA_CORE_MD5 OFF CACHE BOOL "disable")

‎config.cmake.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ if(NOT JSONBINPACK_COMPONENTS)
99
endif()
1010

1111
include(CMakeFindDependencyMacro)
12-
find_dependency(Core COMPONENTS numeric regex uri json jsonpointer jsonschema io)
13-
find_dependency(Blaze COMPONENTS alterschema)
12+
find_dependency(Core COMPONENTS numeric regex uri json jsonpointer io)
13+
find_dependency(Blaze COMPONENTS foundation alterschema)
1414

1515
foreach(component ${JSONBINPACK_COMPONENTS})
1616
if(component STREQUAL "runtime")

‎src/compiler/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ target_link_libraries(sourcemeta_jsonbinpack_compiler PUBLIC
2929
target_link_libraries(sourcemeta_jsonbinpack_compiler PRIVATE
3030
sourcemeta::core::jsonpointer)
3131
target_link_libraries(sourcemeta_jsonbinpack_compiler PUBLIC
32-
sourcemeta::core::jsonschema)
32+
sourcemeta::blaze::foundation)
3333
target_link_libraries(sourcemeta_jsonbinpack_compiler PRIVATE
3434
sourcemeta::blaze::alterschema)

‎src/compiler/compiler.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ static auto transformer_callback_noop(
2121
namespace sourcemeta::jsonbinpack {
2222

2323
auto canonicalize(sourcemeta::core::JSON &schema,
24-
const sourcemeta::core::SchemaWalker &walker,
25-
const sourcemeta::core::SchemaResolver &resolver,
24+
const sourcemeta::blaze::SchemaWalker &walker,
25+
const sourcemeta::blaze::SchemaResolver &resolver,
2626
const std::string_view default_dialect) -> void {
2727
sourcemeta::blaze::SchemaTransformer canonicalizer;
2828
sourcemeta::blaze::add(canonicalizer,
@@ -59,8 +59,8 @@ auto make_encoding(sourcemeta::core::JSON &document,
5959
#include "mapper/number_arbitrary.h"
6060

6161
auto compile(sourcemeta::core::JSON &schema,
62-
const sourcemeta::core::SchemaWalker &walker,
63-
const sourcemeta::core::SchemaResolver &resolver,
62+
const sourcemeta::blaze::SchemaWalker &walker,
63+
const sourcemeta::blaze::SchemaResolver &resolver,
6464
const std::string_view default_dialect) -> void {
6565
canonicalize(schema, walker, resolver, default_dialect);
6666

@@ -93,7 +93,7 @@ auto compile(sourcemeta::core::JSON &schema,
9393
assert(mapper_result.first);
9494

9595
// The "any" encoding is always the last resort
96-
const auto dialect{sourcemeta::core::dialect(schema)};
96+
const auto dialect{sourcemeta::blaze::dialect(schema)};
9797
if (dialect.empty() || dialect != ENCODING_V1) {
9898
make_encoding(schema, "ANY_PACKED_TYPE_TAG_BYTE_PREFIX",
9999
sourcemeta::core::JSON::make_object());

‎src/compiler/encoding.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#ifndef SOURCEMETA_JSONBINPACK_COMPILER_ENCODING_H_
22
#define SOURCEMETA_JSONBINPACK_COMPILER_ENCODING_H_
33

4+
#include <sourcemeta/blaze/foundation.h>
45
#include <sourcemeta/core/json.h>
5-
#include <sourcemeta/core/jsonschema.h>
66

77
namespace sourcemeta::jsonbinpack {
88

99
constexpr auto ENCODING_V1{"tag:sourcemeta.com,2024:jsonbinpack/encoding/v1"};
1010

11-
inline auto make_resolver(const sourcemeta::core::SchemaResolver &fallback)
11+
inline auto make_resolver(const sourcemeta::blaze::SchemaResolver &fallback)
1212
-> auto {
1313
return [&fallback](std::string_view identifier)
1414
-> std::optional<sourcemeta::core::JSON> {

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
/// #include <sourcemeta/jsonbinpack/compiler.h>
1515
/// ```
1616

17+
#include <sourcemeta/blaze/foundation.h>
1718
#include <sourcemeta/core/json.h>
18-
#include <sourcemeta/core/jsonschema.h>
1919

2020
#include <string_view> // std::string_view
2121

@@ -29,7 +29,7 @@ namespace sourcemeta::jsonbinpack {
2929
/// ```cpp
3030
/// #include <sourcemeta/binpack/compiler.h>
3131
/// #include <sourcemeta/core/json.h>
32-
/// #include <sourcemeta/core/jsonschema.h>
32+
/// #include <sourcemeta/blaze/foundation.h>
3333
///
3434
/// #include <iostream>
3535
///
@@ -39,16 +39,16 @@ namespace sourcemeta::jsonbinpack {
3939
/// })JSON")};
4040
///
4141
/// sourcemeta::jsonbinpack::compile(
42-
/// schema, sourcemeta::core::schema_walker,
43-
/// sourcemeta::core::schema_resolver);
42+
/// schema, sourcemeta::blaze::schema_walker,
43+
/// sourcemeta::blaze::schema_resolver);
4444
///
4545
/// sourcemeta::core::prettify(schema, std::cout);
4646
/// std::cout << std::endl;
4747
/// ```
4848
SOURCEMETA_JSONBINPACK_COMPILER_EXPORT
4949
auto compile(sourcemeta::core::JSON &schema,
50-
const sourcemeta::core::SchemaWalker &walker,
51-
const sourcemeta::core::SchemaResolver &resolver,
50+
const sourcemeta::blaze::SchemaWalker &walker,
51+
const sourcemeta::blaze::SchemaResolver &resolver,
5252
std::string_view default_dialect = "") -> void;
5353

5454
/// @ingroup compiler
@@ -61,7 +61,7 @@ auto compile(sourcemeta::core::JSON &schema,
6161
/// ```cpp
6262
/// #include <sourcemeta/binpack/compiler.h>
6363
/// #include <sourcemeta/core/json.h>
64-
/// #include <sourcemeta/core/jsonschema.h>
64+
/// #include <sourcemeta/blaze/foundation.h>
6565
///
6666
/// #include <iostream>
6767
///
@@ -71,16 +71,16 @@ auto compile(sourcemeta::core::JSON &schema,
7171
/// })JSON")};
7272
///
7373
/// sourcemeta::jsonbinpack::canonicalize(
74-
/// schema, sourcemeta::core::schema_walker,
75-
/// sourcemeta::core::schema_resolver);
74+
/// schema, sourcemeta::blaze::schema_walker,
75+
/// sourcemeta::blaze::schema_resolver);
7676
///
7777
/// sourcemeta::core::prettify(schema, std::cout);
7878
/// std::cout << std::endl;
7979
/// ```
8080
SOURCEMETA_JSONBINPACK_COMPILER_EXPORT
8181
auto canonicalize(sourcemeta::core::JSON &schema,
82-
const sourcemeta::core::SchemaWalker &walker,
83-
const sourcemeta::core::SchemaResolver &resolver,
82+
const sourcemeta::blaze::SchemaWalker &walker,
83+
const sourcemeta::blaze::SchemaResolver &resolver,
8484
std::string_view default_dialect = "") -> void;
8585

8686
} // namespace sourcemeta::jsonbinpack

‎src/compiler/mapper/enum_8_bit.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ class Enum8Bit final : public sourcemeta::blaze::SchemaTransformRule {
88
[[nodiscard]] auto
99
condition(const sourcemeta::core::JSON &schema,
1010
const sourcemeta::core::JSON &,
11-
const sourcemeta::core::Vocabularies &vocabularies,
12-
const sourcemeta::core::SchemaFrame &,
13-
const sourcemeta::core::SchemaFrame::Location &location,
14-
const sourcemeta::core::SchemaWalker &,
15-
const sourcemeta::core::SchemaResolver &) const
11+
const sourcemeta::blaze::Vocabularies &vocabularies,
12+
const sourcemeta::blaze::SchemaFrame &,
13+
const sourcemeta::blaze::SchemaFrame::Location &location,
14+
const sourcemeta::blaze::SchemaWalker &,
15+
const sourcemeta::blaze::SchemaResolver &) const
1616
-> sourcemeta::blaze::SchemaTransformRule::Result override {
1717
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
18-
vocabularies.contains(sourcemeta::core::Vocabularies::Known::
18+
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
1919
JSON_Schema_2020_12_Validation) &&
2020
schema.is_object() && schema.defines("enum") &&
2121
schema.at("enum").is_array() && !location.pointer.empty() &&

‎src/compiler/mapper/enum_8_bit_top_level.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ class Enum8BitTopLevel final : public sourcemeta::blaze::SchemaTransformRule {
88
[[nodiscard]] auto
99
condition(const sourcemeta::core::JSON &schema,
1010
const sourcemeta::core::JSON &,
11-
const sourcemeta::core::Vocabularies &vocabularies,
12-
const sourcemeta::core::SchemaFrame &,
13-
const sourcemeta::core::SchemaFrame::Location &location,
14-
const sourcemeta::core::SchemaWalker &,
15-
const sourcemeta::core::SchemaResolver &) const
11+
const sourcemeta::blaze::Vocabularies &vocabularies,
12+
const sourcemeta::blaze::SchemaFrame &,
13+
const sourcemeta::blaze::SchemaFrame::Location &location,
14+
const sourcemeta::blaze::SchemaWalker &,
15+
const sourcemeta::blaze::SchemaResolver &) const
1616
-> sourcemeta::blaze::SchemaTransformRule::Result override {
1717
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
18-
vocabularies.contains(sourcemeta::core::Vocabularies::Known::
18+
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
1919
JSON_Schema_2020_12_Validation) &&
2020
schema.is_object() && schema.defines("enum") &&
2121
schema.at("enum").is_array() && location.pointer.empty() &&

‎src/compiler/mapper/enum_arbitrary.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ class EnumArbitrary final : public sourcemeta::blaze::SchemaTransformRule {
99
[[nodiscard]] auto
1010
condition(const sourcemeta::core::JSON &schema,
1111
const sourcemeta::core::JSON &,
12-
const sourcemeta::core::Vocabularies &vocabularies,
13-
const sourcemeta::core::SchemaFrame &,
14-
const sourcemeta::core::SchemaFrame::Location &location,
15-
const sourcemeta::core::SchemaWalker &,
16-
const sourcemeta::core::SchemaResolver &) const
12+
const sourcemeta::blaze::Vocabularies &vocabularies,
13+
const sourcemeta::blaze::SchemaFrame &,
14+
const sourcemeta::blaze::SchemaFrame::Location &location,
15+
const sourcemeta::blaze::SchemaWalker &,
16+
const sourcemeta::blaze::SchemaResolver &) const
1717
-> sourcemeta::blaze::SchemaTransformRule::Result override {
1818
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
19-
vocabularies.contains(sourcemeta::core::Vocabularies::Known::
19+
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
2020
JSON_Schema_2020_12_Validation) &&
2121
schema.is_object() && schema.defines("enum") &&
2222
schema.at("enum").is_array() && !location.pointer.empty() &&

0 commit comments

Comments
 (0)