Skip to content

Try to use std::bitset for ValueTypes #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jviotti merged 2 commits into from
Nov 14, 2025
Merged

Try to use std::bitset for ValueTypes #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24c48f4
[WIP] Try to use `std::bitset` for `ValueTypes`
jviotti Nov 14, 2025
3ec69cb
Upgrade core
jviotti Nov 14, 2025
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
2 changes: 1 addition & 1 deletion DEPENDENCIES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
core https://github.com/sourcemeta/core 10f0f36b678790354d3f67c73c686dfbd0e40231
core https://github.com/sourcemeta/core 0e963f3e966143def590ebdb643ec6c07b7ebef7
jsonschema-test-suite https://github.com/json-schema-org/JSON-Schema-Test-Suite Test-JSON-Schema-Acceptance-1.033
88 changes: 43 additions & 45 deletions src/compiler/default_compiler_draft4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,15 +376,14 @@ auto compiler_draft4_validation_type(const Context &context,
return {};
}

ValueTypes types{};
types.set(static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Real));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Integer));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Decimal));
return {make(sourcemeta::blaze::InstructionIndex::AssertionTypeStrictAny,
context, schema_context, dynamic_context,
static_cast<ValueTypes>(
(1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Real)) |
(1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Integer)) |
(1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Decimal))))};
context, schema_context, dynamic_context, types)};
} else if (type == "integer") {
if (context.mode == Mode::FastValidation &&
schema_context.schema.defines("enum") &&
Expand Down Expand Up @@ -457,15 +456,14 @@ auto compiler_draft4_validation_type(const Context &context,
context, schema_context, dynamic_context,
sourcemeta::core::JSON::Type::Array)};
} else if (type == "number") {
ValueTypes types{};
types.set(static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Real));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Integer));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Decimal));
return {make(sourcemeta::blaze::InstructionIndex::AssertionTypeStrictAny,
context, schema_context, dynamic_context,
static_cast<ValueTypes>(
(1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Real)) |
(1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Integer)) |
(1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Decimal))))};
context, schema_context, dynamic_context, types)};
} else if (type == "integer") {
return {make(sourcemeta::blaze::InstructionIndex::AssertionTypeStrict,
context, schema_context, dynamic_context,
Expand All @@ -478,40 +476,40 @@ auto compiler_draft4_validation_type(const Context &context,
return {};
}
} else if (schema_context.schema.at(dynamic_context.keyword).is_array()) {
ValueTypes types{0};
ValueTypes types{};
for (const auto &type :
schema_context.schema.at(dynamic_context.keyword).as_array()) {
assert(type.is_string());
const auto &type_string{type.to_string()};
if (type_string == "null") {
types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Null));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Null));
} else if (type_string == "boolean") {
types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Boolean));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Boolean));
} else if (type_string == "object") {
types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Object));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Object));
} else if (type_string == "array") {
types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Array));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Array));
} else if (type_string == "number") {
types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Integer));
types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Real));
types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Decimal));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Integer));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Real));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Decimal));
} else if (type_string == "integer") {
types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Integer));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Integer));
} else if (type_string == "string") {
types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::String));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::String));
}
}

