Skip to content

[WIP] Fix documentation segfault #753

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

Draft
jviotti wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[WIP] Fix documentation segfault #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 12 additions & 15 deletions src/documentation/documentation.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,12 @@ auto emit_row(const sourcemeta::core::JSON &schema, sourcemeta::core::JSON path,
}
}

if (expand_applicators && is_complex_schema(schema)) {
if (expand_applicators && is_complex_schema(schema) &&
visited.find(&schema) == visited.end()) {
visited.emplace(&schema,
VisitedEntry{.identifier = static_cast<std::size_t>(
row.at("identifier").to_integer()),
.path = row.at("path")});
auto row_children{sourcemeta::core::JSON::make_array()};
walk_branches("anyOf", "Any of", schema, row_children, frame, root, visited,
next_identifier);
Expand All @@ -657,22 +662,10 @@ auto emit_row(const sourcemeta::core::JSON &schema, sourcemeta::core::JSON path,
next_identifier);
walk_if_then_else(schema, row_children, frame, root, visited,
next_identifier);
if (schema.is_object() && schema.defines("not")) {
const auto &not_schema{schema.at("not")};
const auto has_inline{
not_schema.is_object() &&
!(not_schema.defines("anyOf") || not_schema.defines("oneOf") ||
not_schema.defines("allOf") || not_schema.defines("not")) &&
!constraints_of(not_schema).empty()};
if (!has_inline) {
walk_branching_subschema("Must NOT match", "value", not_schema,
row_children, frame, root, visited,
next_identifier, false);
}
}
if (!row_children.empty()) {
row.assign("children", std::move(row_children));
}
visited.erase(&schema);
}

rows.push_back(std::move(row));
Expand Down Expand Up @@ -745,7 +738,10 @@ auto walk_properties(const sourcemeta::core::JSON &schema,
const auto row_identifier{
static_cast<std::size_t>(row.at("identifier").to_integer())};

if (is_complex_schema(resolved)) {
if (is_complex_schema(resolved) &&
visited.find(&resolved) == visited.end()) {
visited.emplace(&resolved,
VisitedEntry{.identifier = row_identifier, .path = path});
auto prop_children{sourcemeta::core::JSON::make_array()};
walk_branches("anyOf", "Any of", resolved, prop_children, frame, root,
visited, next_identifier);
Expand All @@ -771,6 +767,7 @@ auto walk_properties(const sourcemeta::core::JSON &schema,
if (!prop_children.empty()) {
row.assign("children", std::move(prop_children));
}
visited.erase(&resolved);
}

rows.push_back(std::move(row));
Expand Down
Loading
Loading