factorized common components of objects

diff --git a/helm/software/components/ng_kernel/nCic.ml b/helm/software/components/ng_kernel/nCic.ml
index 43f6c86d9ae03a3b05afc1da41270c2131de281e..19a8a227b9cf8dfe49af5a3b41431d4f4c1c2d9a 100644 (file)
--- a/helm/software/components/ng_kernel/nCic.ml
+++ b/helm/software/components/ng_kernel/nCic.ml
@@ -86,7 +86,7 @@ type def_pragma = (* pragmatic of the object *)
   | `Projection         (* record projection *)
   | `InversionPrinciple (* inversion principle *)
   | `Variant 
-  | `Local ] (* Local = hidden technicality *)
+  | `Local ]            (* Local = hidden technicality *)
  
 type ind_pragma = (* pragmatic of the object *)
   [ `Record of (string * bool * int) list ]
@@ -100,9 +100,10 @@ type f_attr = generated * def_flavour
 type i_attr = generated * ind_pragma
 
  (* invariant: metasenv and substitution have disjoint domains *)
-type obj =
- | Constant  of NUri.uri * metasenv * substitution * relevance * string * term option * term * c_attr
- | Fixpoint  of NUri.uri * metasenv * substitution * bool * inductiveFun list * f_attr
- | Inductive of NUri.uri * metasenv * substitution * bool * int * inductiveType list * i_attr
-                (* uri, menv, subst, (co)inductive, leftno, types *)
+type obj_kind =
+ | Constant  of relevance * string * term option * term * c_attr
+ | Fixpoint  of bool * inductiveFun list * f_attr
+ | Inductive of bool * int * inductiveType list * i_attr
+                (* (co)inductive, leftno, types *)
 
+type obj = NUri.uri * int * metasenv * substitution * obj_kind