Fix broken linter rereference guards

jviotti · jviotti · commit 62b30083bc02 · 2026-01-07T15:01:09.000-04:00
Signed-off-by: Juan Cruz Viotti &lt;jv@jviotti.com&gt;
diff --git a/src/extension/alterschema/common/content_schema_without_media_type.h b/src/extension/alterschema/common/content_schema_without_media_type.h
@@ -21,7 +21,7 @@ class ContentSchemaWithoutMediaType final : public SchemaTransformRule {
                      schema.is_object() && schema.defines("contentSchema") &&
                      !schema.defines("contentMediaType"));
     ONLY_CONTINUE_IF(!frame.has_references_through(
-        location.relative_pointer.concat({"contentSchema"})));
+        location.pointer.concat({"contentSchema"})));
     return APPLIES_TO_KEYWORDS("contentSchema");
   }
 
diff --git a/src/extension/alterschema/common/else_empty.h b/src/extension/alterschema/common/else_empty.h
@@ -20,8 +20,8 @@ class ElseEmpty final : public SchemaTransformRule {
         (schema.at("else").is_object() ||
          (!schema.defines("if") ||
           !(schema.at("if").is_boolean() && schema.at("if").to_boolean()))));
-    ONLY_CONTINUE_IF(!frame.has_references_through(
-        location.relative_pointer.concat({"else"})));
+    ONLY_CONTINUE_IF(
+        !frame.has_references_through(location.pointer.concat({"else"})));
     return APPLIES_TO_KEYWORDS("else");
   }
 
diff --git a/src/extension/alterschema/common/else_without_if.h b/src/extension/alterschema/common/else_without_if.h
@@ -20,8 +20,8 @@ class ElseWithoutIf final : public SchemaTransformRule {
                           Vocabularies::Known::JSON_Schema_Draft_7}) &&
                      schema.is_object() && schema.defines("else") &&
                      !schema.defines("if"));
-    ONLY_CONTINUE_IF(!frame.has_references_through(
-        location.relative_pointer.concat({"else"})));
+    ONLY_CONTINUE_IF(
+        !frame.has_references_through(location.pointer.concat({"else"})));
     return APPLIES_TO_KEYWORDS("else");
   }
 
diff --git a/src/extension/alterschema/common/if_without_then_else.h b/src/extension/alterschema/common/if_without_then_else.h
@@ -21,8 +21,8 @@ class IfWithoutThenElse final : public SchemaTransformRule {
                           Vocabularies::Known::JSON_Schema_Draft_7}) &&
                      schema.is_object() && schema.defines("if") &&
                      !schema.defines("then") && !schema.defines("else"));
-    ONLY_CONTINUE_IF(!frame.has_references_through(
-        location.relative_pointer.concat({"if"})));
+    ONLY_CONTINUE_IF(
+        !frame.has_references_through(location.pointer.concat({"if"})));
     return APPLIES_TO_KEYWORDS("if");
   }
 
diff --git a/src/extension/alterschema/common/non_applicable_additional_items.h b/src/extension/alterschema/common/non_applicable_additional_items.h
@@ -24,7 +24,7 @@ class NonApplicableAdditionalItems final : public SchemaTransformRule {
                      schema.is_object() && schema.defines("additionalItems"));
 
     ONLY_CONTINUE_IF(!frame.has_references_through(
-        location.relative_pointer.concat({"additionalItems"})));
+        location.pointer.concat({"additionalItems"})));
 
     if (schema.defines("items") && is_schema(schema.at("items"))) {
       return APPLIES_TO_KEYWORDS("additionalItems", "items");
diff --git a/src/extension/alterschema/common/non_applicable_type_specific_keywords.h b/src/extension/alterschema/common/non_applicable_type_specific_keywords.h
@@ -75,7 +75,7 @@ class NonApplicableTypeSpecificKeywords final : public SchemaTransformRule {
       if ((metadata.instances & current_types).none()) {
         // Skip keywords that have references pointing to them
         if (frame.has_references_through(
-                location.relative_pointer.concat({entry.first}))) {
+                location.pointer.concat({entry.first}))) {
           continue;
         }
 
diff --git a/src/extension/alterschema/common/not_false.h b/src/extension/alterschema/common/not_false.h
@@ -20,8 +20,8 @@ class NotFalse final : public SchemaTransformRule {
                      schema.is_object() && schema.defines("not") &&
                      schema.at("not").is_boolean() &&
                      !schema.at("not").to_boolean());
-    ONLY_CONTINUE_IF(!frame.has_references_through(
-        location.relative_pointer.concat({"not"})));
+    ONLY_CONTINUE_IF(
+        !frame.has_references_through(location.pointer.concat({"not"})));
     return APPLIES_TO_KEYWORDS("not");
   }
 
diff --git a/src/extension/alterschema/common/then_empty.h b/src/extension/alterschema/common/then_empty.h
@@ -20,8 +20,8 @@ class ThenEmpty final : public SchemaTransformRule {
         (schema.at("then").is_object() ||
          (!schema.defines("if") ||
           !(schema.at("if").is_boolean() && schema.at("if").to_boolean()))));
-    ONLY_CONTINUE_IF(!frame.has_references_through(
-        location.relative_pointer.concat({"then"})));
+    ONLY_CONTINUE_IF(
+        !frame.has_references_through(location.pointer.concat({"then"})));
     return APPLIES_TO_KEYWORDS("then");
   }
 
