diff options
| author |  Pierre Boutillier <pierre.boutillier@ens-lyon.org> | 2014-03-10 16:43:14 +0100 |
|---|---|---|
| committer | Pierre Boutillier <pierre.boutillier@ens-lyon.org> | 2014-03-10 18:38:15 +0100 |
| commit | ba7701fb1a2e26dccd573b881ee7c2bac11a6384 (patch) | |
| tree | 9f9943cc23871e1145b6f1141bd4b4910a0b6804 /pretyping | |
| parent | f16f8383f0af88deda99fa4c033ea04149b00f49 (diff) | |
Evarconv unification respects Conv_oracle
Diffstat (limited to 'pretyping')
| -rw-r--r-- | pretyping/evarconv.ml | 8 | ||||
| -rw-r--r-- | pretyping/evarconv.mli | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pretyping/evarconv.ml b/pretyping/evarconv.ml index 472cb50d0..bc09cb6f9 100644 --- a/pretyping/evarconv.ml +++ b/pretyping/evarconv.ml @@ -902,22 +902,22 @@ let consider_remaining_unif_problems ?(ts=full_transparent_state) env evd = exception UnableToUnify of evar_map * unification_error -let the_conv_x ?(ts=full_transparent_state) env t1 t2 evd = +let the_conv_x env ?(ts=Conv_oracle.get_transp_state (Environ.oracle env)) t1 t2 evd = match evar_conv_x ts env evd CONV t1 t2 with | Success evd' -> evd' | UnifFailure (evd',e) -> raise (UnableToUnify (evd',e)) -let the_conv_x_leq ?(ts=full_transparent_state) env t1 t2 evd = +let the_conv_x_leq env ?(ts=Conv_oracle.get_transp_state (Environ.oracle env)) t1 t2 evd = match evar_conv_x ts env evd CUMUL t1 t2 with | Success evd' -> evd' | UnifFailure (evd',e) -> raise (UnableToUnify (evd',e)) -let e_conv ?(ts=full_transparent_state) env evdref t1 t2 = +let e_conv env ?(ts=Conv_oracle.get_transp_state (Environ.oracle env)) evdref t1 t2 = match evar_conv_x ts env !evdref CONV t1 t2 with | Success evd' -> evdref := evd'; true | _ -> false -let e_cumul ?(ts=full_transparent_state) env evdref t1 t2 = +let e_cumul env ?(ts=Conv_oracle.get_transp_state (Environ.oracle env)) evdref t1 t2 = match evar_conv_x ts env !evdref CUMUL t1 t2 with | Success evd' -> evdref := evd'; true | _ -> false diff --git a/pretyping/evarconv.mli b/pretyping/evarconv.mli index 3a8e4fab5..ca226e865 100644 --- a/pretyping/evarconv.mli +++ b/pretyping/evarconv.mli @@ -20,13 +20,13 @@ exception UnableToUnify of evar_map * Pretype_errors.unification_error (** {6 Main unification algorithm for type inference. } *) (** returns exception NotUnifiable with best known evar_map if not unifiable *) -val the_conv_x : ?ts:transparent_state -> env -> constr -> constr -> evar_map -> evar_map -val the_conv_x_leq : ?ts:transparent_state -> env -> constr -> constr -> evar_map -> evar_map +val the_conv_x : env -> ?ts:transparent_state -> constr -> constr -> evar_map -> evar_map +val the_conv_x_leq : env -> ?ts:transparent_state -> constr -> constr -> evar_map -> evar_map (** The same function resolving evars by side-effect and catching the exception *) -val e_conv : ?ts:transparent_state -> env -> evar_map ref -> constr -> constr -> bool -val e_cumul : ?ts:transparent_state -> env -> evar_map ref -> constr -> constr -> bool +val e_conv : env -> ?ts:transparent_state -> evar_map ref -> constr -> constr -> bool +val e_cumul : env -> ?ts:transparent_state -> evar_map ref -> constr -> constr -> bool (** {6 Unification heuristics. } *) |