src/Cube/ex/ex.ML

--- a/src/Cube/ex/ex.ML	Mon Jan 19 16:26:11 1998 +0100
+++ b/src/Cube/ex/ex.ML	Tue Jan 20 18:26:26 1998 +0100
@@ -6,129 +6,129 @@
 fun strip_asms_tac thms  i =
     REPEAT(resolve_tac[strip_b,strip_s]i THEN DEPTH_SOLVE_1(ares_tac thms i));
 
-val imp_elim = prove_goal thy "[| f:A->B; a:A; f^a:B ==> PROP P |] ==> PROP P"
+val imp_elim = prove_goal Base.thy "[| f:A->B; a:A; f^a:B ==> PROP P |] ==> PROP P"
         (fn asms => [REPEAT(resolve_tac (app::asms) 1)]);
 
-val pi_elim = prove_goal thy
+val pi_elim = prove_goal Base.thy
         "[| F:Prod(A,B); a:A; F^a:B(a) ==> PROP P |] ==> PROP P"
         (fn asms => [REPEAT(resolve_tac (app::asms) 1)]);
 
 (* SIMPLE TYPES *)
 
-goal thy "A:* |- A->A : ?T";
+goal Base.thy "A:* |- A->A : ?T";
 by (DEPTH_SOLVE (ares_tac simple 1));
 uresult();
 
-goal thy "A:* |- Lam a:A. a : ?T";
+goal Base.thy "A:* |- Lam a:A. a : ?T";
 by (DEPTH_SOLVE (ares_tac simple 1));
 uresult();
 
-goal thy "A:* B:* b:B |- Lam x:A. b : ?T";
+goal Base.thy "A:* B:* b:B |- Lam x:A. b : ?T";
 by (DEPTH_SOLVE (ares_tac simple 1));
 uresult();
 
-goal thy "A:* b:A |- (Lam a:A. a)^b: ?T";
+goal Base.thy "A:* b:A |- (Lam a:A. a)^b: ?T";
 by (DEPTH_SOLVE (ares_tac simple 1));
 uresult();
 
-goal thy "A:* B:* c:A b:B |- (Lam x:A. b)^ c: ?T";
+goal Base.thy "A:* B:* c:A b:B |- (Lam x:A. b)^ c: ?T";
 by (DEPTH_SOLVE (ares_tac simple 1));
 uresult();
 
-goal thy "A:* B:* |- Lam a:A. Lam b:B. a : ?T";
+goal Base.thy "A:* B:* |- Lam a:A. Lam b:B. a : ?T";
 by (DEPTH_SOLVE (ares_tac simple 1));
 uresult();
 
 (* SECOND-ORDER TYPES *)
 
-goal L2_thy "|- Lam A:*. Lam a:A. a : ?T";
+goal L2.thy "|- Lam A:*. Lam a:A. a : ?T";
 by (DEPTH_SOLVE (ares_tac L2 1));
 uresult();
 
-goal L2_thy "A:* |- (Lam B:*.Lam b:B. b)^A : ?T";
+goal L2.thy "A:* |- (Lam B:*.Lam b:B. b)^A : ?T";
 by (DEPTH_SOLVE (ares_tac L2 1));
 uresult();
 
-goal L2_thy "A:* b:A |- (Lam B:*.Lam b:B. b) ^ A ^ b: ?T";
+goal L2.thy "A:* b:A |- (Lam B:*.Lam b:B. b) ^ A ^ b: ?T";
 by (DEPTH_SOLVE (ares_tac L2 1));
 uresult();
 
-goal L2_thy "|- Lam B:*.Lam a:(Pi A:*.A).a ^ ((Pi A:*.A)->B) ^ a: ?T";
+goal L2.thy "|- Lam B:*.Lam a:(Pi A:*.A).a ^ ((Pi A:*.A)->B) ^ a: ?T";
 by (DEPTH_SOLVE (ares_tac L2 1));
 uresult();
 
 (* Weakly higher-order proposiional logic *)
 
-goal Lomega_thy "|- Lam A:*.A->A : ?T";
+goal Lomega.thy "|- Lam A:*.A->A : ?T";
 by (DEPTH_SOLVE (ares_tac Lomega 1));
 uresult();
 
-goal Lomega_thy "B:* |- (Lam A:*.A->A) ^ B : ?T";
+goal Lomega.thy "B:* |- (Lam A:*.A->A) ^ B : ?T";
 by (DEPTH_SOLVE (ares_tac Lomega 1));
 uresult();
 
