Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DEPENDENCIES
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
core https://github.com/sourcemeta/core 1b3ab73db3f0a4dfe0e1ee1e59601a81bfe100fe
blaze https://github.com/sourcemeta/blaze 04832d45bf4327d4ec874fa67f339797cd49b375
core https://github.com/sourcemeta/core 428cbdf92f6330b0f6ae918ac0a9dce089a0470b
blaze https://github.com/sourcemeta/blaze 90c9d98ebeb0c13bd1d75fd3b0e0fb89770cc53d
bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e
14 changes: 6 additions & 8 deletions src/runtime/encoder_any.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ auto Encoder::LARGE_CHOICE_INDEX(const sourcemeta::core::JSON &document,
const struct LARGE_CHOICE_INDEX &options)
-> void {
assert(options.choices.size() > 0);
const auto iterator{
std::ranges::find_if(options.choices, [&document](const auto &choice) {
return choice == document;
})};
const auto iterator{std::ranges::find_if(
options.choices,
[&document](const auto &choice) -> bool { return choice == document; })};
assert(iterator != std::cend(options.choices));
const auto cursor{std::distance(std::cbegin(options.choices), iterator)};
assert(sourcemeta::core::is_within(cursor, static_cast<std::uint64_t>(0),
Expand All @@ -47,10 +46,9 @@ auto Encoder::TOP_LEVEL_BYTE_CHOICE_INDEX(
const struct TOP_LEVEL_BYTE_CHOICE_INDEX &options) -> void {
assert(options.choices.size() > 0);
assert(sourcemeta::core::is_byte(options.choices.size()));
const auto iterator{
std::ranges::find_if(options.choices, [&document](auto const &choice) {
return choice == document;
})};
const auto iterator{std::ranges::find_if(
options.choices,
[&document](auto const &choice) -> bool { return choice == document; })};
assert(iterator != std::cend(options.choices));
const auto cursor{std::distance(std::cbegin(options.choices), iterator)};
assert(sourcemeta::core::is_within(
Expand Down
8 changes: 4 additions & 4 deletions src/runtime/loader_v1_array.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ auto FIXED_TYPED_ARRAY(const sourcemeta::core::JSON &options) -> Encoding {
std::transform(prefix_encodings.as_array().cbegin(),
prefix_encodings.as_array().cend(),
std::back_inserter(encodings),
[](const auto &element) { return load(element); });
[](const auto &element) -> Encoding { return load(element); });
assert(encodings.size() == prefix_encodings.size());
return sourcemeta::jsonbinpack::FIXED_TYPED_ARRAY{
.size = static_cast<std::uint64_t>(size.to_integer()),
Expand Down Expand Up @@ -57,7 +57,7 @@ auto BOUNDED_8BITS_TYPED_ARRAY(const sourcemeta::core::JSON &options)
std::transform(prefix_encodings.as_array().cbegin(),
prefix_encodings.as_array().cend(),
std::back_inserter(encodings),
[](const auto &element) { return load(element); });
[](const auto &element) -> Encoding { return load(element); });
assert(encodings.size() == prefix_encodings.size());
return sourcemeta::jsonbinpack::BOUNDED_8BITS_TYPED_ARRAY{
.minimum = static_cast<std::uint64_t>(minimum.to_integer()),
Expand All @@ -81,7 +81,7 @@ auto FLOOR_TYPED_ARRAY(const sourcemeta::core::JSON &options) -> Encoding {
std::transform(prefix_encodings.as_array().cbegin(),
prefix_encodings.as_array().cend(),
std::back_inserter(encodings),
[](const auto &element) { return load(element); });
[](const auto &element) -> Encoding { return load(element); });
assert(encodings.size() == prefix_encodings.size());
return sourcemeta::jsonbinpack::FLOOR_TYPED_ARRAY{
.minimum = static_cast<std::uint64_t>(minimum.to_integer()),
Expand All @@ -104,7 +104,7 @@ auto ROOF_TYPED_ARRAY(const sourcemeta::core::JSON &options) -> Encoding {
std::transform(prefix_encodings.as_array().cbegin(),
prefix_encodings.as_array().cend(),
std::back_inserter(encodings),
[](const auto &element) { return load(element); });
[](const auto &element) -> Encoding { return load(element); });
assert(encodings.size() == prefix_encodings.size());
return sourcemeta::jsonbinpack::ROOF_TYPED_ARRAY{
.maximum = static_cast<std::uint64_t>(maximum.to_integer()),
Expand Down
2 changes: 1 addition & 1 deletion vendor/blaze/DEPENDENCIES

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions vendor/blaze/schemas/canonical-2019-09.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions vendor/blaze/schemas/canonical-2020-12.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions vendor/blaze/schemas/canonical-draft1.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions vendor/blaze/schemas/canonical-draft2.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading