1 files changed, 32 insertions, 24 deletions

diff --git a/kernel/typeops.mli b/kernel/typeops.mli
index d6484e823..6bc1ce496 100644
--- a/kernel/typeops.mli
+++ b/kernel/typeops.mli
@@ -14,15 +14,21 @@ open Environ
 open Entries
 open Declarations
 
-(** {6 Typing functions (not yet tagged as safe) } *)
+(** {6 Typing functions (not yet tagged as safe) }
 
-val infer      : env -> constr       -> unsafe_judgment * constraints
-val infer_v    : env -> constr array -> unsafe_judgment array * constraints
-val infer_type : env -> types        -> unsafe_type_judgment * constraints
+    They return unsafe judgments that are "in context" of a set of 
+    (local) universe variables (the ones that appear in the term)
+    and associated constraints. In case of polymorphic definitions,
+    these variables and constraints will be generalized.
+ *)
+
+
+val infer      : env -> constr       -> unsafe_judgment
+val infer_v    : env -> constr array -> unsafe_judgment array
+val infer_type : env -> types        -> unsafe_type_judgment
 
 val infer_local_decls :
-  env -> (Id.t * local_entry) list
-    -> env * rel_context * constraints
+  env -> (Id.t * local_entry) list -> (env * rel_context)
 
 (** {6 Basic operations of the typing machine. } *)
 
@@ -45,21 +51,25 @@ val judge_of_relative : env -> int -> unsafe_judgment
 val judge_of_variable : env -> variable -> unsafe_judgment
 
 (** {6 type of a constant } *)
-val judge_of_constant : env -> constant -> unsafe_judgment
+val judge_of_constant : env -> constant puniverses -> unsafe_judgment
+
+(* val judge_of_constant_knowing_parameters : *)
+(*   env -> constant -> unsafe_judgment array -> unsafe_judgment *)
 
-val judge_of_constant_knowing_parameters :
-  env -> constant -> unsafe_judgment array -> unsafe_judgment
+val judge_of_projection : env -> Names.projection -> unsafe_judgment -> unsafe_judgment
 
 (** {6 Type of application. } *)
 val judge_of_apply :
   env -> unsafe_judgment -> unsafe_judgment array
-    -> unsafe_judgment * constraints
+    -> unsafe_judgment
 
 (** {6 Type of an abstraction. } *)
 val judge_of_abstraction :
   env -> Name.t -> unsafe_type_judgment -> unsafe_judgment
     -> unsafe_judgment
 
+val sort_of_product : env -> sorts -> sorts -> sorts
+
 (** {6 Type of a product. } *)
 val judge_of_product :
   env -> Name.t -> unsafe_type_judgment -> unsafe_type_judgment
@@ -73,37 +83,35 @@ val judge_of_letin :
 (** {6 Type of a cast. } *)
 val judge_of_cast :
   env -> unsafe_judgment -> cast_kind -> unsafe_type_judgment ->
-    unsafe_judgment * constraints
+  unsafe_judgment
 
 (** {6 Inductive types. } *)
 
-val judge_of_inductive : env -> inductive -> unsafe_judgment
+val judge_of_inductive : env -> inductive puniverses -> unsafe_judgment
 
-val judge_of_inductive_knowing_parameters :
-  env -> inductive -> unsafe_judgment array -> unsafe_judgment
+(* val judge_of_inductive_knowing_parameters : *)
+(*   env -> inductive -> unsafe_judgment array -> unsafe_judgment *)
 
-val judge_of_constructor : env -> constructor -> unsafe_judgment
+val judge_of_constructor : env -> constructor puniverses -> unsafe_judgment
 
 (** {6 Type of Cases. } *)
 val judge_of_case : env -> case_info
   -> unsafe_judgment -> unsafe_judgment -> unsafe_judgment array
-    -> unsafe_judgment * constraints
+    -> unsafe_judgment
 
 (** Typecheck general fixpoint (not checking guard conditions) *)
 val type_fixpoint : env -> Name.t array -> types array
-    -> unsafe_judgment array -> constraints
-
-(** Kernel safe typing but applicable to partial proofs *)
-val typing : env -> constr -> unsafe_judgment
+    -> unsafe_judgment array -> unit
 
-val type_of_constant : env -> constant -> types
+val type_of_constant : env -> constant puniverses -> types constrained
 
 val type_of_constant_type : env -> constant_type -> types
 
+val type_of_projection : env -> Names.projection puniverses -> types
+
+val type_of_constant_in : env -> constant puniverses -> types
+
 val type_of_constant_knowing_parameters :
   env -> constant_type -> types Lazy.t array -> types
 
-(** Make a type polymorphic if an arity *)
-val make_polymorphic_if_constant_for_ind : env -> unsafe_judgment ->
-  constant_type