diff --git a/src/extension/alterschema/common/then_without_if.h b/src/extension/alterschema/common/then_without_if.h
@@ -20,8 +20,8 @@ class ThenWithoutIf final : public SchemaTransformRule {
                           Vocabularies::Known::JSON_Schema_Draft_7}) &&
                      schema.is_object() && schema.defines("then") &&
                      !schema.defines("if"));
-    ONLY_CONTINUE_IF(!frame.has_references_through(
-        location.relative_pointer.concat({"then"})));
+    ONLY_CONTINUE_IF(
+        !frame.has_references_through(location.pointer.concat({"then"})));
     return APPLIES_TO_KEYWORDS("then");
   }
 
diff --git a/src/extension/alterschema/common/unnecessary_allof_wrapper.h b/src/extension/alterschema/common/unnecessary_allof_wrapper.h
@@ -52,8 +52,7 @@ class UnnecessaryAllOfWrapper final : public SchemaTransformRule {
       }
 
       // Skip entries that have direct references pointing to them
-      const auto entry_pointer{
-          location.relative_pointer.concat({"allOf", index - 1})};
+      const auto entry_pointer{location.pointer.concat({"allOf", index - 1})};
       if (frame.has_references_to(entry_pointer)) {
         continue;
       }
diff --git a/src/extension/alterschema/linter/additional_properties_default.h b/src/extension/alterschema/linter/additional_properties_default.h
@@ -33,7 +33,7 @@ class AdditionalPropertiesDefault final : public SchemaTransformRule {
                       (schema.at("additionalProperties").is_object() &&
                        schema.at("additionalProperties").empty())));
     ONLY_CONTINUE_IF(!frame.has_references_through(
-        location.relative_pointer.concat({"additionalProperties"})));
+        location.pointer.concat({"additionalProperties"})));
     return APPLIES_TO_KEYWORDS("additionalProperties");
   }
 
diff --git a/src/extension/alterschema/linter/content_schema_default.h b/src/extension/alterschema/linter/content_schema_default.h
@@ -24,7 +24,7 @@ class ContentSchemaDefault final : public SchemaTransformRule {
                       (schema.at("contentSchema").is_object() &&
                        schema.at("contentSchema").empty())));
     ONLY_CONTINUE_IF(!frame.has_references_through(
-        location.relative_pointer.concat({"contentSchema"})));
+        location.pointer.concat({"contentSchema"})));
     return APPLIES_TO_KEYWORDS("contentSchema");
   }
 
diff --git a/src/extension/alterschema/linter/dependencies_default.h b/src/extension/alterschema/linter/dependencies_default.h
@@ -24,7 +24,7 @@ class DependenciesDefault final : public SchemaTransformRule {
         schema.at("dependencies").is_object() &&
         schema.at("dependencies").empty());
     ONLY_CONTINUE_IF(!frame.has_references_through(
-        location.relative_pointer.concat({"dependencies"})));
+        location.pointer.concat({"dependencies"})));
     return APPLIES_TO_KEYWORDS("dependencies");
   }
 
