1 files changed, 12 insertions, 57 deletions

diff --git a/kernel/declarations.mli b/kernel/declarations.mli
index 735f6f141..a9b8737bb 100644
--- a/kernel/declarations.mli
+++ b/kernel/declarations.mli
@@ -21,27 +21,14 @@ open Sign
 (*s Constants (internal representation) (Definition/Axiom) *)
 
 type constant_body = {
-  const_kind : path_kind;
+  const_hyps : section_context; (* New: younger hyp at top *)
   const_body : constr option;
   const_type : types;
-  const_hyps : section_context; (* New: younger hyp at top *)
   const_constraints : constraints;
   const_opaque : bool }
 
-val is_defined : constant_body -> bool
-
-(*s Global and local constant declaration. *)
-
-type constant_entry = {
-  const_entry_body   : constr;
-  const_entry_type   : constr option;
-  const_entry_opaque : bool }
-
-type local_entry =
-  | LocalDef of constr
-  | LocalAssum of constr
-
-(*s Inductive types (internal representation). *)
+(*s Inductive types (internal representation with redundant
+    information). *)
 
 type recarg = 
   | Param of int 
@@ -56,56 +43,24 @@ type recarg =
    inductives *) 
 
 type one_inductive_body = {
-  mind_consnames : identifier array;
   mind_typename : identifier;
-  mind_nf_lc : types array; (* constrs and arity with pre-expanded ccl *)
+  mind_nparams : int;
+  mind_params_ctxt : rel_context;
+  mind_nrealargs : int;
   mind_nf_arity : types;
-  mind_user_lc : types array option;
-  mind_user_arity : types option;
+  mind_user_arity : types;
   mind_sort : sorts;
-  mind_nrealargs : int;
   mind_kelim : sorts_family list;
+  mind_consnames : identifier array;
+  mind_nf_lc : types array; (* constrs and arity with pre-expanded ccl *)
+  mind_user_lc : types array;
   mind_listrec : (recarg list) array;
-  mind_finite : bool;
-  mind_nparams : int;
-  mind_params_ctxt : rel_context }
+ }
 
 type mutual_inductive_body = {
-  mind_kind : path_kind;
+  mind_finite : bool;
   mind_ntypes : int;
   mind_hyps : section_context;
   mind_packets : one_inductive_body array;
   mind_constraints : constraints;
   mind_singl : constr option }
-
-val mind_type_finite : mutual_inductive_body -> int -> bool
-val mind_user_lc : one_inductive_body -> types array
-val mind_user_arity : one_inductive_body -> types
-val mind_nth_type_packet : mutual_inductive_body -> int -> one_inductive_body
-
-val mind_arities_context : mutual_inductive_body -> rel_declaration list
-
-(*s Declaration of inductive types. *)
-
-(* Assume the following definition in concrete syntax:
-\begin{verbatim}
-Inductive I1 [x1:X1;...;xn:Xn] : A1 := c11 : T11 | ... | c1n1 : T1n1
-...
-with  Ip [x1:X1;...;xn:Xn] : Ap := cp1 : Tp1 | ... | cpnp : Tpnp.
-\end{verbatim}
-then, in $i^{th}$ block, [mind_entry_params] is [[xn:Xn;...;x1:X1]];
-[mind_entry_arity] is [Ai], defined in context [[[x1:X1;...;xn:Xn]];
-[mind_entry_lc] is [Ti1;...;Tini], defined in context [[A'1;...;A'p;x1:X1;...;xn:Xn]] where [A'i] is [Ai] generalized over [[x1:X1;...;xn:Xn]].
-*)
-
-type one_inductive_entry = {
-  mind_entry_nparams : int;
-  mind_entry_params : (identifier * local_entry) list;
-  mind_entry_typename : identifier;
-  mind_entry_arity : constr;
-  mind_entry_consnames : identifier list;
-  mind_entry_lc : constr list }
-
-type mutual_inductive_entry = {
-  mind_entry_finite : bool;
-  mind_entry_inds : one_inductive_entry list }