diff options
| author | Jason Gross | 2014-08-12 11:03:05 -0400 |
|---|---|---|
| committer | Pierre Boutillier | 2014-08-25 15:22:40 +0200 |
| commit | 876b1b39a0304c93c2511ca8dd34353413e91c9d (patch) | |
| tree | 348c5630f0b35edf53fe4010587b61e615df03af /pretyping | |
| parent | a061b4d11fc681182b5bb946aa84d17d0b812225 (diff) | |
instanciation is French, instantiation is English
Diffstat (limited to 'pretyping')
| -rw-r--r-- | pretyping/typeclasses.ml | 8 | ||||
| -rw-r--r-- | pretyping/typeclasses.mli | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pretyping/typeclasses.ml b/pretyping/typeclasses.ml index 67189e22d7..b9c2bd1bb3 100644 --- a/pretyping/typeclasses.ml +++ b/pretyping/typeclasses.ml @@ -32,10 +32,10 @@ let set_typeclass_transparency gr local c = Hook.get set_typeclass_transparency let (classes_transparent_state, classes_transparent_state_hook) = Hook.make () let classes_transparent_state () = Hook.get classes_transparent_state () -let solve_instanciation_problem = ref (fun _ _ _ -> assert false) +let solve_instantiation_problem = ref (fun _ _ _ -> assert false) let resolve_one_typeclass env evm t = - !solve_instanciation_problem env evm t + !solve_instantiation_problem env evm t type direction = Forward | Backward @@ -552,10 +552,10 @@ let has_typeclasses filter evd = in Evar.Map.exists check (Evd.undefined_map evd) -let solve_instanciations_problem = ref (fun _ _ _ _ _ -> assert false) +let solve_instantiations_problem = ref (fun _ _ _ _ _ -> assert false) let solve_problem env evd filter split fail = - !solve_instanciations_problem env evd filter split fail + !solve_instantiations_problem env evd filter split fail (** Profiling resolution of typeclasses *) (* let solve_classeskey = Profile.declare_profile "solve_typeclasses" *) diff --git a/pretyping/typeclasses.mli b/pretyping/typeclasses.mli index 295a092a88..7c3d2be09b 100644 --- a/pretyping/typeclasses.mli +++ b/pretyping/typeclasses.mli @@ -119,8 +119,8 @@ val add_instance_hint : global_reference_or_constr -> global_reference list -> bool -> int option -> Decl_kinds.polymorphic -> unit val remove_instance_hint : global_reference -> unit -val solve_instanciations_problem : (env -> evar_map -> evar_filter -> bool -> bool -> evar_map) ref -val solve_instanciation_problem : (env -> evar_map -> types -> open_constr) ref +val solve_instantiations_problem : (env -> evar_map -> evar_filter -> bool -> bool -> evar_map) ref +val solve_instantiation_problem : (env -> evar_map -> types -> open_constr) ref val declare_instance : int option -> bool -> global_reference -> unit |