X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCic.ml;h=4490ee0485c218a4b7681d5c3c0048c45198abd9;hb=f9abd21eb0d26cf9b632af4df819225be4d091e3;hp=e520422160ab7fc77a41069b3970b960c4b2ca6d;hpb=d34061fd1c820139fad38c39dee6377e5057bf26;p=helm.git

diff --git a/helm/software/components/ng_kernel/nCic.ml b/helm/software/components/ng_kernel/nCic.ml
index e52042216..4490ee048 100644
--- a/helm/software/components/ng_kernel/nCic.ml
+++ b/helm/software/components/ng_kernel/nCic.ml
@@ -13,14 +13,17 @@
 
 (********************************* TERMS ************************************)
 
-type universe = (bool * NUri.uri) list 
+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 | `Typeof of int | `Vector ]
+ [ `Closed | `Type | `Hole | `Tagged of string | `Term | `Typeof of int | `Vector ]
+
 
 type lc_kind = Irl of int | Ctx of term list
 
@@ -53,11 +56,18 @@ type hypothesis = string * context_entry   (* name, entry *)
 
 type context = hypothesis list
 
-type conjecture = string option * context * term
+type meta_attr = 
+  [ `Name of string 
+  | `IsTerm | `IsType | `IsSort 
+  | `InScope | `OutScope of int]
+
+type meta_attrs = meta_attr 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
 
@@ -96,7 +106,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 *)