new more flexible compose, see matita/tests/compose.ma for a sample

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

diff --git a/components/grafite/grafiteAst.ml b/components/grafite/grafiteAst.ml
index e8811830380cef794daf7f38c68348ae8a959dd8..0b54b68a4c6a1717b5d515f976cb2f40ce65be79 100644 (file)
--- a/components/grafite/grafiteAst.ml
+++ b/components/grafite/grafiteAst.ml
@@ -39,35 +39,51 @@ type 'lazy_term reduction =
   | `Unfold of 'lazy_term option
   | `Whd ]
 
+type 'ident intros_spec = int option * 'ident option list
+
 type ('term, 'lazy_term, 'reduction, 'ident) tactic =
+  (* Higher order tactics (i.e. tacticals) *)
+  | Do of loc * int * ('term, 'lazy_term, 'reduction, 'ident) tactic
+  | Repeat of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic
+  | Seq of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic list
+      (* sequential composition *)
+  | Then of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic *
+      ('term, 'lazy_term, 'reduction, 'ident) tactic list
+  | First of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic list
+      (* try a sequence of loc * tactic until one succeeds, fail otherwise *)
+  | Try of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic
+      (* try a tactic and mask failures *)
+  | Solve of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic list
+  | Progress of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic
+  (* Real tactics *)
   | Absurd of loc * 'term
   | Apply of loc * 'term
   | ApplyS of loc * 'term * (string * string) list
   | Assumption of loc
-  | Auto of loc * (string * string) list
-  | Cases of loc * 'term * 'ident list
+  | AutoBatch of loc * (string * string) list
+  | Cases of loc * 'term * 'ident intros_spec
   | Change of loc * ('term, 'lazy_term, 'ident) pattern * 'lazy_term
   | Clear of loc * 'ident list
   | ClearBody of loc * 'ident
+  | Compose of loc * 'term * 'term option * int * 'ident intros_spec
   | Constructor of loc * int
   | Contradiction of loc
   | Cut of loc * 'ident option * 'term
-  | Decompose of loc * 'ident list
+  | Decompose of loc * 'ident option list
   | Demodulate of loc
   | Destruct of loc * 'term
   | Elim of loc * 'term * 'term option * ('term, 'lazy_term, 'ident) pattern *
-           int option * 'ident list
-  | ElimType of loc * 'term * 'term option * int option * 'ident list
+           'ident intros_spec
+  | ElimType of loc * 'term * 'term option * 'ident intros_spec
   | Exact of loc * 'term
   | Exists of loc
   | Fail of loc
   | Fold of loc * 'reduction * 'lazy_term * ('term, 'lazy_term, 'ident) pattern
   | Fourier of loc
-  | FwdSimpl of loc * string * 'ident list
+  | FwdSimpl of loc * string * 'ident option list
   | Generalize of loc * ('term, 'lazy_term, 'ident) pattern * 'ident option
-  | Goal of loc * int (* change current goal, argument is goal number 1-based *)
   | IdTac of loc
-  | Intros of loc * int option * 'ident list
+  | Intros of loc * 'ident intros_spec
   | Inversion of loc * 'term
   | LApply of loc * bool * int option * 'term list * 'term * 'ident option
   | Left of loc
@@ -76,7 +92,7 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Reflexivity of loc
   | Replace of loc * ('term, 'lazy_term, 'ident) pattern * 'lazy_term
   | Rewrite of loc * direction * 'term *
-      ('term, 'lazy_term, 'ident) pattern * 'ident list
+      ('term, 'lazy_term, 'ident) pattern * 'ident option list
   | Right of loc
   | Ring of loc
   | Split of loc
@@ -118,6 +134,7 @@ type 'term macro =
   (* real macros *)
   | Check of loc * 'term 
   | Hint of loc
+  | AutoInteractive of loc * (string * string) list
   | Inline of loc * presentation_style * string * string 
      (* URI or base-uri, name prefix *) 
 
@@ -138,21 +155,7 @@ type ('term,'obj) command =
   | Print of loc * string
   | Qed of loc
 
-type ('term, 'lazy_term, 'reduction, 'ident) tactical =
-  | Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic
-  | Do of loc * int * ('term, 'lazy_term, 'reduction, 'ident) tactical
-  | Repeat of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical
-  | Seq of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical list
-      (* sequential composition *)
-  | Then of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical *
-      ('term, 'lazy_term, 'reduction, 'ident) tactical list
-  | First of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical list
-      (* try a sequence of loc * tactical until one succeeds, fail otherwise *)
-  | 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
-
+type ('term, 'lazy_term, 'reduction, 'ident) punctuation_tactical =
   | Dot of loc
   | Semicolon of loc
   | Branch of loc
@@ -160,20 +163,20 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactical =
   | Pos of loc * int list
   | Wildcard of loc
   | Merge of loc
+
+type ('term,'lazy_term,'reduction,'ident) non_punctuation_tactical =
   | Focus of loc * int list
   | Unfocus of loc
   | Skip of loc
 
-let is_punctuation =
-  function
-  | Dot _ | Semicolon _ | Branch _ | Shift _ | Merge _ | Pos _ -> true
-  | _ -> false
-
 type ('term, 'lazy_term, 'reduction, 'obj, 'ident) code =
   | Command of loc * ('term, 'obj) command
   | Macro of loc * 'term macro 
-  | Tactical of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical
-      * ('term, 'lazy_term, 'reduction, 'ident) tactical option(* punctuation *)
+  | Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic option
+      * ('term, 'lazy_term, 'reduction, 'ident) punctuation_tactical
+  | NonPunctuationTactical of loc
+      * ('term, 'lazy_term, 'reduction, 'ident) non_punctuation_tactical
+      * ('term, 'lazy_term, 'reduction, 'ident) punctuation_tactical
              
 type ('term, 'lazy_term, 'reduction, 'obj, 'ident) comment =
   | Note of loc * string