X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_transformations%2FtacticAst.ml;h=191323599638b3937ec47bd79adf7a07e58c2b5c;hb=94c9255e1f3095440f4d49ea1d75443a5a343185;hp=6ad30c7943e4f7d6ab0c4ba03920880035c624a0;hpb=d5478735145dd7a920ff1f7e0966b35f306bc3c7;p=helm.git

diff --git a/helm/ocaml/cic_transformations/tacticAst.ml b/helm/ocaml/cic_transformations/tacticAst.ml
index 6ad30c794..191323599 100644
--- a/helm/ocaml/cic_transformations/tacticAst.ml
+++ b/helm/ocaml/cic_transformations/tacticAst.ml
@@ -34,35 +34,43 @@ type ('term, 'ident) pattern =
 type ('term, 'ident) tactic =
   | Absurd of loc * 'term
   | Apply of loc * 'term
-  | Auto of loc * int option
   | Assumption of loc
-  | Change of loc * 'term * 'term * 'ident option (* what, with what, where *)
+  | Auto of loc * int option * int option (* depth, width *)
+  | Change of loc * 'term * 'term * ('term,'ident) pattern (* what, with what, where *)
+  | Clear of loc * 'ident
+  | ClearBody of loc * 'ident
+  | Compare of loc * 'term
+  | Constructor of loc * int
   | Contradiction of loc
-  | Cut of loc * 'term
-  | Decompose of loc * 'ident * 'ident list (* where, which principles *)
-  | Discriminate of loc * 'ident
+  | Cut of loc * 'ident option * 'term
+  | DecideEquality of loc
+  | Decompose of loc * 'term
+  | Discriminate of loc * 'term
   | Elim of loc * 'term * 'term option (* what to elim, which principle to use *)
   | ElimType of loc * 'term
   | Exact of loc * 'term
   | Exists of loc
-  | Fold of loc * reduction_kind * 'term
+  | Fail of loc
+  | Fold of loc * reduction_kind * 'term * ('term, 'ident) pattern
   | Fourier of loc
+  | FwdSimpl of loc * 'term
+  | Generalize of loc * 'term * 'ident option * ('term, 'ident) pattern
   | Goal of loc * int (* change current goal, argument is goal number 1-based *)
-  | Injection of loc * 'ident
+  | IdTac of loc
+  | Injection of loc * 'term
   | Intros of loc * int option * 'ident list
+  | LApply of loc * 'term option * 'term * 'ident option
   | Left of loc
   | LetIn of loc * 'term * 'ident
   | Reduce of loc * reduction_kind * ('term, 'ident) pattern 
   | Reflexivity of loc
-  | Replace of loc * 'term * 'term (* what, with what *)
+  | Replace of loc * ('term, 'ident) pattern * 'term
   | Rewrite of loc * direction * 'term * ('term, 'ident) pattern
   | Right of loc
   | Ring of loc
   | Split of loc
   | Symmetry of loc
   | Transitivity of loc * 'term
-  | FwdSimpl of loc * 'ident
-  | LApply of loc * 'term * ('ident * 'term) list
 
 type thm_flavour =
   [ `Definition
@@ -120,6 +128,7 @@ type obj =
 
 type ('term,'obj) command =
   | Set of loc * string * string
+  | Drop of loc
   | Qed of loc
       (** name.
        * Name is needed when theorem was started without providing a name
@@ -131,9 +140,7 @@ type ('term,'obj) command =
 
 type ('term, 'ident) tactical =
   | Tactic of loc * ('term, 'ident) tactic
-  | Fail of loc
   | Do of loc * int * ('term, 'ident) tactical
-  | IdTac of loc
   | Repeat of loc * ('term, 'ident) tactical
   | Seq of loc * ('term, 'ident) tactical list (* sequential composition *)
   | Then of loc * ('term, 'ident) tactical * ('term, 'ident) tactical list