diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2018-03-09 20:16:08 +0100 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2018-03-09 20:16:08 +0100 |
| commit | 1f2a922d52251f79a11d75c2205e6827a07e591b (patch) | |
| tree | 2f8bedc06474b905f22e763a0b1cc66f3d46d9c3 /engine/termops.ml | |
| parent | 6ba4733a32812e04e831d081737c5665fb12a152 (diff) | |
| parent | 426c9afeb9c85616b89c26aabfe9a6d8cc37c8f0 (diff) | |
Merge PR #6775: Allow using cumulativity without forcing strict constraints.
Diffstat (limited to 'engine/termops.ml')
| -rw-r--r-- | engine/termops.ml | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/engine/termops.ml b/engine/termops.ml index 35258762a..3dfb0c34f 100644 --- a/engine/termops.ml +++ b/engine/termops.ml @@ -302,7 +302,9 @@ let pr_evar_universe_context ctx = str"ALGEBRAIC UNIVERSES:"++brk(0,1)++ h 0 (Univ.LSet.pr prl (UState.algebraics ctx)) ++ fnl() ++ str"UNDEFINED UNIVERSES:"++brk(0,1)++ - h 0 (Universes.pr_universe_opt_subst (UState.subst ctx)) ++ fnl()) + h 0 (Universes.pr_universe_opt_subst (UState.subst ctx)) ++ fnl() ++ + str "WEAK CONSTRAINTS:"++brk(0,1)++ + h 0 (UState.pr_weak prl ctx) ++ fnl ()) let print_env_short env = let print_constr = print_kconstr in @@ -914,12 +916,9 @@ let vars_of_global_reference env gr = (* Tests whether [m] is a subterm of [t]: [m] is appropriately lifted through abstractions of [t] *) -let dependent_main noevar univs sigma m t = +let dependent_main noevar sigma m t = let open EConstr in - let eqc x y = - if univs then not (Option.is_empty (eq_constr_universes sigma x y)) - else eq_constr_nounivs sigma x y - in + let eqc x y = eq_constr_nounivs sigma x y in let rec deprec m t = if eqc m t then raise Occur @@ -936,11 +935,8 @@ let dependent_main noevar univs sigma m t = in try deprec m t; false with Occur -> true -let dependent sigma c t = dependent_main false false sigma c t -let dependent_no_evar sigma c t = dependent_main true false sigma c t - -let dependent_univs sigma c t = dependent_main false true sigma c t -let dependent_univs_no_evar sigma c t = dependent_main true true sigma c t +let dependent sigma c t = dependent_main false sigma c t +let dependent_no_evar sigma c t = dependent_main true sigma c t let dependent_in_decl sigma a decl = let open NamedDecl in |