diff --git a/src/extension/alterschema/linter/items_schema_default.h b/src/extension/alterschema/linter/items_schema_default.h
@@ -29,8 +29,8 @@ class ItemsSchemaDefault final : public SchemaTransformRule {
         schema.is_object() && schema.defines("items") &&
         ((schema.at("items").is_boolean() && schema.at("items").to_boolean()) ||
          (schema.at("items").is_object() && schema.at("items").empty())));
-    ONLY_CONTINUE_IF(!frame.has_references_through(
-        location.relative_pointer.concat({"items"})));
+    ONLY_CONTINUE_IF(
+        !frame.has_references_through(location.pointer.concat({"items"})));
     return APPLIES_TO_KEYWORDS("items");
   }
 
diff --git a/src/extension/alterschema/linter/property_names_default.h b/src/extension/alterschema/linter/property_names_default.h
@@ -24,7 +24,7 @@ class PropertyNamesDefault final : public SchemaTransformRule {
                      schema.at("propertyNames").is_object() &&
                      schema.at("propertyNames").empty());
     ONLY_CONTINUE_IF(!frame.has_references_through(
-        location.relative_pointer.concat({"propertyNames"})));
+        location.pointer.concat({"propertyNames"})));
     return APPLIES_TO_KEYWORDS("propertyNames");
   }
 
diff --git a/src/extension/alterschema/linter/unevaluated_items_default.h b/src/extension/alterschema/linter/unevaluated_items_default.h
@@ -25,7 +25,7 @@ class UnevaluatedItemsDefault final : public SchemaTransformRule {
          (schema.at("unevaluatedItems").is_object() &&
           schema.at("unevaluatedItems").empty())));
     ONLY_CONTINUE_IF(!frame.has_references_through(
-        location.relative_pointer.concat({"unevaluatedItems"})));
+        location.pointer.concat({"unevaluatedItems"})));
     return APPLIES_TO_KEYWORDS("unevaluatedItems");
   }
 
diff --git a/src/extension/alterschema/linter/unevaluated_properties_default.h b/src/extension/alterschema/linter/unevaluated_properties_default.h
@@ -25,7 +25,7 @@ class UnevaluatedPropertiesDefault final : public SchemaTransformRule {
          (schema.at("unevaluatedProperties").is_object() &&
           schema.at("unevaluatedProperties").empty())));
     ONLY_CONTINUE_IF(!frame.has_references_through(
-        location.relative_pointer.concat({"unevaluatedProperties"})));
+        location.pointer.concat({"unevaluatedProperties"})));
     return APPLIES_TO_KEYWORDS("unevaluatedProperties");
   }
 
diff --git a/test/alterschema/alterschema_lint_2020_12_test.cc b/test/alterschema/alterschema_lint_2020_12_test.cc

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class ContentSchemaWithoutMediaType final : public SchemaTransformRule {`
`21`	`21`	`schema.is_object() && schema.defines("contentSchema") &&`
`22`	`22`	`!schema.defines("contentMediaType"));`
`23`	`23`	`ONLY_CONTINUE_IF(!frame.has_references_through(`
`24`		`- location.relative_pointer.concat({"contentSchema"})));`
	`24`	`+ location.pointer.concat({"contentSchema"})));`
`25`	`25`	`return APPLIES_TO_KEYWORDS("contentSchema");`
`26`	`26`	`}`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ class NonApplicableTypeSpecificKeywords final : public SchemaTransformRule {`
`75`	`75`	`if ((metadata.instances & current_types).none()) {`
`76`	`76`	`// Skip keywords that have references pointing to them`
`77`	`77`	`if (frame.has_references_through(`
`78`		`- location.relative_pointer.concat({entry.first}))) {`
	`78`	`+ location.pointer.concat({entry.first}))) {`
`79`	`79`	`continue;`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,7 @@ class UnnecessaryAllOfWrapper final : public SchemaTransformRule {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`// Skip entries that have direct references pointing to them`
`55`		`- const auto entry_pointer{`
`56`		`- location.relative_pointer.concat({"allOf", index - 1})};`
	`55`	`+ const auto entry_pointer{location.pointer.concat({"allOf", index - 1})};`
`57`	`56`	`if (frame.has_references_to(entry_pointer)) {`
`58`	`57`	`continue;`
`59`	`58`	`}`