assert(types != 0);
assert(types.any());
return {make(sourcemeta::blaze::InstructionIndex::AssertionTypeStrictAny,
context, schema_context, dynamic_context, types)};
}
Expand Down Expand Up @@ -720,13 +718,13 @@ auto compiler_draft4_applicator_anyof(const Context &context,
sourcemeta::blaze::InstructionIndex::
AssertionTypeStrictAny);
})) {
ValueTypes types{0};
ValueTypes types{};
for (const auto &instruction : disjunctors) {
if (instruction.children.front().type ==
sourcemeta::blaze::InstructionIndex::AssertionTypeStrict) {
const auto &value{
*std::get_if<ValueType>(&instruction.children.front().value)};
types |= (1U << static_cast<std::uint8_t>(value));
types.set(static_cast<std::uint8_t>(value));
}

if (instruction.children.front().type ==
Expand All @@ -737,18 +735,18 @@ auto compiler_draft4_applicator_anyof(const Context &context,
}
}

assert(types != 0);
std::uint8_t popcount{0};
for (std::uint8_t temp{types}; temp != 0; temp >>= 1) {
popcount += (temp & 1);
}
assert(types.any());
const auto popcount{types.count()};
if (popcount > 1) {
return {make(sourcemeta::blaze::InstructionIndex::AssertionTypeStrictAny,
context, schema_context, dynamic_context, types)};
} else {
std::uint8_t type_index{0};
for (std::uint8_t temp{types}; (temp & 1) == 0; temp >>= 1) {
type_index++;
for (std::uint8_t bit{0}; bit < 8; bit++) {
if (types.test(bit)) {
type_index = bit;
break;
}
}
return {make(sourcemeta::blaze::InstructionIndex::AssertionTypeStrict,
context, schema_context, dynamic_context,
Expand Down
70 changes: 34 additions & 36 deletions src/compiler/default_compiler_draft6.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,14 @@ auto compiler_draft6_validation_type(const Context &context,
return {};
}

ValueTypes types{};
types.set(static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Real));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Integer));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Decimal));
return {make(sourcemeta::blaze::InstructionIndex::AssertionTypeStrictAny,
context, schema_context, dynamic_context,
static_cast<ValueTypes>(
(1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Real)) |
(1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Integer)) |
(1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Decimal))))};
context, schema_context, dynamic_context, types)};
} else if (type == "integer") {
if (context.mode == Mode::FastValidation &&
schema_context.schema.defines("enum") &&
Expand Down Expand Up @@ -262,15 +261,14 @@ auto compiler_draft6_validation_type(const Context &context,
context, schema_context, dynamic_context,
sourcemeta::core::JSON::Type::Array)};
} else if (type == "number") {
ValueTypes types{};
types.set(static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Real));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Integer));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Decimal));
return {make(sourcemeta::blaze::InstructionIndex::AssertionTypeStrictAny,
context, schema_context, dynamic_context,
static_cast<ValueTypes>(
(1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Real)) |
(1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Integer)) |
(1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Decimal))))};
context, schema_context, dynamic_context, types)};
} else if (type == "integer") {
return {make(sourcemeta::blaze::InstructionIndex::AssertionType, context,
schema_context, dynamic_context,
Expand All @@ -287,44 +285,44 @@ auto compiler_draft6_validation_type(const Context &context,
return {};
}
} else if (schema_context.schema.at(dynamic_context.keyword).is_array()) {
ValueTypes types{0};
ValueTypes types{};
for (const auto &type :
schema_context.schema.at(dynamic_context.keyword).as_array()) {
assert(type.is_string());
const auto &type_string{type.to_string()};
if (type_string == "null") {
types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Null));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Null));
} else if (type_string == "boolean") {
types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Boolean));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Boolean));
} else if (type_string == "object") {
types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Object));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Object));
} else if (type_string == "array") {
types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Array));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Array));
} else if (type_string == "number") {
types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Integer));
types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Real));
types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Decimal));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Integer));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Real));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Decimal));
} else if (type_string == "integer") {
types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::Integer));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::Integer));
} else if (type_string == "string") {
if (dynamic_context.property_as_target) {
continue;
}

types |= (1U << static_cast<std::uint8_t>(
sourcemeta::core::JSON::Type::String));
types.set(
static_cast<std::uint8_t>(sourcemeta::core::JSON::Type::String));
}
}

