X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAst.ml;h=b516d393e12c123d3a539353fb83b62cc0ef211d;hb=92d0723eca60b8d73b1f4597551155dcceaa9ced;hp=65e35634f2b48172f21f1dfa5a526422ab7b04e9;hpb=4f12c6bc7fb5f1ba3bd42f78abddb77b3b0a8f93;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index 65e35634f..b516d393e 100644
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -83,6 +83,7 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Right of loc
   | Ring of loc
   | Split of loc
+  | Subst of loc
   | Symmetry of loc
   | Transitivity of loc * 'term
   (* Costruttori Aggiunti *)
@@ -95,9 +96,10 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Byinduction of loc * 'term * 'ident
   | Thesisbecomes of loc * 'term
   | Case of loc * string * (string * 'term) list 
-  | Let1 of loc * 'ident * 'term * 'term
-  | Bywehave of loc * 'term option * 'term * 'ident * 'term * 'ident
-  | RewritingStep of loc * 'term option * 'term  * 'term option
+  | ExistsElim of loc * 'term * 'ident * 'term * 'ident * 'term
+  | AndElim of loc * 'term * 'ident * 'term * 'ident * 'term
+  | RewritingStep of
+     loc * 'term option * 'term  * 'term option * Cic.name option
   
 type search_kind = [ `Locate | `Hint | `Match | `Elim ]
 
@@ -116,7 +118,7 @@ type 'term macro =
 
 (** To be increased each time the command type below changes, used for "safe"
  * marshalling *)
-let magic = 7
+let magic = 9
 
 type 'obj command =
   | Default of loc * string * UriManager.uri list
@@ -125,7 +127,7 @@ type 'obj command =
   | Drop of loc
   | Print of loc * string
   | Qed of loc
-  | Coercion of loc * UriManager.uri * bool (* add composites *)
+  | Coercion of loc * UriManager.uri * bool (* add_obj *) * int (* arity *)
   | Obj of loc * 'obj
 
 type ('term, 'lazy_term, 'reduction, 'ident) tactical =
@@ -141,6 +143,7 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactical =
   | Try of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical
       (* try a tactical and mask failures *)
   | Solve of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical list
+  | Progress of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical
 
   | Dot of loc
   | Semicolon of loc