X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCic.ml;h=32b79f02a2f898a2dadd8472b7aef08a38adca36;hb=2007402c996678701798d71124a1a255529061ee;hp=1f02ee7d8e5406c713f32cff20d1e2926699a436;hpb=7954b6bd597d7999392bf9fe8d02b7c94f71925f;p=helm.git

diff --git a/helm/software/components/ng_kernel/nCic.ml b/helm/software/components/ng_kernel/nCic.ml
index 1f02ee7d8..32b79f02a 100644
--- a/helm/software/components/ng_kernel/nCic.ml
+++ b/helm/software/components/ng_kernel/nCic.ml
@@ -13,12 +13,17 @@
 
 (********************************* TERMS ************************************)
 
-type universe = (bool * NUri.uri) list 
-  (* Max of non-empty list of named universes, or their successor (when true) *)
+type univ_algebra = [ `Type | `Succ | `CProp ]
+
+type universe = (univ_algebra * NUri.uri) list 
+  (* Max of non-empty list of named universes, or their successor (when true) 
+   * The empty list represents type0 *)
 
 type sort = Prop | Type of universe
 
-type implicit_annotation = [ `Closed | `Type | `Hole | `Term ]
+type implicit_annotation =
+ [ `Closed | `Type | `Hole | `Tagged of string | `Term | `Typeof of int | `Vector ]
+
 
 type lc_kind = Irl of int | Ctx of term list
 
@@ -51,11 +56,13 @@ type hypothesis = string * context_entry   (* name, entry *)
 
 type context = hypothesis list
 
-type conjecture = string option * context * term
+type meta_attrs = [`Name of string | `IsSort | `InScope | `OutScope of int] list
+
+type conjecture =  meta_attrs * context * term
 
 type metasenv = (int * conjecture) list
 
-type subst_entry = string option * context * term * term (* name,ctx,bo,ty *)
+type subst_entry = meta_attrs * context * term * term (* name,ctx,bo,ty *)
 
 type substitution = (int * subst_entry) list
 
@@ -94,7 +101,7 @@ type ind_pragma = (* pragmatic of the object *)
 type generated = [ `Generated | `Provided ]
 
 type c_attr = generated * def_flavour * def_pragma
-type f_attr = generated * def_flavour
+type f_attr = generated * def_flavour * def_pragma
 type i_attr = generated * ind_pragma
 
  (* invariant: metasenv and substitution have disjoint domains *)