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
2 changes: 1 addition & 1 deletion ports/javascript/describe.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ export function describe(valid, instruction, evaluatePath,
}

if (opcode === LOGICAL_AND) {
if (keyword === 'allOf') {
if (keyword === 'allOf' || keyword === 'extends') {
const childCount = children ? children.length : 0;
let message = 'The ' + typeName(targetType) +
' value was expected to validate against the ';
Expand Down
31 changes: 23 additions & 8 deletions src/compiler/default_compiler_draft3.h
Original file line number Diff line number Diff line change
Expand Up @@ -2303,18 +2303,25 @@ auto compiler_draft3_applicator_extends(const Context &context,
sourcemeta::core::empty_weak_pointer);
}

auto inner{compile(context, schema_context, relative_dynamic_context(),
sourcemeta::core::empty_weak_pointer,
sourcemeta::core::empty_weak_pointer)};
if (inner.empty()) {
return {};
}

return {make(sourcemeta::blaze::InstructionIndex::LogicalAnd, context,
schema_context, dynamic_context, ValueNone{},
compile(context, schema_context, relative_dynamic_context(),
sourcemeta::core::empty_weak_pointer,
sourcemeta::core::empty_weak_pointer))};
std::move(inner))};
}

if (!value.is_array()) {
return {};
}

assert(!value.empty());
if (value.empty()) {
return {};
}

Instructions children;

Expand All @@ -2331,11 +2338,19 @@ auto compiler_draft3_applicator_extends(const Context &context,
}

for (std::uint64_t index = 0; index < value.size(); index++) {
for (auto &&step : compile(
context, schema_context, relative_dynamic_context(),
{static_cast<sourcemeta::core::Pointer::Token::Index>(index)})) {
children.push_back(std::move(step));
auto arm{
compile(context, schema_context, relative_dynamic_context(),
{static_cast<sourcemeta::core::Pointer::Token::Index>(index)})};
if (arm.empty()) {
continue;
}
children.push_back(make(sourcemeta::blaze::InstructionIndex::ControlGroup,
context, schema_context, relative_dynamic_context(),
ValueNone{}, std::move(arm)));
}

if (children.empty()) {
return {};
}

return {make(sourcemeta::blaze::InstructionIndex::LogicalAnd, context,
Expand Down
2 changes: 1 addition & 1 deletion src/evaluator/evaluator_describe.cc
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ auto describe(const bool valid, const Instruction &step,
}

if (step.type == sourcemeta::blaze::InstructionIndex::LogicalAnd) {
if (keyword == "allOf") {
if (keyword == "allOf" || keyword == "extends") {
assert(!step.children.empty());
std::ostringstream message;
message << "The " << type_name(target.type())
Expand Down
Loading
Loading