-goal Lomega_thy "B:* b:B |- (Lam y:B. b): ?T";
+goal Lomega.thy "B:* b:B |- (Lam y:B. b): ?T";
 by (DEPTH_SOLVE (ares_tac Lomega 1));
 uresult();
 
-goal Lomega_thy "A:* F:*->* |- F^(F^A): ?T";
+goal Lomega.thy "A:* F:*->* |- F^(F^A): ?T";
 by (DEPTH_SOLVE (ares_tac Lomega 1));
 uresult();
 
-goal Lomega_thy "A:* |- Lam F:*->*.F^(F^A): ?T";
+goal Lomega.thy "A:* |- Lam F:*->*.F^(F^A): ?T";
 by (DEPTH_SOLVE (ares_tac Lomega 1));
 uresult();
 
 (* LF *)
 
-goal LP_thy "A:* |- A -> * : ?T";
+goal LP.thy "A:* |- A -> * : ?T";
 by (DEPTH_SOLVE (ares_tac LP 1));
 uresult();
 
-goal LP_thy "A:* P:A->* a:A |- P^a: ?T";
+goal LP.thy "A:* P:A->* a:A |- P^a: ?T";
 by (DEPTH_SOLVE (ares_tac LP 1));
 uresult();
 
-goal LP_thy "A:* P:A->A->* a:A |- Pi a:A. P^a^a: ?T";
+goal LP.thy "A:* P:A->A->* a:A |- Pi a:A. P^a^a: ?T";
 by (DEPTH_SOLVE (ares_tac LP 1));
 uresult();
 
-goal LP_thy "A:* P:A->* Q:A->* |- Pi a:A. P^a -> Q^a: ?T";
+goal LP.thy "A:* P:A->* Q:A->* |- Pi a:A. P^a -> Q^a: ?T";
 by (DEPTH_SOLVE (ares_tac LP 1));
 uresult();
 
-goal LP_thy "A:* P:A->* |- Pi a:A. P^a -> P^a: ?T";
+goal LP.thy "A:* P:A->* |- Pi a:A. P^a -> P^a: ?T";
 by (DEPTH_SOLVE (ares_tac LP 1));
 uresult();
 
-goal LP_thy "A:* P:A->* |- Lam a:A. Lam x:P^a. x: ?T";
+goal LP.thy "A:* P:A->* |- Lam a:A. Lam x:P^a. x: ?T";
 by (DEPTH_SOLVE (ares_tac LP 1));
 uresult();
 
-goal LP_thy "A:* P:A->* Q:* |- (Pi a:A. P^a->Q) -> (Pi a:A. P^a) -> Q : ?T";
+goal LP.thy "A:* P:A->* Q:* |- (Pi a:A. P^a->Q) -> (Pi a:A. P^a) -> Q : ?T";
 by (DEPTH_SOLVE (ares_tac LP 1));
 uresult();
 
-goal LP_thy "A:* P:A->* Q:* a0:A |- \
+goal LP.thy "A:* P:A->* Q:* a0:A |- \
 \       Lam x:Pi a:A. P^a->Q. Lam y:Pi a:A. P^a. x^a0^(y^a0): ?T";
 by (DEPTH_SOLVE (ares_tac LP 1));
 uresult();
 
 (* OMEGA-ORDER TYPES *)
 
-goal L2_thy "A:* B:* |- Pi C:*.(A->B->C)->C : ?T";
+goal L2.thy "A:* B:* |- Pi C:*.(A->B->C)->C : ?T";
 by (DEPTH_SOLVE (ares_tac L2 1));
 uresult();
 
-goal LOmega_thy "|- Lam A:*.Lam B:*.Pi C:*.(A->B->C)->C : ?T";
+goal LOmega.thy "|- Lam A:*.Lam B:*.Pi C:*.(A->B->C)->C : ?T";
 by (DEPTH_SOLVE (ares_tac LOmega 1));
 uresult();
 
-goal LOmega_thy "|- Lam A:*.Lam B:*.Lam x:A. Lam y:B. x : ?T";
+goal LOmega.thy "|- Lam A:*.Lam B:*.Lam x:A. Lam y:B. x : ?T";
 by (DEPTH_SOLVE (ares_tac LOmega 1));
 uresult();
 
-goal LOmega_thy "A:* B:* |- ?p : (A->B) -> ((B->Pi P:*.P)->(A->Pi P:*.P))";
+goal LOmega.thy "A:* B:* |- ?p : (A->B) -> ((B->Pi P:*.P)->(A->Pi P:*.P))";
 by (strip_asms_tac LOmega 1);
 by (rtac lam_ss 1);
 by (DEPTH_SOLVE_1(ares_tac LOmega 1));
