X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAst.ml;h=d436977e381270bf415117c99b9dac3e2534406a;hb=ffdcaed2ae52b27119d8d8b16eda1a28a0aac82a;hp=86e657b6b5fe15eea32be64c15eda1fd5333ff03;hpb=ddd6560f4e70ec3306d223738a441d5f1dd3eac9;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index 86e657b6b..d436977e3 100644
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -51,12 +51,16 @@ type 'term just =
 
 type ntactic =
    | NApply of loc * CicNotationPt.term
+   | NSmartApply of loc * CicNotationPt.term
    | NAssert of loc * ((string * [`Decl of CicNotationPt.term | `Def of CicNotationPt.term * CicNotationPt.term]) list * CicNotationPt.term) list
    | NCases of loc * CicNotationPt.term * npattern  
    | NCase1 of loc * string
    | NChange of loc * npattern * CicNotationPt.term
    | NConstructor of loc * int option * CicNotationPt.term list
    | NCut of loc * CicNotationPt.term
+(* | NDiscriminate of loc * CicNotationPt.term
+   | NSubst of loc * CicNotationPt.term *)
+   | NDestruct of loc
    | NElim of loc * CicNotationPt.term * npattern  
    | NGeneralize of loc * npattern
    | NId of loc
@@ -71,6 +75,7 @@ type ntactic =
    | NBranch of loc
    | NShift of loc
    | NPos of loc * int list
+   | NPosbyname of loc * string
    | NWildcard of loc
    | NMerge of loc
    | NSkip of loc
@@ -197,7 +202,7 @@ type nmacro =
 
 (** To be increased each time the command type below changes, used for "safe"
  * marshalling *)
-let magic = 30
+let magic = 33
 
 type ('term,'obj) command =
   | Index of loc * 'term option (* key *) * UriManager.uri (* value *)
@@ -220,7 +225,8 @@ type ('term,'obj) command =
 type ncommand =
   | UnificationHint of loc * CicNotationPt.term * int (* term, precedence *)
   | NObj of loc * CicNotationPt.term CicNotationPt.obj
-  | NInverter of loc * string * CicNotationPt.term
+  | NDiscriminator of loc * CicNotationPt.term
+  | NInverter of loc * string * CicNotationPt.term * bool list option * CicNotationPt.term option
   | NUnivConstraint of loc * NUri.uri * NUri.uri
   | NCopy of loc * string * NUri.uri * (NUri.uri * NUri.uri) list
   | NCoercion of loc * string *