src/FOLP/FOLP.ML

--- a/src/FOLP/FOLP.ML	Mon Jan 29 13:56:41 1996 +0100
+++ b/src/FOLP/FOLP.ML	Mon Jan 29 13:58:15 1996 +0100
@@ -1,6 +1,6 @@
-(*  Title: 	FOLP/FOLP.ML
+(*  Title:      FOLP/FOLP.ML
     ID:         $Id$
-    Author: 	Martin D Coen, Cambridge University Computer Laboratory
+    Author:     Martin D Coen, Cambridge University Computer Laboratory
     Copyright   1991  University of Cambridge
 
 Tactics and lemmas for FOLP (Classical First-Order Logic with Proofs)
@@ -29,7 +29,7 @@
 val disjCI = prove_goal FOLP.thy 
    "(!!x.x:~Q ==> f(x):P) ==> ?p : P|Q"
  (fn prems=>
-  [ (resolve_tac [classical] 1),
+  [ (rtac classical 1),
     (REPEAT (ares_tac (prems@[disjI1,notI]) 1)),
     (REPEAT (ares_tac (prems@[disjI2,notE]) 1)) ]);
 
@@ -37,17 +37,17 @@
 val ex_classical = prove_goal FOLP.thy 
    "( !!u.u:~(EX x. P(x)) ==> f(u):P(a)) ==> ?p : EX x.P(x)"
  (fn prems=>
-  [ (resolve_tac [classical] 1),
+  [ (rtac classical 1),
     (eresolve_tac (prems RL [exI]) 1) ]);
 
 (*version of above, simplifying ~EX to ALL~ *)
 val exCI = prove_goal FOLP.thy 
    "(!!u.u:ALL x. ~P(x) ==> f(u):P(a)) ==> ?p : EX x.P(x)"
  (fn [prem]=>
-  [ (resolve_tac [ex_classical] 1),
+  [ (rtac ex_classical 1),
     (resolve_tac [notI RS allI RS prem] 1),
-    (eresolve_tac [notE] 1),
-    (eresolve_tac [exI] 1) ]);
+    (etac notE 1),
+    (etac exI 1) ]);
 
 val excluded_middle = prove_goal FOLP.thy "?p : ~P | P"
  (fn _=> [ rtac disjCI 1, assume_tac 1 ]);
@@ -66,7 +66,7 @@
 (*Double negation law*)
 val notnotD = prove_goal FOLP.thy "p:~~P ==> ?p : P"
  (fn [major]=>
-  [ (resolve_tac [classical] 1), (eresolve_tac [major RS notE] 1) ]);
+  [ (rtac classical 1), (eresolve_tac [major RS notE] 1) ]);
 
 
 (*** Tactics for implication and contradiction ***)
@@ -77,16 +77,16 @@
     "[| p:P<->Q; !!x y.[| x:P; y:Q |] ==> f(x,y):R;  \
 \                !!x y.[| x:~P; y:~Q |] ==> g(x,y):R |] ==> ?p : R"
  (fn prems =>
-  [ (resolve_tac [conjE] 1),
+  [ (rtac conjE 1),
     (REPEAT (DEPTH_SOLVE_1 
-	(etac impCE 1  ORELSE  mp_tac 1  ORELSE  ares_tac prems 1))) ]);
+        (etac impCE 1  ORELSE  mp_tac 1  ORELSE  ares_tac prems 1))) ]);
 
 
 (*Should be used as swap since ~P becomes redundant*)
 val swap = prove_goal FOLP.thy 
    "p:~P ==> (!!x.x:~Q ==> f(x):P) ==> ?p : Q"
  (fn major::prems=>
-  [ (resolve_tac [classical] 1),
+  [ (rtac classical 1),
     (rtac (major RS notE) 1),
     (REPEAT (ares_tac prems 1)) ]);