X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCic.ml;h=a9cc9a671f39161afc8500eec4f012d2769fc589;hb=f919cce8d299eab1dda92af4c5b53a8a7ac348af;hp=b2f3351c61ed1164b206260e4f4a4d8c8b7ef801;hpb=e43edcc6a209494839326fece1d141f9f189032a;p=helm.git

diff --git a/helm/software/components/ng_kernel/nCic.ml b/helm/software/components/ng_kernel/nCic.ml
index b2f3351c6..a9cc9a671 100644
--- a/helm/software/components/ng_kernel/nCic.ml
+++ b/helm/software/components/ng_kernel/nCic.ml
@@ -9,18 +9,22 @@
      \ /   This software is distributed as is, NO WARRANTY.     
       V_______________________________________________________________ *)
 
-(* $Id: nCicReduction.ml 8250 2008-03-25 17:56:20Z tassi $ *)
+(* $Id$ *)
 
 (********************************* TERMS ************************************)
 
-type sort = Prop | Set | Type of int | CProp
+type universe = (bool * NUri.uri) list 
+  (* Max of non-empty list of named universes, or their successor (when true) *)
+
+type sort = Prop | Type of universe
 
 type implicit_annotation = [ `Closed | `Type | `Hole | `Term ]
 
 type lc_kind = Irl of int | Ctx of term list
 
 and local_context = int * lc_kind             (* shift (0 -> no shift), 
-                                                 subst (None means id) *) 
+                                                 subst (Irl n means id of
+						 length n) *) 
 and term =
  | Rel      of int                            (* DeBruijn index, 1 based    *)
  | Meta     of int * local_context
@@ -47,9 +51,9 @@ type hypothesis = string * context_entry
 
 type context = hypothesis list
 
-type conjecture = int * string option * context * term
+type conjecture = string option * context * term
 
-type metasenv = conjecture list
+type metasenv = (int * conjecture) list
 
 type subst_entry = string option * context * term * term
 
@@ -60,6 +64,7 @@ type substitution = (int * subst_entry) list
 
 type relevance = bool list (* relevance of arguments for conversion *)
 
+                    (* relevance, name, recno, ty, bo *)
 type inductiveFun = relevance * string * int * term * term 
   (* if coinductive, the int has no meaning and must be set to -1 *)