X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_transformations%2FtacticAst.ml;h=a051c2af6336d2a93e4a54b2d84b18ae2b9a1211;hb=29a3bd5d160f31873236c93a008a9e4fd31c305e;hp=1525cfd8b7f132315dffbf3c8c4a4e5672924d08;hpb=e74526f044f57e77e99c777b5f9354fdd2c74a74;p=helm.git

diff --git a/helm/ocaml/cic_transformations/tacticAst.ml b/helm/ocaml/cic_transformations/tacticAst.ml
index 1525cfd8b..a051c2af6 100644
--- a/helm/ocaml/cic_transformations/tacticAst.ml
+++ b/helm/ocaml/cic_transformations/tacticAst.ml
@@ -23,20 +23,19 @@
  * http://helm.cs.unibo.it/
  *)
 
-type direction = [ `Left | `Right ]
+type direction = [ `LeftToRight | `RightToLeft ]
 type reduction_kind = [ `Reduce | `Simpl | `Whd | `Normalize ]
 
 type loc = CicAst.location
 
-type ('term, 'ident) pattern =
-  ('ident * 'term) list * 'term option
+type ('term, 'ident) pattern = 'term option * ('ident * 'term) list * 'term
 
 type ('term, 'ident) tactic =
   | Absurd of loc * 'term
   | Apply of loc * 'term
   | Assumption of loc
   | Auto of loc * int option * int option (* depth, width *)
-  | Change of loc * 'term * 'term * ('term,'ident) pattern (* what, with what, where *)
+  | Change of loc * ('term,'ident) pattern * 'term
   | Clear of loc * 'ident
   | ClearBody of loc * 'ident
   | Compare of loc * 'term
@@ -53,13 +52,13 @@ type ('term, 'ident) tactic =
   | 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
+  | FwdSimpl of loc * string * 'ident list
+  | Generalize of loc * ('term, 'ident) pattern * 'ident option
   | Goal of loc * int (* change current goal, argument is goal number 1-based *)
   | IdTac of loc
   | Injection of loc * 'term
   | Intros of loc * int option * 'ident list
-  | LApply of loc * 'term option * 'term * 'ident option
+  | LApply of loc * int option * 'term list * 'term * 'ident option
   | Left of loc
   | LetIn of loc * 'term * 'ident
   | Reduce of loc * reduction_kind * ('term, 'ident) pattern 
@@ -127,7 +126,9 @@ type obj =
       (string * CicAst.term) list
 
 type ('term,'obj) command =
+  | Include of loc * string
   | Set of loc * string * string
+  | Drop of loc
   | Qed of loc
       (** name.
        * Name is needed when theorem was started without providing a name