assert(types != 0);
assert(types.any());
return {make(sourcemeta::blaze::InstructionIndex::AssertionTypeAny, context,
schema_context, dynamic_context, types)};
}
Expand Down
61 changes: 27 additions & 34 deletions src/evaluator/dispatch.inc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,16 +268,14 @@ INSTRUCTION_HANDLER(AssertionTypeAny) {
SOURCEMETA_MAYBE_UNUSED(evaluator);
EVALUATE_BEGIN_NO_PRECONDITION(AssertionTypeAny);
const auto value{*std::get_if<ValueTypes>(&instruction.value)};
assert(value != 0);
assert(value.any());
const auto &target{get(instance, instruction.relative_instance_location)};
// In non-strict mode, we consider a real number that represents an
// integer to be an integer
const auto type_bit{static_cast<std::uint8_t>(
1U << static_cast<std::uint8_t>(target.type()))};
if ((value & type_bit) != 0) {
const auto type_index{static_cast<std::uint8_t>(target.type())};
if (value.test(type_index)) {
result = true;
} else if ((value & (1U << static_cast<std::uint8_t>(JSON::Type::Integer))) !=
0 &&
} else if (value.test(static_cast<std::uint8_t>(JSON::Type::Integer)) &&
target.is_integral()) {
result = true;
}
Expand Down Expand Up @@ -308,11 +306,11 @@ INSTRUCTION_HANDLER(AssertionTypeStrictAny) {
SOURCEMETA_MAYBE_UNUSED(evaluator);
EVALUATE_BEGIN_NO_PRECONDITION(AssertionTypeStrictAny);
const auto value{*std::get_if<ValueTypes>(&instruction.value)};
assert(value != 0);
assert(value.any());
const auto &target{get(instance, instruction.relative_instance_location)};
const auto type_bit{static_cast<std::uint8_t>(
1U << static_cast<std::uint8_t>(effective_type_strict_real(target)))};
result = ((value & type_bit) != 0);
const auto type_index{
static_cast<std::uint8_t>(effective_type_strict_real(target))};
result = value.test(type_index);
EVALUATE_END(AssertionTypeStrictAny);
}

Expand Down Expand Up @@ -782,14 +780,12 @@ INSTRUCTION_HANDLER(AssertionPropertyTypeStrictAny) {
SOURCEMETA_MAYBE_UNUSED(evaluator);
EVALUATE_BEGIN_TRY_TARGET(AssertionPropertyTypeStrictAny);
const auto value{*std::get_if<ValueTypes>(&instruction.value)};
assert(value != 0);
assert(value.any());
// Now here we refer to the actual property
const auto type_bit{static_cast<std::uint8_t>(
1U << static_cast<std::uint8_t>(target_check->type()))};
const auto type_index{static_cast<std::uint8_t>(target_check->type())};
result =
((value & type_bit) != 0) ||
(((value & (1U << static_cast<std::uint8_t>(JSON::Type::Integer))) !=
0) &&
value.test(type_index) ||
(value.test(static_cast<std::uint8_t>(JSON::Type::Integer)) &&
target_check->is_decimal() && target_check->to_decimal().is_integer());
EVALUATE_END(AssertionPropertyTypeStrictAny);
}
Expand All @@ -803,11 +799,10 @@ INSTRUCTION_HANDLER(AssertionPropertyTypeStrictAnyEvaluate) {
SOURCEMETA_MAYBE_UNUSED(evaluator);
EVALUATE_BEGIN_TRY_TARGET(AssertionPropertyTypeStrictAnyEvaluate);
const auto value{*std::get_if<ValueTypes>(&instruction.value)};
assert(value != 0);
assert(value.any());
// Now here we refer to the actual property
const auto type_bit{static_cast<std::uint8_t>(
1U << static_cast<std::uint8_t>(target_check->type()))};
result = ((value & type_bit) != 0);
const auto type_index{static_cast<std::uint8_t>(target_check->type())};
result = value.test(type_index);

if (result) {
evaluator.evaluate(target_check);
Expand Down Expand Up @@ -2069,12 +2064,11 @@ INSTRUCTION_HANDLER(LoopPropertiesTypeStrictAny) {
EVALUATE_BEGIN_NON_STRING(LoopPropertiesTypeStrictAny, target.is_object());
result = true;
const auto value{*std::get_if<ValueTypes>(&instruction.value)};
assert(value != 0);
assert(value.any());
for (const auto &entry : target.as_object()) {
const auto type_bit{static_cast<std::uint8_t>(
1U << static_cast<std::uint8_t>(
effective_type_strict_real(entry.second)))};
if ((value & type_bit) == 0) {
const auto type_index{
static_cast<std::uint8_t>(effective_type_strict_real(entry.second))};
if (!value.test(type_index)) {
result = false;
break;
}
Expand All @@ -2094,12 +2088,11 @@ INSTRUCTION_HANDLER(LoopPropertiesTypeStrictAnyEvaluate) {
target.is_object());
result = true;
const auto value{*std::get_if<ValueTypes>(&instruction.value)};
assert(value != 0);
assert(value.any());
for (const auto &entry : target.as_object()) {
const auto type_bit{static_cast<std::uint8_t>(
1U << static_cast<std::uint8_t>(
effective_type_strict_real(entry.second)))};
if ((value & type_bit) == 0) {
const auto type_index{
static_cast<std::uint8_t>(effective_type_strict_real(entry.second))};
if (!value.test(type_index)) {
result = false;
EVALUATE_END(LoopPropertiesTypeStrictAnyEvaluate);
}
Expand Down Expand Up @@ -2344,13 +2337,13 @@ INSTRUCTION_HANDLER(LoopItemsTypeStrictAny) {
SOURCEMETA_MAYBE_UNUSED(evaluator);
EVALUATE_BEGIN_NON_STRING(LoopItemsTypeStrictAny, target.is_array());
const auto value{*std::get_if<ValueTypes>(&instruction.value)};
assert(value != 0);
assert(value.any());

result = true;
for (const auto &entry : target.as_array()) {
const auto type_bit{static_cast<std::uint8_t>(
1U << static_cast<std::uint8_t>(effective_type_strict_real(entry)))};
if ((value & type_bit) == 0) {
const auto type_index{
static_cast<std::uint8_t>(effective_type_strict_real(entry))};
if (!value.test(type_index)) {
result = false;
break;
}
Expand Down
Loading