From 35fba70509d9fb219b2a88f8e7bd246b2671b39b Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Thu, 9 Nov 2017 17:27:58 +0100
Subject: Simplification: cumulativity information is variance information.

Since cumulativity of an inductive type is the universe constraints
which make a term convertible with its universe-renamed copy, the only
constraints we can get are between a universe and its copy.

As such we do not need to be able to represent arbitrary constraints
between universes and copied universes in a double-sized ucontext,
instead we can just keep around an array describing whether a bound
universe is covariant, invariant or irrelevant (CIC has no
contravariant conversion rule).

Printing is fairly obtuse and should be improved: when we print the
CumulativityInfo we add marks to the universes of the instance: = for
invariant, + for covariant and * for irrelevant. ie

         Record Foo@{i j k} := { foo : Type@{i} -> Type@{j} }.
         Print Foo.

gives

        Cumulative Record Foo : Type@{max(i+1, j+1)} := Build_Foo
          { foo : Type@{i} -> Type@{j} }
          (* =i +j *k |=  *)
---
 vernac/comInductive.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vernac/comInductive.ml')

diff --git a/vernac/comInductive.ml b/vernac/comInductive.ml
index 1c8677e9cd..3f8d413b75 100644
--- a/vernac/comInductive.ml
+++ b/vernac/comInductive.ml
@@ -340,7 +340,7 @@ let interp_mutual_inductive (paramsl,indl) notations cum poly prv finite =
     match uctx with
     | Polymorphic_const_entry uctx ->
       if cum then
-        Cumulative_ind_entry (Universes.univ_inf_ind_from_universe_context uctx)
+        Cumulative_ind_entry (Univ.CumulativityInfo.from_universe_context uctx)
       else Polymorphic_ind_entry uctx
     | Monomorphic_const_entry uctx ->
       Monomorphic_ind_entry uctx
-- 
cgit v1.2.3


From 1ed0836a7e0c8e05b0288f85e344ef5249d5d228 Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Fri, 10 Nov 2017 13:23:32 +0100
Subject: Inference of inductive subtyping does not need an evar map.

---
 vernac/comInductive.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vernac/comInductive.ml')

diff --git a/vernac/comInductive.ml b/vernac/comInductive.ml
index 3f8d413b75..faac16802a 100644
--- a/vernac/comInductive.ml
+++ b/vernac/comInductive.ml
@@ -356,7 +356,7 @@ let interp_mutual_inductive (paramsl,indl) notations cum poly prv finite =
     }
   in
   (if poly && cum then
-      Inductiveops.infer_inductive_subtyping env_ar sigma mind_ent
+      Inductiveops.infer_inductive_subtyping env_ar mind_ent
    else mind_ent), Evd.universe_binders sigma, impls
 
 (* Very syntactical equality *)
-- 
cgit v1.2.3


From 6c2d10b93b819f0735a43453c78566795de8ba5a Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Fri, 10 Nov 2017 15:05:21 +0100
Subject: Use specialized function for inductive subtyping inference.

This ensures by construction that we never infer constraints outside
the variance model.
---
 vernac/comInductive.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vernac/comInductive.ml')

diff --git a/vernac/comInductive.ml b/vernac/comInductive.ml
index faac16802a..41474fc638 100644
--- a/vernac/comInductive.ml
+++ b/vernac/comInductive.ml
@@ -356,7 +356,7 @@ let interp_mutual_inductive (paramsl,indl) notations cum poly prv finite =
     }
   in
   (if poly && cum then
-      Inductiveops.infer_inductive_subtyping env_ar mind_ent
+      InferCumulativity.infer_inductive env_ar mind_ent
    else mind_ent), Evd.universe_binders sigma, impls
 
 (* Very syntactical equality *)
-- 
cgit v1.2.3