- semantics of tactic subst allmost fixed

[helm.git] / components / grafite / grafiteAst.ml

diff --git a/components/grafite/grafiteAst.ml b/components/grafite/grafiteAst.ml
index d38943da19ed732ce46f1528a16c531adcd2f46c..b4c18726cd4ca73c36389f4521bc47ad3cb49a6b 100644 (file)
--- a/components/grafite/grafiteAst.ml
+++ b/components/grafite/grafiteAst.ml
@@ -83,15 +83,24 @@ 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 *)
   | 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 
+  | 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 ]
 
 type print_kind = [ `Env | `Coer ]
@@ -109,13 +118,14 @@ type 'term macro =
 
 (** To be increased each time the command type below changes, used for "safe"
  * marshalling *)
-let magic = 6
+let magic = 8
 
 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
@@ -133,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