X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCic.ml;h=97733891e8745b4e3251500878f4804abe1743ef;hb=14e2489ae86ecb6467fe9a7ba3b742a8d53c47ea;hp=f32f6842638e196c3a74db75ea1761d0fbfd58e4;hpb=2a685d0ed0394bedc4cc0949bad643e0b1fce0c4;p=helm.git

diff --git a/helm/software/components/ng_kernel/nCic.ml b/helm/software/components/ng_kernel/nCic.ml
index f32f68426..97733891e 100644
--- a/helm/software/components/ng_kernel/nCic.ml
+++ b/helm/software/components/ng_kernel/nCic.ml
@@ -9,18 +9,23 @@
      \ /   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 | Type of int | CProp
+type universe = (bool * NUri.uri) list 
+  (* Max of non-empty list of named universes, or their successor (when true) 
+   * The empty list represents type0 *)
 
-type implicit_annotation = [ `Closed | `Type | `Hole | `Term ]
+type sort = Prop | Type of universe
+
+type implicit_annotation = [ `Closed | `Type | `Hole | `Term | `Typeof of int ]
 
 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
@@ -43,15 +48,15 @@ type context_entry =                       (* A declaration or definition *)
  | Decl of term                            (* type *)
  | Def  of term * term                     (* body, type *)
 
-type hypothesis = string * context_entry   
+type hypothesis = string * context_entry   (* name, 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
+type subst_entry = string option * context * term * term (* name,ctx,bo,ty *)
 
 type substitution = (int * subst_entry) list