diff options
Diffstat (limited to 'compiler/InterpreterUtils.ml')
| -rw-r--r-- | compiler/InterpreterUtils.ml | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/compiler/InterpreterUtils.ml b/compiler/InterpreterUtils.ml index a10ba89e..653a0e24 100644 --- a/compiler/InterpreterUtils.ml +++ b/compiler/InterpreterUtils.ml @@ -49,14 +49,14 @@ let statement_to_string ctx = Print.EvalCtx.statement_to_string ctx "" " " let statement_to_string_with_tab ctx = Print.EvalCtx.statement_to_string ctx " " " " -let env_elem_to_string meta ctx = - Print.EvalCtx.env_elem_to_string ~meta:(Some meta) ctx "" " " +let env_elem_to_string span ctx = + Print.EvalCtx.env_elem_to_string ~span:(Some span) ctx "" " " -let env_to_string meta ctx env = - eval_ctx_to_string ~meta:(Some meta) { ctx with env } +let env_to_string span ctx env = + eval_ctx_to_string ~span:(Some span) { ctx with env } -let abs_to_string meta ctx = - Print.EvalCtx.abs_to_string ~meta:(Some meta) ctx "" " " +let abs_to_string span ctx = + Print.EvalCtx.abs_to_string ~span:(Some span) ctx "" " " let same_symbolic_id (sv0 : symbolic_value) (sv1 : symbolic_value) : bool = sv0.sv_id = sv1.sv_id @@ -69,31 +69,31 @@ let mk_place_from_var_id (var_id : VarId.id) : place = { var_id; projection = [] } (** Create a fresh symbolic value *) -let mk_fresh_symbolic_value (meta : Meta.meta) (ty : ty) : symbolic_value = +let mk_fresh_symbolic_value (span : Meta.span) (ty : ty) : symbolic_value = (* Sanity check *) - sanity_check __FILE__ __LINE__ (ty_is_rty ty) meta; + sanity_check __FILE__ __LINE__ (ty_is_rty ty) span; let sv_id = fresh_symbolic_value_id () in let svalue = { sv_id; sv_ty = ty } in svalue -let mk_fresh_symbolic_value_from_no_regions_ty (meta : Meta.meta) (ty : ty) : +let mk_fresh_symbolic_value_from_no_regions_ty (span : Meta.span) (ty : ty) : symbolic_value = - sanity_check __FILE__ __LINE__ (ty_no_regions ty) meta; - mk_fresh_symbolic_value meta ty + sanity_check __FILE__ __LINE__ (ty_no_regions ty) span; + mk_fresh_symbolic_value span ty (** Create a fresh symbolic value *) -let mk_fresh_symbolic_typed_value (meta : Meta.meta) (rty : ty) : typed_value = - sanity_check __FILE__ __LINE__ (ty_is_rty rty) meta; +let mk_fresh_symbolic_typed_value (span : Meta.span) (rty : ty) : typed_value = + sanity_check __FILE__ __LINE__ (ty_is_rty rty) span; let ty = Substitute.erase_regions rty in (* Generate the fresh a symbolic value *) - let value = mk_fresh_symbolic_value meta rty in + let value = mk_fresh_symbolic_value span rty in let value = VSymbolic value in { value; ty } -let mk_fresh_symbolic_typed_value_from_no_regions_ty (meta : Meta.meta) +let mk_fresh_symbolic_typed_value_from_no_regions_ty (span : Meta.span) (ty : ty) : typed_value = - sanity_check __FILE__ __LINE__ (ty_no_regions ty) meta; - mk_fresh_symbolic_typed_value meta ty + sanity_check __FILE__ __LINE__ (ty_no_regions ty) span; + mk_fresh_symbolic_typed_value span ty (** Create a typed value from a symbolic value. *) let mk_typed_value_from_symbolic_value (svalue : symbolic_value) : typed_value = @@ -119,10 +119,10 @@ let mk_aproj_loans_value_from_symbolic_value (regions : RegionId.Set.t) else { value = AIgnored; ty = svalue.sv_ty } (** Create a borrows projector from a symbolic value *) -let mk_aproj_borrows_from_symbolic_value (meta : Meta.meta) +let mk_aproj_borrows_from_symbolic_value (span : Meta.span) (proj_regions : RegionId.Set.t) (svalue : symbolic_value) (proj_ty : ty) : aproj = - sanity_check __FILE__ __LINE__ (ty_is_rty proj_ty) meta; + sanity_check __FILE__ __LINE__ (ty_is_rty proj_ty) span; if ty_has_regions_in_set proj_regions proj_ty then AProjBorrows (svalue, proj_ty) else AIgnoredProjBorrows @@ -136,7 +136,7 @@ let borrow_in_asb (bid : BorrowId.id) (asb : abstract_shared_borrows) : bool = List.exists (borrow_is_asb bid) asb (** TODO: move *) -let remove_borrow_from_asb (meta : Meta.meta) (bid : BorrowId.id) +let remove_borrow_from_asb (span : Meta.span) (bid : BorrowId.id) (asb : abstract_shared_borrows) : abstract_shared_borrows = let removed = ref 0 in let asb = @@ -148,7 +148,7 @@ let remove_borrow_from_asb (meta : Meta.meta) (bid : BorrowId.id) false)) asb in - sanity_check __FILE__ __LINE__ (!removed = 1) meta; + sanity_check __FILE__ __LINE__ (!removed = 1) span; asb (** We sometimes need to return a value whose type may vary depending on @@ -285,7 +285,7 @@ let value_has_ret_symbolic_value_with_borrow_under_mut (ctx : eval_ctx) with Found -> true (** Return the place used in an rvalue, if that makes sense. - This is used to compute meta-data, to find pretty names. + This is used to compute span-data, to find pretty names. *) let rvalue_get_place (rv : rvalue) : place option = match rv with @@ -423,7 +423,7 @@ let empty_ids_set = fst (compute_ctxs_ids []) (** **WARNING**: this function doesn't compute the normalized types (for the trait type aliases). This should be computed afterwards. *) -let initialize_eval_ctx (meta : Meta.meta) (ctx : decls_ctx) +let initialize_eval_ctx (span : Meta.span) (ctx : decls_ctx) (region_groups : RegionGroupId.id list) (type_vars : type_var list) (const_generic_vars : const_generic_var list) : eval_ctx = reset_global_counters (); @@ -432,7 +432,7 @@ let initialize_eval_ctx (meta : Meta.meta) (ctx : decls_ctx) (List.map (fun (cg : const_generic_var) -> let ty = TLiteral cg.ty in - let cv = mk_fresh_symbolic_typed_value meta ty in + let cv = mk_fresh_symbolic_typed_value span ty in (cg.index, cv)) const_generic_vars) in @@ -455,7 +455,7 @@ let initialize_eval_ctx (meta : Meta.meta) (ctx : decls_ctx) region ids. This is mostly used in preparation of function calls (when evaluating in symbolic mode). *) -let instantiate_fun_sig (meta : Meta.meta) (ctx : eval_ctx) +let instantiate_fun_sig (span : Meta.span) (ctx : eval_ctx) (generics : generic_args) (tr_self : trait_instance_id) (sg : fun_sig) (regions_hierarchy : region_var_groups) : inst_fun_sig = log#ldebug @@ -496,10 +496,10 @@ let instantiate_fun_sig (meta : Meta.meta) (ctx : eval_ctx) types containing regions. *) sanity_check __FILE__ __LINE__ (List.for_all TypesUtils.ty_no_regions generics.types) - meta; + span; sanity_check __FILE__ __LINE__ (TypesUtils.trait_instance_id_no_regions tr_self) - meta; + span; let tsubst = Substitute.make_type_subst_from_vars sg.generics.types generics.types in @@ -513,7 +513,7 @@ let instantiate_fun_sig (meta : Meta.meta) (ctx : eval_ctx) in (* Substitute the signature *) let inst_sig = - AssociatedTypes.ctx_subst_norm_signature meta ctx asubst rsubst tsubst + AssociatedTypes.ctx_subst_norm_signature span ctx asubst rsubst tsubst cgsubst tr_subst tr_self sg regions_hierarchy in (* Return *) |