positivity check fixed, some subterms were erroneously skipped

[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 f32f6842638e196c3a74db75ea1761d0fbfd58e4..d3bc8d793730e7cf8c6b1dc471b254beb98063f4 100644 (file)
--- a/helm/software/components/ng_kernel/nCic.ml
+++ b/helm/software/components/ng_kernel/nCic.ml
@@ -9,11 +9,14 @@
      \ /   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) *)
+
+type sort = Prop | Type of universe
 
 type implicit_annotation = [ `Closed | `Type | `Hole | `Term ]
 
@@ -47,9 +50,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