X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Facic_content%2FcicNotationPt.ml;h=ff72f2a86c9722cac3d24e2e8f17614c05af74a3;hb=cbb7f68d7d012f385e74d466f0bce7881d9eb71c;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..ff72f2a86 100644 --- a/helm/software/components/acic_content/cicNotationPt.ml +++ b/helm/software/components/acic_content/cicNotationPt.ml @@ -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 = 4 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 @@ -140,11 +141,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