From a482be01ef79b9517f1a925165a5c3e1526df9dd Mon Sep 17 00:00:00 2001
From: Balakrishna Avulapati <ba@bavulapati.com>
Date: Tue, 24 Jun 2025 11:06:49 +0530
Subject: [PATCH] style(clang-tidy): fix bugprone-branch-clone errors

Reported with #1754
Refs #1654

Signed-off-by: Balakrishna Avulapati <ba@bavulapati.com>
---
 src/core/jsonschema/frame.cc  | 24 +++++-------------------
 src/core/jsonschema/walker.cc |  5 -----
 src/core/uri/escaping.cc      | 34 ----------------------------------
 3 files changed, 5 insertions(+), 58 deletions(-)

diff --git a/src/core/jsonschema/frame.cc b/src/core/jsonschema/frame.cc
index e204ab931..5f1913968 100644
--- a/src/core/jsonschema/frame.cc
+++ b/src/core/jsonschema/frame.cc
@@ -669,16 +669,9 @@ auto SchemaFrame::analyse(const JSON &root, const SchemaWalker &walker,
             if (!maybe_relative_is_absolute ||
                 maybe_match == this->locations_.cend()) {
               assert(entry.common.base_dialect.has_value());
-              if (entry.common.orphan) {
-                store(this->locations_, this->instances_,
-                      SchemaReferenceType::Static,
-                      SchemaFrame::LocationType::Resource, new_id, root_id,
-                      new_id, entry.common.pointer,
-                      sourcemeta::core::empty_pointer,
-                      entry.common.dialect.value(),
-                      entry.common.base_dialect.value(), {},
-                      entry.common.parent);
-              } else if (this->mode_ == SchemaFrame::Mode::Instances) {
+
+              if (!(entry.common.orphan) &&
+                  this->mode_ == SchemaFrame::Mode::Instances) {
                 store(this->locations_, this->instances_,
                       SchemaReferenceType::Static,
                       SchemaFrame::LocationType::Resource, new_id, root_id,
@@ -880,15 +873,8 @@ auto SchemaFrame::analyse(const JSON &root, const SchemaWalker &walker,
           const auto subschema{subschemas.find(pointer)};
           if (subschema != subschemas.cend()) {
             // Handle orphan schemas
-            if (subschema->second.orphan) {
-              store(this->locations_, this->instances_,
-                    SchemaReferenceType::Static,
-                    SchemaFrame::LocationType::Subschema, result, root_id,
-                    current_base, pointer,
-                    pointer.resolve_from(nearest_bases.second),
-                    dialects.first.front(), current_base_dialect, {},
-                    subschema->second.parent);
-            } else if (this->mode_ == SchemaFrame::Mode::Instances) {
+            if (!(subschema->second.orphan) &&
+                this->mode_ == SchemaFrame::Mode::Instances) {
               store(this->locations_, this->instances_,
                     SchemaReferenceType::Static,
                     SchemaFrame::LocationType::Subschema, result, root_id,
diff --git a/src/core/jsonschema/walker.cc b/src/core/jsonschema/walker.cc
index ec5492831..8e4620bd8 100644
--- a/src/core/jsonschema/walker.cc
+++ b/src/core/jsonschema/walker.cc
@@ -376,15 +376,10 @@ auto walk(const std::optional<sourcemeta::core::Pointer> &parent,
 
         break;
       case sourcemeta::core::SchemaKeywordType::Assertion:
-        break;
       case sourcemeta::core::SchemaKeywordType::Annotation:
-        break;
       case sourcemeta::core::SchemaKeywordType::Reference:
-        break;
       case sourcemeta::core::SchemaKeywordType::Other:
-        break;
       case sourcemeta::core::SchemaKeywordType::Comment:
-        break;
       case sourcemeta::core::SchemaKeywordType::Unknown:
         break;
     }
diff --git a/src/core/uri/escaping.cc b/src/core/uri/escaping.cc
index fae71e1be..18f0d09af 100644
--- a/src/core/uri/escaping.cc
+++ b/src/core/uri/escaping.cc
@@ -26,50 +26,22 @@ auto uri_escape(const char character, std::ostream &output,
   } else if (mode == URIEscapeMode::SkipSubDelims) {
     switch (character) {
       case '!':
-        output.put(character);
-        break;
       case '$':
-        output.put(character);
-        break;
       case '&':
-        output.put(character);
-        break;
       case '\'':
-        output.put(character);
-        break;
       case '(':
-        output.put(character);
-        break;
       case ')':
-        output.put(character);
-        break;
       case '*':
-        output.put(character);
-        break;
       case '+':
-        output.put(character);
-        break;
       case ',':
-        output.put(character);
-        break;
       case ';':
-        output.put(character);
-        break;
       case '=':
-        output.put(character);
-        break;
 
       // unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
       // See https://www.rfc-editor.org/rfc/rfc3986#appendix-A
       case '-':
-        output.put(character);
-        break;
       case '_':
-        output.put(character);
-        break;
       case '.':
-        output.put(character);
-        break;
       case '~':
         output.put(character);
         break;
@@ -85,14 +57,8 @@ auto uri_escape(const char character, std::ostream &output,
     // See https://www.rfc-editor.org/rfc/rfc3986#appendix-A
     switch (character) {
       case '-':
-        output.put(character);
-        break;
       case '_':
-        output.put(character);
-        break;
       case '.':
-        output.put(character);
-        break;
       case '~':
         output.put(character);
         break;