Added count_occurrences.

[helm.git] / helm / software / components / ng_kernel / nCic.ml

diff --git a/helm/software/components/ng_kernel/nCic.ml b/helm/software/components/ng_kernel/nCic.ml
index c531d1c2bf9c7256c4886bde8bbd6780e68f23b0..4490ee0485c218a4b7681d5c3c0048c45198abd9 100644 (file)
--- a/helm/software/components/ng_kernel/nCic.ml
+++ b/helm/software/components/ng_kernel/nCic.ml
@@ -22,7 +22,8 @@ type universe = (univ_algebra * NUri.uri) list
 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
 
@@ -55,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
 
@@ -98,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 *)