X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Facic_content%2FcicNotationPt.ml;h=3c96a5a512ac7d1bd49b94ff9ab79cf373b9d0b9;hb=63e7ef727ce32552106c4d8f3030fd264532fffe;hp=1ca5148105e2ec90c3ce8956b3b4413351ca6016;hpb=8c4659819a1c1f2e450d9a588ecca37d95ae48e9;p=helm.git

diff --git a/helm/software/components/acic_content/cicNotationPt.ml b/helm/software/components/acic_content/cicNotationPt.ml
index 1ca514810..3c96a5a51 100644
--- a/helm/software/components/acic_content/cicNotationPt.ml
+++ b/helm/software/components/acic_content/cicNotationPt.ml
@@ -29,7 +29,7 @@
 
 type binder_kind = [ `Lambda | `Pi | `Exists | `Forall ]
 type induction_kind = [ `Inductive | `CoInductive ]
-type sort_kind = [ `Prop | `Set | `Type of CicUniv.universe | `CProp of CicUniv.universe]
+type sort_kind = [ `Prop | `Set | `Type of CicUniv.universe | `CProp of CicUniv.universe | `NType of string]
 type fold_kind = [ `Left | `Right ]
 
 type location = Stdpp.location
@@ -62,7 +62,7 @@ type 'term capture_variable = 'term * 'term option
 
 (** To be increased each time the term type below changes, used for "safe"
  * marshalling *)
-let magic = 3
+let magic = 5
 
 type term =
   (* CIC AST *)
@@ -119,6 +119,7 @@ and layout_pattern =
   | Frac of term * term
   | Over of term * term
   | Atop of term * term
+  | InfRule of term * term * term
 (*   | array of term * literal option * literal option
       |+ column separator, row separator +| *)
   | Sqrt of term
@@ -126,6 +127,7 @@ and layout_pattern =
   | Break
   | Box of box_spec * term list
   | Group of term list
+  | Mstyle of (string * string) list * term list
 
 and magic_term =
   (* level 1 magics *)
@@ -140,11 +142,13 @@ and magic_term =
   | Fail
   | If of term * term * term (* test, pattern if true, pattern if false *)
 
+and term_level = Self of int | Level of int
+
 and pattern_variable =
   (* level 1 and 2 variables *)
   | NumVar of string
   | IdentVar of string
-  | TermVar of string * int option
+  | TermVar of string * term_level
 
   (* level 1 variables *)
   | Ascription of term * string