aboutsummaryrefslogtreecommitdiff
path: root/pretyping
diff options
context:
space:
mode:
authorMatthieu Sozeau2015-10-08 16:00:06 +0200
committerMatthieu Sozeau2015-10-08 16:00:41 +0200
commitb6edcae7b61ea6ccc0e65223cecb71cab0dd55cc (patch)
tree1505041402d00c52669f9e430d144c97eae490ff /pretyping
parentdbdef043ea143f871a3710bae36dfc45fd815835 (diff)
Univs: fix bug #3807
Add a flag to disallow minimization to set
Diffstat (limited to 'pretyping')
-rw-r--r--pretyping/evd.ml3
-rw-r--r--pretyping/pretyping.ml9
2 files changed, 10 insertions, 2 deletions
diff --git a/pretyping/evd.ml b/pretyping/evd.ml
index 412fb92b3d..3d912ca4ce 100644
--- a/pretyping/evd.ml
+++ b/pretyping/evd.ml
@@ -1324,8 +1324,7 @@ let normalize_evar_universe_context uctx =
Universes.normalize_context_set uctx.uctx_local uctx.uctx_univ_variables
uctx.uctx_univ_algebraic
in
- if Univ.LSet.equal (fst us') (fst uctx.uctx_local) then
- uctx
+ if Univ.ContextSet.equal us' uctx.uctx_local then uctx
else
let us', universes = Universes.refresh_constraints uctx.uctx_initial_universes us' in
let uctx' =
diff --git a/pretyping/pretyping.ml b/pretyping/pretyping.ml
index dec23328f4..6306739b7a 100644
--- a/pretyping/pretyping.ml
+++ b/pretyping/pretyping.ml
@@ -112,6 +112,15 @@ let _ =
optkey = ["Strict";"Universe";"Declaration"];
optread = is_strict_universe_declarations;
optwrite = (:=) strict_universe_declarations })
+
+let _ =
+ Goptions.(declare_bool_option
+ { optsync = true;
+ optdepr = false;
+ optname = "minimization to Set";
+ optkey = ["Universe";"set";"Minimization"];
+ optread = Universes.is_set_minimization;
+ optwrite = (:=) Universes.set_minimization })
(** Miscellaneous interpretation functions *)
let interp_universe_level_name evd (loc,s) =