Improve SchemaFrame to use more weak pointers (#2182)

Signed-off-by: Juan Cruz Viotti <[email protected]>

Author: jviotti

src/core/jsonschema/frame.cc

@@ -979,9 +979,9 @@ auto SchemaFrame::references() const noexcept -> const References & {
 }
 
 auto SchemaFrame::reference(const SchemaReferenceType type,
-                            const Pointer &pointer) const
+                            const WeakPointer &pointer) const
     -> std::optional<std::reference_wrapper<const ReferencesEntry>> {
-  const auto result{this->references_.find({type, pointer})};
+  const auto result{this->references_.find({type, to_pointer(pointer)})};
   if (result != this->references_.cend()) {
     return result->second;
   }
@@ -1015,16 +1015,16 @@ auto SchemaFrame::vocabularies(const Location &location,
 }
 
 auto SchemaFrame::uri(const Location &location,
-                      const Pointer &relative_schema_location) const
+                      const WeakPointer &relative_schema_location) const
     -> JSON::String {
-  return to_uri(to_pointer(this->relative_instance_location(location))
-                    .concat(relative_schema_location),
+  return to_uri(this->relative_instance_location(location).concat(
+                    relative_schema_location),
                 location.base)
       .recompose();
 }
 
 auto SchemaFrame::traverse(const Location &location,
-                           const Pointer &relative_schema_location) const
+                           const WeakPointer &relative_schema_location) const
     -> const Location & {
   const auto new_uri{this->uri(location, relative_schema_location)};
   const auto static_match{
@@ -1082,11 +1082,11 @@ auto SchemaFrame::uri(const WeakPointer &pointer) const
 }
 
 auto SchemaFrame::dereference(const Location &location,
-                              const Pointer &relative_schema_location) const
+                              const WeakPointer &relative_schema_location) const
     -> std::pair<SchemaReferenceType,
                  std::optional<std::reference_wrapper<const Location>>> {
   const auto effective_location{
-      to_pointer(location.pointer).concat(relative_schema_location)};
+      to_pointer(location.pointer.concat(relative_schema_location))};
   const auto maybe_reference_entry{this->references_.find(
       {SchemaReferenceType::Static, effective_location})};
   if (maybe_reference_entry == this->references_.cend()) {

src/core/jsonschema/include/sourcemeta/core/jsonschema_frame.h

@@ -153,7 +153,7 @@ class SOURCEMETA_CORE_JSONSCHEMA_EXPORT SchemaFrame {
 
   /// Get a specific reference entry by type and pointer
   [[nodiscard]] auto reference(const SchemaReferenceType type,
-                               const Pointer &pointer) const
+                               const WeakPointer &pointer) const
       -> std::optional<std::reference_wrapper<const ReferencesEntry>>;
 
   /// Check whether the analysed schema has no external references
@@ -170,12 +170,12 @@ class SOURCEMETA_CORE_JSONSCHEMA_EXPORT SchemaFrame {
   /// Get the URI associated with a location entry
   [[nodiscard]] auto
   uri(const Location &location,
-      const Pointer &relative_schema_location = empty_pointer) const
+      const WeakPointer &relative_schema_location = empty_weak_pointer) const
       -> JSON::String;
 
   /// Get the location associated by traversing a pointer from another location
   [[nodiscard]] auto traverse(const Location &location,
-                              const Pointer &relative_schema_location) const
+                              const WeakPointer &relative_schema_location) const
       -> const Location &;
 
   /// Get the location associated with a given URI
@@ -191,9 +191,9 @@ class SOURCEMETA_CORE_JSONSCHEMA_EXPORT SchemaFrame {
       -> std::optional<std::reference_wrapper<const JSON::String>>;
 
   /// Try to dereference a reference location into its destination location
-  [[nodiscard]] auto
-  dereference(const Location &location,
-              const Pointer &relative_schema_location = empty_pointer) const
+  [[nodiscard]] auto dereference(
+      const Location &location,
+      const WeakPointer &relative_schema_location = empty_weak_pointer) const
       -> std::pair<SchemaReferenceType,
                    std::optional<std::reference_wrapper<const Location>>>;
 

src/extension/alterschema/common/unknown_local_ref.h

@@ -29,7 +29,8 @@ class UnknownLocalRef final : public SchemaTransformRule {
                      schema.at(KEYWORD).is_string());
 
     // Find the keyword location entry
-    const auto keyword_pointer{to_pointer(location.pointer).concat({KEYWORD})};
+    auto keyword_pointer{location.pointer};
+    keyword_pointer.push_back(std::cref(KEYWORD));
     const auto reference_entry{
         frame.reference(SchemaReferenceType::Static, keyword_pointer)};
     ONLY_CONTINUE_IF(reference_entry.has_value());