diff options
| author | Pierre-Marie Pédrot | 2016-02-15 13:31:54 +0100 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2016-02-15 13:41:16 +0100 |
| commit | 1a8c37ca352c95b4cd530efbbf47f0e7671d1fb3 (patch) | |
| tree | 15aadd829fe3e8c3ee0a747de34a9b96614bfdba /pretyping | |
| parent | 968dfdb15cc11d48783017b2a91147b25c854ad6 (diff) | |
Renaming functions in Typing to stick to the standard e_* scheme.
Diffstat (limited to 'pretyping')
| -rw-r--r-- | pretyping/coercion.ml | 2 | ||||
| -rw-r--r-- | pretyping/typing.ml | 8 | ||||
| -rw-r--r-- | pretyping/typing.mli | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pretyping/coercion.ml b/pretyping/coercion.ml index 489a311bc6..8dae311a9f 100644 --- a/pretyping/coercion.ml +++ b/pretyping/coercion.ml @@ -187,7 +187,7 @@ and coerce loc env evdref (x : Term.constr) (y : Term.constr) (subst1 hdy restT') (succ i) (fun x -> eq_app (co x)) else Some (fun x -> let term = co x in - Typing.solve_evars env evdref term) + Typing.e_solve_evars env evdref term) in if isEvar c || isEvar c' then (* Second-order unification needed. *) diff --git a/pretyping/typing.ml b/pretyping/typing.ml index fb0c49320f..022c85340a 100644 --- a/pretyping/typing.ml +++ b/pretyping/typing.ml @@ -267,7 +267,7 @@ and execute_recdef env evdref (names,lar,vdef) = and execute_array env evdref = Array.map (execute env evdref) -let check env evdref c t = +let e_check env evdref c t = let env = enrich_env env evdref in let j = execute env evdref c in if not (Evarconv.e_cumul env evdref j.uj_type t) then @@ -283,7 +283,7 @@ let unsafe_type_of env evd c = (* Sort of a type *) -let sort_of env evdref c = +let e_sort_of env evdref c = let env = enrich_env env evdref in let j = execute env evdref c in let a = e_type_judgment env evdref j in @@ -310,10 +310,10 @@ let e_type_of ?(refresh=false) env evdref c = c else j.uj_type -let solve_evars env evdref c = +let e_solve_evars env evdref c = let env = enrich_env env evdref in let c = (execute env evdref c).uj_val in (* side-effect on evdref *) nf_evar !evdref c -let _ = Evarconv.set_solve_evars solve_evars +let _ = Evarconv.set_solve_evars e_solve_evars diff --git a/pretyping/typing.mli b/pretyping/typing.mli index dafd75231a..e524edcca8 100644 --- a/pretyping/typing.mli +++ b/pretyping/typing.mli @@ -24,16 +24,16 @@ val type_of : ?refresh:bool -> env -> evar_map -> constr -> evar_map * types val e_type_of : ?refresh:bool -> env -> evar_map ref -> constr -> types (** Typecheck a type and return its sort *) -val sort_of : env -> evar_map ref -> types -> sorts +val e_sort_of : env -> evar_map ref -> types -> sorts (** Typecheck a term has a given type (assuming the type is OK) *) -val check : env -> evar_map ref -> constr -> types -> unit +val e_check : env -> evar_map ref -> constr -> types -> unit (** Returns the instantiated type of a metavariable *) val meta_type : evar_map -> metavariable -> types (** Solve existential variables using typing *) -val solve_evars : env -> evar_map ref -> constr -> constr +val e_solve_evars : env -> evar_map ref -> constr -> constr (** Raise an error message if incorrect elimination for this inductive *) (** (first constr is term to match, second is return predicate) *) |