X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_notation%2FcicNotationPt.ml;h=99b8909e544627ad6fbabc712b43e6a4fd5abf31;hb=ba2dfe6409e95bf9e558dc0d4be382b068671409;hp=56bf8547441bd218ee6fd393569902c558942cfe;hpb=26cce624c98e795521078794c748758798031704;p=helm.git diff --git a/helm/ocaml/cic_notation/cicNotationPt.ml b/helm/ocaml/cic_notation/cicNotationPt.ml index 56bf85474..99b8909e5 100644 --- a/helm/ocaml/cic_notation/cicNotationPt.ml +++ b/helm/ocaml/cic_notation/cicNotationPt.ml @@ -79,6 +79,7 @@ type term = | Literal of literal | Layout of layout_pattern + | Magic of magic_term | Variable of pattern_variable @@ -104,7 +105,7 @@ and layout_pattern = |+ column separator, row separator +| *) | Sqrt of term | Root of term * term (* argument, index *) -(* | Break *) + | Break | Box of box_spec * term list and magic_term = @@ -117,8 +118,8 @@ and magic_term = | Fold of fold_kind * term * string list * term (* base case pattern, recursive case bound names, recursive case pattern *) | Default of term * term (* "some" case pattern, "none" case pattern *) - | If of term * term (* guard, body *) - | Unless of term * term (* guard, body *) + | Fail + | If of term * term * term (* test, pattern if true, pattern if false *) and pattern_variable = (* level 1 and 2 variables *) @@ -146,4 +147,5 @@ type phrase = (* TODO hackish: replace with TacticAst.statement or similar *) (* level 1 pattern, associativity, precedence, level 2 pattern *) | Interpretation of (string * argument_pattern list) * cic_appl_pattern | Render of UriManager.uri + | Dump (* dump grammar *)