src/FOLP/ex/foundn.ML

--- a/src/FOLP/ex/foundn.ML	Mon Jan 29 13:56:41 1996 +0100
+++ b/src/FOLP/ex/foundn.ML	Mon Jan 29 13:58:15 1996 +0100
@@ -1,6 +1,6 @@
-(*  Title: 	FOL/ex/foundn
+(*  Title:      FOL/ex/foundn
     ID:         $Id$
-    Author: 	Lawrence C Paulson, Cambridge University Computer Laboratory
+    Author:     Lawrence C Paulson, Cambridge University Computer Laboratory
     Copyright   1991  University of Cambridge
 
 Intuitionistic FOL: Examples from The Foundation of a Generic Theorem Prover
@@ -9,11 +9,11 @@
 writeln"File FOL/ex/foundn.";
 
 goal IFOLP.thy "?p : A&B  --> (C-->A&C)";
-by (resolve_tac [impI] 1);
-by (resolve_tac [impI] 1);
-by (resolve_tac [conjI] 1);
+by (rtac impI 1);
+by (rtac impI 1);
+by (rtac conjI 1);
 by (assume_tac 2);
-by (resolve_tac [conjunct1] 1);
+by (rtac conjunct1 1);
 by (assume_tac 1);
 result();
 
@@ -21,9 +21,9 @@
 val prems = 
 goal IFOLP.thy "p : A&B ==> (!!x y.[| x:A;  y:B |] ==> f(x,y):C) ==> ?p:C";
 by (resolve_tac prems 1);
-by (resolve_tac [conjunct1] 1);
+by (rtac conjunct1 1);
 by (resolve_tac prems 1);
-by (resolve_tac [conjunct2] 1);
+by (rtac conjunct2 1);
 by (resolve_tac prems 1);
 result();
 
@@ -31,17 +31,17 @@
 val prems = 
 goal IFOLP.thy "(!!A x. x:~ ~A ==> cla(x):A) ==> ?p:B | ~B";
 by (resolve_tac prems 1);
-by (resolve_tac [notI] 1);
+by (rtac notI 1);
 by (res_inst_tac [ ("P", "~B") ]  notE  1);
-by (resolve_tac [notI] 2);
+by (rtac notI 2);
 by (res_inst_tac [ ("P", "B | ~B") ]  notE  2);
 by (assume_tac 2);
-by (resolve_tac [disjI1] 2);
+by (rtac disjI1 2);
 by (assume_tac 2);
-by (resolve_tac [notI] 1);
+by (rtac notI 1);
 by (res_inst_tac [ ("P", "B | ~B") ]  notE  1);
 by (assume_tac 1);
-by (resolve_tac [disjI2] 1);
+by (rtac disjI2 1);
 by (assume_tac 1);
 result();
 
@@ -49,23 +49,23 @@
 val prems = 
 goal IFOLP.thy "(!!A x. x:~ ~A ==> cla(x):A) ==> ?p:B | ~B";
 by (resolve_tac prems 1);
-by (resolve_tac [notI] 1);
-by (resolve_tac [notE] 1);
-by (resolve_tac [notI] 2);
-by (eresolve_tac [notE] 2);
-by (eresolve_tac [disjI1] 2);
-by (resolve_tac [notI] 1);
-by (eresolve_tac [notE] 1);
-by (eresolve_tac [disjI2] 1);
+by (rtac notI 1);
+by (rtac notE 1);
+by (rtac notI 2);
+by (etac notE 2);
+by (etac disjI1 2);
+by (rtac notI 1);
+by (etac notE 1);
+by (etac disjI2 1);
 result();
 
 
 val prems = 
 goal IFOLP.thy "[| p:A | ~A;  q:~ ~A |] ==> ?p:A";
-by (resolve_tac [disjE] 1);
+by (rtac disjE 1);
 by (resolve_tac prems 1);
 by (assume_tac 1);
-by (resolve_tac [FalseE] 1);
+by (rtac FalseE 1);
 by (res_inst_tac [ ("P", "~A") ]  notE  1);
 by (resolve_tac prems 1);
 by (assume_tac 1);
@@ -76,25 +76,25 @@
 
 val prems =
 goal IFOLP.thy "p : ALL z. G(z) ==> ?p:ALL z. G(z)|H(z)";
-by (resolve_tac [allI] 1);
-by (resolve_tac [disjI1] 1);
+by (rtac allI 1);
+by (rtac disjI1 1);
 by (resolve_tac (prems RL [spec]) 1); 
   (*can use instead
-    by (resolve_tac [spec] 1);  by (resolve_tac prems 1); *)
+    by (rtac spec 1);  by (resolve_tac prems 1); *)
 result();
 
 
 goal IFOLP.thy "?p : ALL x. EX y. x=y";
-by (resolve_tac [allI] 1);
-by (resolve_tac [exI] 1);
-by (resolve_tac [refl] 1);
+by (rtac allI 1);
+by (rtac exI 1);
+by (rtac refl 1);
 result();
 
 
 goal IFOLP.thy "?p : EX y. ALL x. x=y";
-by (resolve_tac [exI] 1);
-by (resolve_tac [allI] 1);
-by (resolve_tac [refl] 1) handle ERROR => writeln"Failed, as expected";  
+by (rtac exI 1);
+by (rtac allI 1);
+by (rtac refl 1) handle ERROR => writeln"Failed, as expected";  
 getgoal 1; 
 
 
@@ -109,12 +109,12 @@
 
 val prems =
 goal IFOLP.thy "p : (EX z.F(z)) & B ==> ?p:(EX z. F(z) & B)";
-by (resolve_tac [conjE] 1);
+by (rtac conjE 1);
 by (resolve_tac prems 1);
-by (resolve_tac [exE] 1);
+by (rtac exE 1);
 by (assume_tac 1);
-by (resolve_tac [exI] 1);
-by (resolve_tac [conjI] 1);
+by (rtac exI 1);
+by (rtac conjI 1);
 by (assume_tac 1);
 by (assume_tac 1);
 result();
@@ -122,11 +122,11 @@
 
 (*A bigger demonstration of quantifiers -- not in the paper*)
 goal IFOLP.thy "?p : (EX y. ALL x. Q(x,y)) -->  (ALL x. EX y. Q(x,y))";
-by (resolve_tac [impI] 1);
-by (resolve_tac [allI] 1);
-by (resolve_tac [exE] 1 THEN assume_tac 1);
-by (resolve_tac [exI] 1);
-by (resolve_tac [allE] 1 THEN assume_tac 1);
+by (rtac impI 1);
+by (rtac allI 1);
+by (rtac exE 1 THEN assume_tac 1);
+by (rtac exI 1);
+by (rtac allE 1 THEN assume_tac 1);
 by (assume_tac 1);
 result();