X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAst.ml;h=813a080719cfbf039ea234c4dab8e1c81460004a;hb=3d3d0248bf4770c63361f7805d2099b2a607f44d;hp=fe060d41591b4ca1331c4c3e1e1b789c19c4c6bb;hpb=c7a74f0ef29118fc97c1a6283f4249a0ed4b0ba1;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index fe060d415..813a08071 100644
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -73,6 +73,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) *)
@@ -186,7 +190,7 @@ type ('term,'lazy_term) macro =
 
 (** To be increased each time the command type below changes, used for "safe"
  * marshalling *)
-let magic = 23
+let magic = 26
 
 type ('term,'obj) command =
   | Index of loc * 'term option (* key *) * UriManager.uri (* value *)
@@ -196,18 +200,24 @@ type ('term,'obj) command =
      int (* arity *) * int (* saturations *)
   | PreferCoercion of loc * 'term
   | Inverter of loc * string * 'term * bool list
-  | UnificationHint of loc * CicNotationPt.term * int (* term, precedence *)
   | 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
   | Set of loc * string * string
   | Print of loc * string
   | Qed of loc
+
+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 =
@@ -226,6 +236,7 @@ type non_punctuation_tactical =
 
 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 
   | NTactic of loc * ntactic list
   | Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic option