Makes the new Proofview.tactic the basic type of Ltac.

On the compilation of Coq, we can see an increase of ~20% compile time on
my completely non-scientific tests. Hopefully this can be fixed.

There are a lot of low hanging fruits, but this is an iso-functionality commit.
With a few exceptions which were not necessary for the compilation of the theories:
- The declarative mode is not yet ported
- The timeout tactical is currently deactivated because it needs some subtle
I/O. The framework is ready to handle it, but I haven't done it yet.
-  For much the same reason, the ltac debugger is unplugged. It will be more
difficult, but will eventually be back.

A few comments:
I occasionnally used a coercion from [unit Proofview.tactic] to the old
[Prooftype.tactic]. It should work smoothely, but loses any backtracking
information: the coerced tactics has at most one success.
- It is used in autorewrite (it shouldn't be a problem there). Autorewrite's
code is fairly old and tricky
- It is used in eauto, mostly for "Hint Extern". It may be an issue as time goes
as we might want to have various success in a "Hint Extern". But it would
require a heavy port of eauto.ml4
- It is used in typeclass eauto, but with a little help from Matthieu, it should
be easy to port the whole thing to the new tactic engine, actually simplifying
the code.
- It is used in fourier. I believe it to be inocuous.
- It is used in firstorder and congruence. I think it's ok. Their code is
somewhat intricate and I'm not sure they would be easy to actually port.
- It is used heavily in Function. And honestly, I have no idea whether it can do
harm or not.

Updates:
(11 June 2013) Pierre-Marie Pédrot contributed the rebase over his new stream based
architecture for Ltac matching (r16533), which avoid painfully and expensively
working around the exception-throwing control flow of the previous API.
(11 October 2013) Rebasing over recent commits (somewhere in r16721-r16730)
rendered a major bug in my implementation of Tacticals.New.tclREPEAT_MAIN
apparent. It caused Field_theory.v to loop. The bug made rewrite !lemma,
rewrite ?lemma and autorewrite incorrect (tclREPEAT_MAIN was essentially
tclREPEAT, causing rewrites to be tried in the side-conditions of conditional
rewrites as well). The new implementation makes Coq faster, but it is
pretty much impossible to tell if it is significant at all.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16967 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 15 insertions, 13 deletions

diff --git a/plugins/btauto/refl_btauto.ml b/plugins/btauto/refl_btauto.ml
index b90e8ddaf..46a7e596c 100644
--- a/plugins/btauto/refl_btauto.ml
+++ b/plugins/btauto/refl_btauto.ml
@@ -1,3 +1,5 @@
+open Proofview.Notations
+
 let contrib_name = "btauto"
 
 let init_constant dir s =
@@ -214,23 +216,23 @@ module Btauto = struct
     in
     Tacticals.tclFAIL 0 msg gl
 
-  let try_unification env gl =
+  let try_unification env =
+    Goal.concl >>- fun concl ->
     let eq = Lazy.force eq in
-    let concl = Tacmach.pf_concl gl in
     let t = decomp_term concl in
     match t with
     | Term.App (c, [|typ; p; _|]) when c === eq ->
       (* should be an equality [@eq poly ?p (Cst false)] *)
-      let tac = Tacticals.tclORELSE0 Tactics.reflexivity (print_counterexample p env) in
-      tac gl
+      let tac = Tacticals.New.tclORELSE0 Tactics.reflexivity (Proofview.V82.tactic (print_counterexample p env)) in
+      tac
     | _ ->
       let msg = str "Btauto: Internal error" in
-      Tacticals.tclFAIL 0 msg gl
+      Tacticals.New.tclFAIL 0 msg
 
-  let tac gl =
+  let tac =
+    Goal.concl >>- fun concl ->
     let eq = Lazy.force eq in
     let bool = Lazy.force Bool.typ in
-    let concl = Tacmach.pf_concl gl in
     let t = decomp_term concl in
     match t with
     | Term.App (c, [|typ; tl; tr|])
@@ -242,14 +244,14 @@ module Btauto = struct
       let fl = reify env fl in
       let fr = reify env fr in
       let changed_gl = Term.mkApp (c, [|typ; fl; fr|]) in
-      Tacticals.tclTHENLIST [
-        Tactics.change_in_concl None changed_gl;
-        Tactics.apply (Lazy.force soundness);
-        Tactics.normalise_vm_in_concl;
+      Tacticals.New.tclTHENLIST [
+        Proofview.V82.tactic (Tactics.change_in_concl None changed_gl);
+        Proofview.V82.tactic (Tactics.apply (Lazy.force soundness));
+        Proofview.V82.tactic (Tactics.normalise_vm_in_concl);
         try_unification env
-      ] gl
+      ]
     | _ ->
       let msg = str "Cannot recognize a boolean equality" in
-      Tacticals.tclFAIL 0 msg gl
+      Tacticals.New.tclFAIL 0 msg
 
 end