From b294639a5cbd2a51fc5bb5e55e0c386ee568ca8c Mon Sep 17 00:00:00 2001
From: Aymeric Fromherz
Date: Fri, 24 May 2024 13:28:12 +0200
Subject: Rename meta into span

---
 compiler/Substitute.ml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'compiler/Substitute.ml')

diff --git a/compiler/Substitute.ml b/compiler/Substitute.ml
index 177d8c24..37ef6987 100644
--- a/compiler/Substitute.ml
+++ b/compiler/Substitute.ml
@@ -68,7 +68,7 @@ let ctx_adt_get_instantiated_field_types (ctx : eval_ctx)
     **IMPORTANT**: this function doesn't normalize the types, you may want to
     use the [AssociatedTypes] equivalent instead.
  *)
-let ctx_adt_value_get_instantiated_field_types (meta : Meta.meta)
+let ctx_adt_value_get_instantiated_field_types (span : Meta.span)
     (ctx : eval_ctx) (adt : adt_value) (id : type_id) (generics : generic_args)
     : ty list =
   match id with
@@ -76,19 +76,19 @@ let ctx_adt_value_get_instantiated_field_types (meta : Meta.meta)
       (* Retrieve the types of the fields *)
       ctx_adt_get_instantiated_field_types ctx id adt.variant_id generics
   | TTuple ->
-      cassert __FILE__ __LINE__ (generics.regions = []) meta
+      cassert __FILE__ __LINE__ (generics.regions = []) span
         "Tuples don't have region parameters";
       generics.types
   | TAssumed aty -> (
       match aty with
       | TBox ->
-          sanity_check __FILE__ __LINE__ (generics.regions = []) meta;
-          sanity_check __FILE__ __LINE__ (List.length generics.types = 1) meta;
-          sanity_check __FILE__ __LINE__ (generics.const_generics = []) meta;
+          sanity_check __FILE__ __LINE__ (generics.regions = []) span;
+          sanity_check __FILE__ __LINE__ (List.length generics.types = 1) span;
+          sanity_check __FILE__ __LINE__ (generics.const_generics = []) span;
           generics.types
       | TArray | TSlice | TStr ->
           (* Those types don't have fields *)
-          craise __FILE__ __LINE__ meta "Unreachable")
+          craise __FILE__ __LINE__ span "Unreachable")
 
 (** Substitute a function signature, together with the regions hierarchy
     associated to that signature.
@@ -138,41 +138,41 @@ let subst_ids_visitor (r_subst : RegionId.id -> RegionId.id)
     method! visit_loan_id _ bid = bsubst bid
     method! visit_symbolic_value_id _ id = ssubst id
 
-    (** We *do* visit meta-values *)
+    (** We *do* visit span-values *)
     method! visit_msymbolic_value env sv = self#visit_symbolic_value env sv
 
-    (** We *do* visit meta-values *)
+    (** We *do* visit span-values *)
     method! visit_mvalue env v = self#visit_typed_value env v
 
     method! visit_abstraction_id _ id = asubst id
   end
 
-let typed_value_subst_ids (meta : Meta.meta)
+let typed_value_subst_ids (span : Meta.span)
     (r_subst : RegionId.id -> RegionId.id)
     (ty_subst : TypeVarId.id -> TypeVarId.id)
     (cg_subst : ConstGenericVarId.id -> ConstGenericVarId.id)
     (ssubst : SymbolicValueId.id -> SymbolicValueId.id)
     (bsubst : BorrowId.id -> BorrowId.id) (v : typed_value) : typed_value =
-  let asubst _ = craise __FILE__ __LINE__ meta "Unreachable" in
+  let asubst _ = craise __FILE__ __LINE__ span "Unreachable" in
   let vis = subst_ids_visitor r_subst ty_subst cg_subst ssubst bsubst asubst in
   vis#visit_typed_value () v
 
-let typed_value_subst_rids (meta : Meta.meta)
+let typed_value_subst_rids (span : Meta.span)
     (r_subst : RegionId.id -> RegionId.id) (v : typed_value) : typed_value =
-  typed_value_subst_ids meta r_subst
+  typed_value_subst_ids span r_subst
     (fun x -> x)
     (fun x -> x)
     (fun x -> x)
     (fun x -> x)
     v
 
-let typed_avalue_subst_ids (meta : Meta.meta)
+let typed_avalue_subst_ids (span : Meta.span)
     (r_subst : RegionId.id -> RegionId.id)
     (ty_subst : TypeVarId.id -> TypeVarId.id)
     (cg_subst : ConstGenericVarId.id -> ConstGenericVarId.id)
     (ssubst : SymbolicValueId.id -> SymbolicValueId.id)
     (bsubst : BorrowId.id -> BorrowId.id) (v : typed_avalue) : typed_avalue =
-  let asubst _ = craise __FILE__ __LINE__ meta "Unreachable" in
+  let asubst _ = craise __FILE__ __LINE__ span "Unreachable" in
   let vis = subst_ids_visitor r_subst ty_subst cg_subst ssubst bsubst asubst in
   vis#visit_typed_avalue () v
 
@@ -194,9 +194,9 @@ let env_subst_ids (r_subst : RegionId.id -> RegionId.id)
   let vis = subst_ids_visitor r_subst ty_subst cg_subst ssubst bsubst asubst in
   vis#visit_env () x
 
-let typed_avalue_subst_rids (meta : Meta.meta)
+let typed_avalue_subst_rids (span : Meta.span)
     (r_subst : RegionId.id -> RegionId.id) (x : typed_avalue) : typed_avalue =
-  let asubst _ = craise __FILE__ __LINE__ meta "Unreachable" in
+  let asubst _ = craise __FILE__ __LINE__ span "Unreachable" in
   let vis =
     subst_ids_visitor r_subst
       (fun x -> x)
-- 
cgit v1.2.3