More tactics or tactic arguments made available to matita and a bit of code

cleanup.

diff --git a/helm/ocaml/cic_disambiguation/cicTextualParser2.ml b/helm/ocaml/cic_disambiguation/cicTextualParser2.ml
index 19d5c5b145e25f7d599f02c496680a9f4a4ff205..9443a35d14231026a95cdbf611b65f95d7a73bd0 100644 (file)
--- a/helm/ocaml/cic_disambiguation/cicTextualParser2.ml
+++ b/helm/ocaml/cic_disambiguation/cicTextualParser2.ml
@@ -346,9 +346,11 @@ EXTEND
         TacticAst.Apply (loc, t)
     | IDENT "assumption" ->
         TacticAst.Assumption loc
-    | IDENT "auto"; num = OPT [ i = NUM -> int_of_string i ] -> 
-          TacticAst.Auto (loc,num)
-    | IDENT "change"; t1 = tactic_term; "with"; t2 = tactic_term;
+    | IDENT "auto";
+      depth = OPT [ IDENT "depth"; SYMBOL "="; i = NUM -> int_of_string i ];
+      width = OPT [ IDENT "depth"; SYMBOL "="; i = NUM -> int_of_string i ] -> 
+          TacticAst.Auto (loc,depth,width)
+    | IDENT "change"; t1 = tactic_term; "with"; t2 = tactic_term; "in";
       where = pattern_spec ->
         TacticAst.Change (loc, t1, t2, where)
     | IDENT "compare"; t = tactic_term ->
@@ -365,11 +367,11 @@ EXTEND
         TacticAst.Decompose (loc, where)
     | IDENT "discriminate"; t = tactic_term ->
         TacticAst.Discriminate (loc, t)
-    | IDENT "elimType"; t = tactic_term ->
-        TacticAst.ElimType (loc, t)
     | IDENT "elim"; t1 = tactic_term;
       using = OPT [ "using"; using = tactic_term -> using ] ->
         TacticAst.Elim (loc, t1, using)
+    | IDENT "elimType"; t = tactic_term ->
+        TacticAst.ElimType (loc, t)
     | IDENT "exact"; t = tactic_term ->
         TacticAst.Exact (loc, t)
     | IDENT "exists" ->
@@ -378,6 +380,11 @@ EXTEND
         TacticAst.Fold (loc, kind, t)
     | IDENT "fourier" ->
         TacticAst.Fourier loc
+    | IDENT "fwd"; t = term ->
+        TacticAst.FwdSimpl (loc, t)
+    | IDENT "generalize"; t = tactic_term; p = OPT [ pattern_spec ] ->
+       let p = match p with None -> [], None | Some p -> p in
+       TacticAst.Generalize (loc,t,p)
     | IDENT "goal"; n = NUM ->
         TacticAst.Goal (loc, int_of_string n)
     | IDENT "injection"; t = term ->
@@ -388,15 +395,15 @@ EXTEND
     | IDENT "intro"; ident = OPT IDENT ->
         let idents = match ident with None -> [] | Some id -> [id] in
         TacticAst.Intros (loc, Some 1, idents)
+    | IDENT "lapply"; what = tactic_term; 
+      to_what = OPT [ "to" ; t = tactic_term -> t ] ->
+        TacticAst.LApply (loc, to_what, what)
     | IDENT "left" -> TacticAst.Left loc
     | IDENT "letin"; where = IDENT ; SYMBOL <:unicode<def>> ; t = tactic_term ->
         TacticAst.LetIn (loc, t, where)
     | kind = reduction_kind; p = OPT [ pattern_spec ] ->
         let p = match p with None -> [], None | Some p -> p in
         TacticAst.Reduce (loc, kind, p)
-    | IDENT "generalize"; t = tactic_term; p = OPT [ pattern_spec ] ->
-       let p = match p with None -> [], None | Some p -> p in
-       TacticAst.Generalize (loc,t,p)
     | IDENT "reflexivity" ->
         TacticAst.Reflexivity loc
     | IDENT "replace"; t1 = tactic_term; "with"; t2 = tactic_term ->
@@ -404,18 +411,16 @@ EXTEND
     | IDENT "rewrite" ; d = direction; t = term ; p = OPT [ pattern_spec ] ->
         let p = match p with None -> [], None | Some p -> p in
         TacticAst.Rewrite (loc, d, t, p)
-    | IDENT "right" -> TacticAst.Right loc
-    | IDENT "ring" -> TacticAst.Ring loc
-    | IDENT "split" -> TacticAst.Split loc
+    | IDENT "right" ->
+        TacticAst.Right loc
+    | IDENT "ring" ->
+        TacticAst.Ring loc
+    | IDENT "split" ->
+        TacticAst.Split loc
     | IDENT "symmetry" ->
         TacticAst.Symmetry loc
     | IDENT "transitivity"; t = tactic_term ->
         TacticAst.Transitivity (loc, t)
-    | IDENT "fwd"; t = term ->
-        TacticAst.FwdSimpl (loc, t)
-    | IDENT "lapply"; what = tactic_term; 
-      to_what = OPT [ "to" ; t = tactic_term -> t ] ->
-        TacticAst.LApply (loc, to_what, what)
     ]
   ];
   tactical:

diff --git a/helm/ocaml/cic_transformations/tacticAst.ml b/helm/ocaml/cic_transformations/tacticAst.ml
index 63314d96f04f9d5b618becc9a613ddd27780fa54..8983490eac2483c198ec2cecd269cb9212208292 100644 (file)
--- a/helm/ocaml/cic_transformations/tacticAst.ml
+++ b/helm/ocaml/cic_transformations/tacticAst.ml
@@ -34,8 +34,8 @@ type ('term, 'ident) pattern =
 type ('term, 'ident) tactic =
   | Absurd of loc * 'term
   | Apply of loc * 'term
-  | Auto of loc * int option
   | Assumption of loc
+  | Auto of loc * int option * int option (* depth, width *)
   | Change of loc * 'term * 'term * ('term,'ident) pattern (* what, with what, where *)
   | Compare of loc * 'term
   | Constructor of loc * int