Skip to content

Commit 06e4b6f

Browse files
committed
address review comments
1 parent c40a2c8 commit 06e4b6f

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

src/core/jsonschema/frame.cc

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,13 @@ auto find_anchors(const sourcemeta::core::JSON &schema,
7575
assert(schema.at("$id").is_string());
7676
const sourcemeta::core::URI identifier(schema.at("$id").to_string());
7777
if (identifier.is_fragment_only()) {
78-
result.insert({sourcemeta::core::JSON::String{
79-
identifier.fragment() ? identifier.fragment().value()
80-
: "what should we have here?"},
81-
AnchorType::Static});
78+
result.insert(
79+
{sourcemeta::core::JSON::String{
80+
identifier.fragment()
81+
.value()}, // NOLINT(bugprone-unchecked-optional-access):
82+
// Check for optional is happening
83+
// inside is_fragment_only()
84+
AnchorType::Static});
8285
}
8386
}
8487
}
@@ -91,10 +94,13 @@ auto find_anchors(const sourcemeta::core::JSON &schema,
9194
assert(schema.at("id").is_string());
9295
const sourcemeta::core::URI identifier(schema.at("id").to_string());
9396
if (identifier.is_fragment_only()) {
94-
result.insert({sourcemeta::core::JSON::String{
95-
identifier.fragment() ? identifier.fragment().value()
96-
: "what should we have here?"},
97-
AnchorType::Static});
97+
result.insert(
98+
{sourcemeta::core::JSON::String{
99+
identifier.fragment()
100+
.value()}, // NOLINT(bugprone-unchecked-optional-access):
101+
// Check for optional is happening
102+
// inside is_fragment_only()
103+
AnchorType::Static});
98104
}
99105
}
100106
}

src/core/jsonschema/walker.cc

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,11 @@ auto walk(const std::optional<sourcemeta::core::Pointer> &parent,
4545
const auto is_schema_resource{level == 0 || id.has_value()};
4646
const auto current_dialect{is_schema_resource ? maybe_current_dialect.value()
4747
: dialect};
48-
const auto opt_current_base_dialect =
49-
sourcemeta::core::base_dialect(subschema, resolver, current_dialect);
50-
const auto current_base_dialect{is_schema_resource
51-
? (opt_current_base_dialect
52-
? opt_current_base_dialect.value()
53-
: base_dialect)
54-
: base_dialect};
48+
const auto current_base_dialect{
49+
is_schema_resource
50+
? sourcemeta::core::base_dialect(subschema, resolver, current_dialect)
51+
.value_or(base_dialect)
52+
: base_dialect};
5553

5654
const auto vocabularies{sourcemeta::core::vocabularies(
5755
resolver, current_base_dialect, current_dialect)};

0 commit comments

Comments
 (0)