X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAst.ml;h=8d0679230ce4d035a60d66d5c0b481b3116e5ae9;hb=da2c7f7bb1d9f27d998e54e09218be2245a00805;hp=6bf050fec3f1ffb8013b369a4a768fe34eaf25ff;hpb=df1201e37d6f2631dc31ffc87b979a6c81180a3a;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index 6bf050fec..8d0679230 100644
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -55,6 +55,7 @@ type ntactic =
    | NCases of loc * CicNotationPt.term * npattern  
    | NCase1 of loc * string
    | NChange of loc * npattern * CicNotationPt.term
+   | NConstructor of loc * int option * CicNotationPt.term list
    | NElim of loc * CicNotationPt.term * npattern  
    | NGeneralize of loc * npattern
    | NId of loc
@@ -73,6 +74,10 @@ type ntactic =
    | NSkip of loc
    | NFocus of loc * int list
    | NUnfocus of loc
+   | NTry of loc * ntactic
+   | NAssumption of loc
+   | NRepeat of loc * ntactic
+   | NBlock of loc * ntactic list
 
 type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   (* Higher order tactics (i.e. tacticals) *)
@@ -184,9 +189,12 @@ type ('term,'lazy_term) macro =
   | Inline of loc * string * inline_param list
      (* URI or base-uri, parameters *) 
 
+type nmacro =
+  | NCheck of loc * CicNotationPt.term
+
 (** To be increased each time the command type below changes, used for "safe"
  * marshalling *)
-let magic = 23
+let magic = 27
 
 type ('term,'obj) command =
   | Index of loc * 'term option (* key *) * UriManager.uri (* value *)
@@ -198,7 +206,7 @@ type ('term,'obj) command =
   | Inverter of loc * string * 'term * bool list
   | Default of loc * string * UriManager.uri list
   | Drop of loc
-  | Include of loc * bool (* normal? *) * string 
+  | Include of loc * bool (* normal? *) * [`New | `OldAndNew] * string 
   | Obj of loc * 'obj
   | Relation of
      loc * string * 'term * 'term * 'term option * 'term option * 'term option
@@ -210,6 +218,10 @@ type ncommand =
   | UnificationHint of loc * CicNotationPt.term * int (* term, precedence *)
   | NObj of loc * CicNotationPt.term CicNotationPt.obj
   | NUnivConstraint of loc * bool * NUri.uri * NUri.uri
+  | NCopy of loc * string * NUri.uri * (NUri.uri * NUri.uri) list
+  | NCoercion of loc * string *
+      CicNotationPt.term * CicNotationPt.term *
+      (string * CicNotationPt.term) * CicNotationPt.term
   | NQed of loc
 
 type punctuation_tactical =
@@ -230,6 +242,7 @@ type ('term, 'lazy_term, 'reduction, 'obj, 'ident) code =
   | Command of loc * ('term, 'obj) command
   | NCommand of loc * ncommand
   | Macro of loc * ('term,'lazy_term) macro 
+  | NMacro of loc * nmacro 
   | NTactic of loc * ntactic list
   | Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic option
       * punctuation_tactical