Skip to content

Commit a482be0

Browse files
committed
style(clang-tidy): fix bugprone-branch-clone errors
Reported with sourcemeta#1754 Refs sourcemeta#1654 Signed-off-by: Balakrishna Avulapati <ba@bavulapati.com>
1 parent 5fbfa7d commit a482be0

File tree

3 files changed

+5
-58
lines changed

3 files changed

+5
-58
lines changed

src/core/jsonschema/frame.cc

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -669,16 +669,9 @@ auto SchemaFrame::analyse(const JSON &root, const SchemaWalker &walker,
669669
if (!maybe_relative_is_absolute ||
670670
maybe_match == this->locations_.cend()) {
671671
assert(entry.common.base_dialect.has_value());
672-
if (entry.common.orphan) {
673-
store(this->locations_, this->instances_,
674-
SchemaReferenceType::Static,
675-
SchemaFrame::LocationType::Resource, new_id, root_id,
676-
new_id, entry.common.pointer,
677-
sourcemeta::core::empty_pointer,
678-
entry.common.dialect.value(),
679-
entry.common.base_dialect.value(), {},
680-
entry.common.parent);
681-
} else if (this->mode_ == SchemaFrame::Mode::Instances) {
672+
673+
if (!(entry.common.orphan) &&
674+
this->mode_ == SchemaFrame::Mode::Instances) {
682675
store(this->locations_, this->instances_,
683676
SchemaReferenceType::Static,
684677
SchemaFrame::LocationType::Resource, new_id, root_id,
@@ -880,15 +873,8 @@ auto SchemaFrame::analyse(const JSON &root, const SchemaWalker &walker,
880873
const auto subschema{subschemas.find(pointer)};
881874
if (subschema != subschemas.cend()) {
882875
// Handle orphan schemas
883-
if (subschema->second.orphan) {
884-
store(this->locations_, this->instances_,
885-
SchemaReferenceType::Static,
886-
SchemaFrame::LocationType::Subschema, result, root_id,
887-
current_base, pointer,
888-
pointer.resolve_from(nearest_bases.second),
889-
dialects.first.front(), current_base_dialect, {},
890-
subschema->second.parent);
891-
} else if (this->mode_ == SchemaFrame::Mode::Instances) {
876+
if (!(subschema->second.orphan) &&
877+
this->mode_ == SchemaFrame::Mode::Instances) {
892878
store(this->locations_, this->instances_,
893879
SchemaReferenceType::Static,
894880
SchemaFrame::LocationType::Subschema, result, root_id,

src/core/jsonschema/walker.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -376,15 +376,10 @@ auto walk(const std::optional<sourcemeta::core::Pointer> &parent,
376376

377377
break;
378378
case sourcemeta::core::SchemaKeywordType::Assertion:
379-
break;
380379
case sourcemeta::core::SchemaKeywordType::Annotation:
381-
break;
382380
case sourcemeta::core::SchemaKeywordType::Reference:
383-
break;
384381
case sourcemeta::core::SchemaKeywordType::Other:
385-
break;
386382
case sourcemeta::core::SchemaKeywordType::Comment:
387-
break;
388383
case sourcemeta::core::SchemaKeywordType::Unknown:
389384
break;
390385
}

src/core/uri/escaping.cc

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -26,50 +26,22 @@ auto uri_escape(const char character, std::ostream &output,
2626
} else if (mode == URIEscapeMode::SkipSubDelims) {
2727
switch (character) {
2828
case '!':
29-
output.put(character);
30-
break;
3129
case '$':
32-
output.put(character);
33-
break;
3430
case '&':
35-
output.put(character);
36-
break;
3731
case '\'':
38-
output.put(character);
39-
break;
4032
case '(':
41-
output.put(character);
42-
break;
4333
case ')':
44-
output.put(character);
45-
break;
4634
case '*':
47-
output.put(character);
48-
break;
4935
case '+':
50-
output.put(character);
51-
break;
5236
case ',':
53-
output.put(character);
54-
break;
5537
case ';':
56-
output.put(character);
57-
break;
5838
case '=':
59-
output.put(character);
60-
break;
6139

6240
// unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
6341
// See https://www.rfc-editor.org/rfc/rfc3986#appendix-A
6442
case '-':
65-
output.put(character);
66-
break;
6743
case '_':
68-
output.put(character);
69-
break;
7044
case '.':
71-
output.put(character);
72-
break;
7345
case '~':
7446
output.put(character);
7547
break;
@@ -85,14 +57,8 @@ auto uri_escape(const char character, std::ostream &output,
8557
// See https://www.rfc-editor.org/rfc/rfc3986#appendix-A
8658
switch (character) {
8759
case '-':
88-
output.put(character);
89-
break;
9060
case '_':
91-
output.put(character);
92-
break;
9361
case '.':
94-
output.put(character);
95-
break;
9662
case '~':
9763
output.put(character);
9864
break;

0 commit comments

Comments
 (0)