diff options
| author | Pierre-Marie Pédrot | 2020-10-11 17:50:40 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2020-10-11 17:56:44 +0200 |
| commit | 7320cd84f92793572550d1fe1a2181f40466fa81 (patch) | |
| tree | 69496a726a61f7d047e9260b9e4b6dc36ca05d4d /pretyping | |
| parent | eb5a67de1fc586acc588d5c61c84df670284f054 (diff) | |
Similarly remove the explicit graph argument in the ~evar conversion API.
Diffstat (limited to 'pretyping')
| -rw-r--r-- | pretyping/reductionops.ml | 6 | ||||
| -rw-r--r-- | pretyping/typing.ml | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pretyping/reductionops.ml b/pretyping/reductionops.ml index db2f5c6209..3352bfce38 100644 --- a/pretyping/reductionops.ml +++ b/pretyping/reductionops.ml @@ -1094,7 +1094,8 @@ let f_conv_leq ?l2r ?reds env ?evars x y = let test_trans_conversion (f: constr Reduction.extended_conversion_function) reds env sigma x y = try let evars ev = safe_evar_value sigma ev in - let _ = f ~reds env ~evars:(evars, Evd.universes sigma) x y in + let env = Environ.set_universes (Evd.universes sigma) env in + let _ = f ~reds env ~evars x y in true with Reduction.NotConvertible -> false | e -> @@ -1112,7 +1113,8 @@ let check_conv ?(pb=Reduction.CUMUL) ?(ts=TransparentState.full) env sigma x y = | Reduction.CONV -> f_conv | Reduction.CUMUL -> f_conv_leq in - try f ~reds:ts env ~evars:(safe_evar_value sigma, Evd.universes sigma) x y; true + let env = Environ.set_universes (Evd.universes sigma) env in + try f ~reds:ts env ~evars:(safe_evar_value sigma) x y; true with Reduction.NotConvertible -> false | Univ.UniverseInconsistency _ -> false | e -> diff --git a/pretyping/typing.ml b/pretyping/typing.ml index 756ccd3438..e40dea06e7 100644 --- a/pretyping/typing.ml +++ b/pretyping/typing.ml @@ -296,7 +296,8 @@ let judge_of_letin env name defj typj j = uj_type = subst1 defj.uj_val j.uj_type } let check_hyps_inclusion env sigma x hyps = - let evars = Evarutil.safe_evar_value sigma, Evd.universes sigma in + let env = Environ.set_universes (Evd.universes sigma) env in + let evars = Evarutil.safe_evar_value sigma in Typeops.check_hyps_inclusion env ~evars x hyps let type_of_constant env sigma (c,u) = |