Update schema_resource_id to directly take resources (#535)

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

src/compiler/compile.cc

@@ -74,8 +74,9 @@ auto precompile(
     -> sourcemeta::blaze::Instructions {
   const sourcemeta::core::URI anchor_uri{entry.first.second};
   const auto label{sourcemeta::blaze::Evaluator{}.hash(
-      schema_resource_id(context,
-                         anchor_uri.recompose_without_fragment().value_or("")),
+      sourcemeta::blaze::schema_resource_id(
+          context.resources,
+          anchor_uri.recompose_without_fragment().value_or("")),
       std::string{anchor_uri.fragment().value_or("")})};
   schema_context.labels.insert(label);
 

src/compiler/compile_helpers.h

@@ -29,18 +29,17 @@ inline auto property_relative_dynamic_context() -> DynamicContext {
           true};
 }
 
-inline auto schema_resource_id(const Context &context,
+inline auto schema_resource_id(const std::vector<std::string> &resources,
                                const std::string &resource) -> std::size_t {
-  const auto iterator{std::find(context.resources.cbegin(),
-                                context.resources.cend(),
+  const auto iterator{std::find(resources.cbegin(), resources.cend(),
                                 sourcemeta::core::URI::canonicalize(resource))};
-  if (iterator == context.resources.cend()) {
+  if (iterator == resources.cend()) {
     assert(resource.empty());
     return 0;
   }
 
-  return 1 + static_cast<std::size_t>(
-                 std::distance(context.resources.cbegin(), iterator));
+  return 1 +
+         static_cast<std::size_t>(std::distance(resources.cbegin(), iterator));
 }
 
 // Instantiate a value-oriented step with a custom resource
@@ -58,7 +57,7 @@ inline auto make_with_resource(const InstructionIndex type,
                 {dynamic_context.keyword}),
       dynamic_context.base_instance_location,
       to_uri(schema_context.relative_pointer, schema_context.base).recompose(),
-      schema_resource_id(context, resource),
+      schema_resource_id(context.resources, resource),
       value,
       {}};
 }
@@ -85,7 +84,7 @@ inline auto make(const InstructionIndex type, const Context &context,
                 {dynamic_context.keyword}),
       dynamic_context.base_instance_location,
       to_uri(schema_context.relative_pointer, schema_context.base).recompose(),
-      schema_resource_id(context, schema_context.base.recompose()),
+      schema_resource_id(context.resources, schema_context.base.recompose()),
       std::move(value),
       std::move(children)};
 }

src/compiler/default_compiler_draft4.h

@@ -212,9 +212,9 @@ auto compiler_draft4_core_ref(const Context &context,
   }
 
   const auto &reference{context.frame.references().at({type, entry.pointer})};
-  const auto label{
-      Evaluator{}.hash(schema_resource_id(context, reference.base.value_or("")),
-                       reference.fragment.value_or(""))};
+  const auto label{Evaluator{}.hash(
+      schema_resource_id(context.resources, reference.base.value_or("")),
+      reference.fragment.value_or(""))};
 
   // The label is already registered, so just jump to it
   if (schema_context.labels.contains(label) ||