diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2017-09-19 11:44:46 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2017-09-19 11:44:46 +0200 |
| commit | 9933871efd122163f7e2dfe8377b9b2dd384b47b (patch) | |
| tree | cd348cb40e310a9a2003a085e8c7707448789649 /pretyping | |
| parent | 7e4535d62c4f8abc6537206e7abc34f1bb0be69d (diff) | |
| parent | 7760c6d58ca35b97b0893dc4911ab22c9a5a49ec (diff) | |
Merge PR #1036: Unify EConstr.t equality
Diffstat (limited to 'pretyping')
| -rw-r--r-- | pretyping/reductionops.ml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pretyping/reductionops.ml b/pretyping/reductionops.ml index 356323543..2aa2f9013 100644 --- a/pretyping/reductionops.ml +++ b/pretyping/reductionops.ml @@ -1438,17 +1438,13 @@ let sigma_univ_state = let infer_conv_gen conv_fun ?(catch_incon=true) ?(pb=Reduction.CUMUL) ?(ts=full_transparent_state) env sigma x y = (** FIXME *) - let open Universes in - let x = EConstr.Unsafe.to_constr x in - let y = EConstr.Unsafe.to_constr y in try - let fold cstr accu = Some (Constraints.fold Constraints.add cstr accu) in let b, sigma = let ans = if pb == Reduction.CUMUL then - Universes.leq_constr_univs_infer (Evd.universes sigma) fold x y Constraints.empty + EConstr.leq_constr_universes sigma x y else - Universes.eq_constr_univs_infer (Evd.universes sigma) fold x y Constraints.empty + EConstr.eq_constr_universes sigma x y in let ans = match ans with | None -> None @@ -1462,6 +1458,8 @@ let infer_conv_gen conv_fun ?(catch_incon=true) ?(pb=Reduction.CUMUL) in if b then sigma, true else + let x = EConstr.Unsafe.to_constr x in + let y = EConstr.Unsafe.to_constr y in let sigma' = conv_fun pb ~l2r:false sigma ts env (sigma, sigma_univ_state) x y in |