Much ado about nothing:

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

diff --git a/components/grafite/grafiteAst.ml b/components/grafite/grafiteAst.ml
index e8811830380cef794daf7f38c68348ae8a959dd8..d7b929de323fa12c0d6be8e37e4890ddeb8d5b02 100644 (file)
--- a/components/grafite/grafiteAst.ml
+++ b/components/grafite/grafiteAst.ml
@@ -40,6 +40,20 @@ type 'lazy_term reduction =
   | `Whd ]
 
 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
@@ -65,7 +79,6 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Fourier of loc
   | FwdSimpl of loc * string * 'ident 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
   | Inversion of loc * 'term
@@ -138,21 +151,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 +159,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