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

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index 6c6b3786f..65e35634f 100644
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -87,11 +87,18 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Transitivity of loc * 'term
   (* Costruttori Aggiunti *)
   | Assume of loc * 'ident * 'term
-  | Suppose of loc * 'term *'ident
-  | By_term_we_proved of loc * 'term * 'term * 'ident
-  | We_need_to_prove of loc * 'term * 'ident
-  | Bydone of loc * 'term
-
+  | Suppose of loc * 'term *'ident * 'term option
+  | By_term_we_proved of loc *'term option * 'term * 'ident * 'term option
+  | We_need_to_prove of loc * 'term * 'ident * 'term option
+  | Bydone of loc * 'term option 
+  | We_proceed_by_induction_on of loc * 'term * 'term
+  | 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
+  
 type search_kind = [ `Locate | `Hint | `Match | `Elim ]
 
 type print_kind = [ `Env | `Coer ]
@@ -104,20 +111,19 @@ type 'term macro =
   | WLocate of loc * string
   | WElim of loc * 'term
   (* real macros *)
-  | Print of loc * string
   | Check of loc * 'term 
   | Hint of loc
-  | Quit of loc
 
 (** To be increased each time the command type below changes, used for "safe"
  * marshalling *)
-let magic = 5
+let magic = 7
 
 type 'obj command =
   | Default of loc * string * UriManager.uri list
   | Include of loc * string
   | Set of loc * string * string
   | Drop of loc
+  | Print of loc * string
   | Qed of loc
   | Coercion of loc * UriManager.uri * bool (* add composites *)
   | Obj of loc * 'obj