X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_transformations%2FtacticAst.ml;h=48fbc4aa2115d9800e702ba8a1515beb7bbbc93a;hb=0d6486664169e87c0f2123f4923ab0aa3e544ebb;hp=191323599638b3937ec47bd79adf7a07e58c2b5c;hpb=bc9cc53fbb0cb8676106e0c4d74053bbe1ac1a8e;p=helm.git

diff --git a/helm/ocaml/cic_transformations/tacticAst.ml b/helm/ocaml/cic_transformations/tacticAst.ml
index 191323599..48fbc4aa2 100644
--- a/helm/ocaml/cic_transformations/tacticAst.ml
+++ b/helm/ocaml/cic_transformations/tacticAst.ml
@@ -23,20 +23,23 @@
  * 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) type_spec =
+   | Ident of 'ident
+   | Type of UriManager.uri * int 
 
 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
@@ -44,22 +47,22 @@ type ('term, 'ident) tactic =
   | Contradiction of loc
   | Cut of loc * 'ident option * 'term
   | DecideEquality of loc
-  | Decompose of loc * 'term
+  | Decompose of loc * ('term, 'ident) type_spec list * 'ident * 'ident list
   | Discriminate of loc * 'term
-  | Elim of loc * 'term * 'term option (* what to elim, which principle to use *)
-  | ElimType of loc * 'term
+  | Elim of loc * 'term * 'term option * int option * 'ident list
+  | ElimType of loc * 'term * 'term option * int option * 'ident list
   | Exact of loc * 'term
   | Exists of loc
   | 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 
@@ -72,13 +75,7 @@ type ('term, 'ident) tactic =
   | Symmetry of loc
   | Transitivity of loc * 'term
 
-type thm_flavour =
-  [ `Definition
-  | `Fact
-  | `Lemma
-  | `Remark
-  | `Theorem
-  ]
+type thm_flavour = Cic.object_flavour
 
   (** <name, inductive/coinductive, type, constructor list>
   * true means inductive, false coinductive *)
@@ -127,6 +124,8 @@ type obj =
       (string * CicAst.term) list
 
 type ('term,'obj) command =
+  | Default of loc * string * UriManager.uri list
+  | Include of loc * string
   | Set of loc * string * string
   | Drop of loc
   | Qed of loc
@@ -144,9 +143,10 @@ type ('term, 'ident) tactical =
   | 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
-  | Tries of loc * ('term, 'ident) tactical list
+  | First of loc * ('term, 'ident) tactical list
       (* try a sequence of loc * tacticals until one succeeds, fail otherwise *)
   | Try of loc * ('term, 'ident) tactical (* try a tactical and mask failures *)
+  | Solve of loc * ('term, 'ident) tactical list
 
 
 type ('term, 'obj, 'ident) code =