From ee7f5486fff86c453767997f97eda381983c4bbc Mon Sep 17 00:00:00 2001 From: Gaëtan Gilbert Date: Wed, 21 Feb 2018 15:47:51 +0100 Subject: Option for messing with inference of irrelevant constraints --- engine/eConstr.ml | 4 +++- engine/eConstr.mli | 2 ++ engine/evarutil.ml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'engine') diff --git a/engine/eConstr.ml b/engine/eConstr.ml index 59dc5a221..e832a0688 100644 --- a/engine/eConstr.ml +++ b/engine/eConstr.ml @@ -570,6 +570,8 @@ let compare_constr sigma cmp c1 c2 = let cmp nargs c1 c2 = cmp (of_constr c1) (of_constr c2) in compare_gen kind (fun _ _ -> Univ.Instance.equal) Sorts.equal cmp 0 (unsafe_to_constr c1) (unsafe_to_constr c2) +let cumul_weak_constraints = ref true + let compare_cumulative_instances cv_pb nargs_ok variances u u' cstrs = let open Universes in if not nargs_ok then enforce_eq_instances_univs false u u' cstrs @@ -580,7 +582,7 @@ let compare_cumulative_instances cv_pb nargs_ok variances u u' cstrs = let u = Univ.Universe.make u in let u' = Univ.Universe.make u' in match v with - | Irrelevant -> Constraints.add (u,ULub,u') cstrs + | Irrelevant -> if !cumul_weak_constraints then Constraints.add (u,ULub,u') cstrs else cstrs | Covariant -> (match cv_pb with | Reduction.CONV -> Constraints.add (u,UEq,u') cstrs diff --git a/engine/eConstr.mli b/engine/eConstr.mli index 28c9dd3c2..87531e116 100644 --- a/engine/eConstr.mli +++ b/engine/eConstr.mli @@ -196,6 +196,8 @@ val whd_evar : Evd.evar_map -> constr -> constr (** {6 Equality} *) +val cumul_weak_constraints : bool ref + val eq_constr : Evd.evar_map -> t -> t -> bool val eq_constr_nounivs : Evd.evar_map -> t -> t -> bool val eq_constr_universes : Environ.env -> Evd.evar_map -> t -> t -> Universes.Constraints.t option diff --git a/engine/evarutil.ml b/engine/evarutil.ml index 8db603715..2b6913c0b 100644 --- a/engine/evarutil.ml +++ b/engine/evarutil.ml @@ -827,7 +827,7 @@ let compare_cumulative_instances cv_pb variances u u' sigma = let cstrs, soft = Array.fold_left3 (fun (cstrs, soft) v u u' -> let open Univ.Variance in match v with - | Irrelevant -> cstrs, (u,u')::soft + | Irrelevant -> cstrs, if !EConstr.cumul_weak_constraints then (u,u')::soft else soft | Covariant when cv_pb == Reduction.CUMUL -> Univ.Constraint.add (u,Univ.Le,u') cstrs, soft | Covariant | Invariant -> Univ.Constraint.add (u,Univ.Eq,u') cstrs, soft) -- cgit v1.2.3