Skip to content
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.

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

Extend internal SchemaFrame structures to track relative instance locations #1545

Merged
merged 1 commit into from
Feb 10, 2025
Merged
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
8 changes: 5 additions & 3 deletions src/core/jsonschema/frame.cc
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ static auto traverse_instance_locations(

struct CacheSubschema {
const sourcemeta::core::PointerTemplate instance_location;
const sourcemeta::core::PointerTemplate relative_instance_location;
const bool orphan;
const std::optional<sourcemeta::core::Pointer> parent;
};
Expand Down Expand Up @@ -353,9 +354,10 @@ auto internal_analyse(const sourcemeta::core::JSON &schema,

// Store information
subschema_entries.emplace_back(InternalEntry{entry, std::move(id)});
subschemas.emplace(
entry.pointer,
CacheSubschema{entry.instance_location, entry.orphan, entry.parent});
subschemas.emplace(entry.pointer,
CacheSubschema{entry.instance_location,
entry.relative_instance_location,
entry.orphan, entry.parent});
}

for (const auto &entry : subschema_entries) {
Expand Down