@@ -148,17 +148,17 @@
 
 (* Second-order Predicate Logic *)
 
-goal LP2_thy "A:* P:A->* |- Lam a:A. P^a->(Pi A:*.A) : ?T";
+goal LP2.thy "A:* P:A->* |- Lam a:A. P^a->(Pi A:*.A) : ?T";
 by (DEPTH_SOLVE (ares_tac LP2 1));
 uresult();
 
-goal LP2_thy "A:* P:A->A->* |- \
+goal LP2.thy "A:* P:A->A->* |- \
 \       (Pi a:A. Pi b:A. P^a^b->P^b^a->Pi P:*.P) -> Pi a:A. P^a^a->Pi P:*.P : ?T";
 by (DEPTH_SOLVE (ares_tac LP2 1));
 uresult();
 
 (* Antisymmetry implies irreflexivity: *)
-goal LP2_thy "A:* P:A->A->* |- \
+goal LP2.thy "A:* P:A->A->* |- \
 \       ?p: (Pi a:A. Pi b:A. P^a^b->P^b^a->Pi P:*.P) -> Pi a:A. P^a^a->Pi P:*.P";
 by (strip_asms_tac LP2 1);
 by (rtac lam_ss 1);
@@ -175,25 +175,25 @@
 
 (* LPomega *)
 
-goal LPomega_thy "A:* |- Lam P:A->A->*.Lam a:A. P^a^a : ?T";
+goal LPomega.thy "A:* |- Lam P:A->A->*.Lam a:A. P^a^a : ?T";
 by (DEPTH_SOLVE (ares_tac LPomega 1));
 uresult();
 
-goal LPomega_thy "|- Lam A:*.Lam P:A->A->*.Lam a:A. P^a^a : ?T";
+goal LPomega.thy "|- Lam A:*.Lam P:A->A->*.Lam a:A. P^a^a : ?T";
 by (DEPTH_SOLVE (ares_tac LPomega 1));
 uresult();
 
 (* CONSTRUCTIONS *)
 
-goal CC_thy "|- Lam A:*.Lam P:A->*.Lam a:A. P^a->Pi P:*.P: ?T";
+goal CC.thy "|- Lam A:*.Lam P:A->*.Lam a:A. P^a->Pi P:*.P: ?T";
 by (DEPTH_SOLVE (ares_tac CC 1));
 uresult();
 
-goal CC_thy "|- Lam A:*.Lam P:A->*.Pi a:A. P^a: ?T";
+goal CC.thy "|- Lam A:*.Lam P:A->*.Pi a:A. P^a: ?T";
 by (DEPTH_SOLVE (ares_tac CC 1));
 uresult();
 
-goal CC_thy "A:* P:A->* a:A |- ?p : (Pi a:A. P^a)->P^a";
+goal CC.thy "A:* P:A->* a:A |- ?p : (Pi a:A. P^a)->P^a";
 by (strip_asms_tac CC 1);
 by (rtac lam_ss 1);
 by (DEPTH_SOLVE_1(ares_tac CC 1));
@@ -203,18 +203,18 @@
 
 (* Some random examples *)
 
-goal LP2_thy "A:* c:A f:A->A |- \
+goal LP2.thy "A:* c:A f:A->A |- \
 \       Lam a:A. Pi P:A->*.P^c -> (Pi x:A. P^x->P^(f^x)) -> P^a : ?T";
 by (DEPTH_SOLVE(ares_tac LP2 1));
 uresult();
 
-goal CC_thy "Lam A:*.Lam c:A. Lam f:A->A. \
+goal CC.thy "Lam A:*.Lam c:A. Lam f:A->A. \
 \       Lam a:A. Pi P:A->*.P^c -> (Pi x:A. P^x->P^(f^x)) -> P^a : ?T";
 by (DEPTH_SOLVE(ares_tac CC 1));
 uresult();
 
 (* Symmetry of Leibnitz equality *)
-goal LP2_thy "A:* a:A b:A |- ?p: (Pi P:A->*.P^a->P^b) -> (Pi P:A->*.P^b->P^a)";
+goal LP2.thy "A:* a:A b:A |- ?p: (Pi P:A->*.P^a->P^b) -> (Pi P:A->*.P^b->P^a)";
 by (strip_asms_tac LP2 1);
 by (rtac lam_ss 1);
 by (DEPTH_SOLVE_1(ares_tac LP2 1));