# HG changeset patch # User paulson # Date 903024476 -7200 # Node ID c9ad6bbf3a34f92c30038672f52fad0258888d39 # Parent c061e6f9d546686e1f67f35676c01b08ccaa4e0c tidying diff -r c061e6f9d546 -r c9ad6bbf3a34 src/ZF/AC/Cardinal_aux.ML --- a/src/ZF/AC/Cardinal_aux.ML Thu Aug 13 18:07:38 1998 +0200 +++ b/src/ZF/AC/Cardinal_aux.ML Thu Aug 13 18:07:56 1998 +0200 @@ -57,8 +57,7 @@ qed "Un_eqpoll_Inf_Ord"; -(*bijection is inferred!*) -Goal "(lam u:{{y,z} . y: x}. THE y. {y,z} = u) : bij({{y,z}. y:x}, x)"; +Goal "?f : bij({{y,z}. y:x}, x)"; by (rtac RepFun_bijective 1); by (simp_tac (simpset() addsimps [doubleton_eq_iff]) 1); by (Blast_tac 1); diff -r c061e6f9d546 -r c9ad6bbf3a34 src/ZF/AC/WO2_AC16.ML --- a/src/ZF/AC/WO2_AC16.ML Thu Aug 13 18:07:38 1998 +0200 +++ b/src/ZF/AC/WO2_AC16.ML Thu Aug 13 18:07:56 1998 +0200 @@ -601,8 +601,7 @@ (* ********************************************************************** *) -Goalw [AC16_def] - "!!n k. [| WO2; 0 AC16(k #+ m,k)"; +Goalw [AC16_def] "[| WO2; 0 AC16(k #+ m,k)"; by (rtac allI 1); by (rtac impI 1); by (forward_tac [WO2_infinite_subsets_eqpoll_X] 1 diff -r c061e6f9d546 -r c9ad6bbf3a34 src/ZF/AC/WO6_WO1.ML --- a/src/ZF/AC/WO6_WO1.ML Thu Aug 13 18:07:38 1998 +0200 +++ b/src/ZF/AC/WO6_WO1.ML Thu Aug 13 18:07:56 1998 +0200 @@ -158,16 +158,16 @@ (* ********************************************************************** *) Goalw [uu_def] "[| b EX d EX d uu(f,b,g,LEAST d. (uu(f,b,g,d) ~= 0)) ~= 0"; +\ y*y<=y; (UN b uu(f,b,g,LEAST d. (uu(f,b,g,d) ~= 0)) ~= 0"; by (dtac ex_d_uu_not_empty 1 THEN REPEAT (assume_tac 1)); by (fast_tac (claset() addSEs [LeastI, lt_Ord]) 1); qed "uu_not_empty"; @@ -178,8 +178,8 @@ qed "not_empty_rel_imp_domain"; Goal "[| b (LEAST d. uu(f,b,g,d) ~= 0) < a"; +\ y*y <= y; (UN b (LEAST d. uu(f,b,g,d) ~= 0) < a"; by (eresolve_tac [ex_d_uu_not_empty RS oexE] 1 THEN REPEAT (assume_tac 1)); by (resolve_tac [Least_le RS lt_trans1] 1 @@ -259,8 +259,7 @@ (* every value of defined function is less than or equipollent to m *) (* ********************************************************************** *) -Goalw [vv2_def] - "!!m. [| m:nat; m~=0 |] ==> vv2(f,b,g,s) lepoll m"; +Goalw [vv2_def] "[| m:nat; m~=0 |] ==> vv2(f,b,g,s) lepoll m"; by (asm_simp_tac (simpset() addsimps [empty_lepollI]) 1); by (fast_tac (claset() addSDs [le_imp_subset RS subset_imp_lepoll RS lepoll_0_is_0] @@ -270,8 +269,8 @@ qed "vv2_lepoll"; Goalw [ww2_def] - "!!m. [| ALL b ww2(f,b,g,d) lepoll m"; + "[| ALL b ww2(f,b,g,d) lepoll m"; by (excluded_middle_tac "f`g = 0" 1); by (asm_simp_tac (simpset() addsimps [empty_lepollI]) 2); by (dtac ospec 1 THEN (assume_tac 1)); @@ -294,8 +293,7 @@ (* ********************************************************************** *) (* lemma ii *) (* ********************************************************************** *) -Goalw [NN_def] - "!!y. [| succ(m) : NN(y); y*y <= y; m:nat; m~=0 |] ==> m : NN(y)"; +Goalw [NN_def] "[| succ(m) : NN(y); y*y <= y; m:nat; m~=0 |] ==> m : NN(y)"; by (REPEAT (eresolve_tac [CollectE, exE, conjE] 1)); by (resolve_tac [quant_domain_uu_lepoll_m RS cases RS disjE] 1 THEN (assume_tac 1)); @@ -332,7 +330,7 @@ qed "z_n_subset_z_succ_n"; Goal "[| ALL n:nat. f(n)<=f(succ(n)); n le m; n : nat; m: nat |] \ -\ ==> f(n)<=f(m)"; +\ ==> f(n)<=f(m)"; by (eres_inst_tac [("P","n le m")] rev_mp 1); by (res_inst_tac [("P","%z. n le z --> f(n) <= f(z)")] nat_induct 1); by (REPEAT (fast_tac le_cs 1)); @@ -373,7 +371,7 @@ (* WO6 ==> NN(y) ~= 0 *) (* ********************************************************************** *) -Goalw [WO6_def, NN_def] "!!y. WO6 ==> NN(y) ~= 0"; +Goalw [WO6_def, NN_def] "WO6 ==> NN(y) ~= 0"; by (fast_tac ZF_cs 1); (*SLOW if current claset is used*) qed "WO6_imp_NN_not_empty"; @@ -382,12 +380,12 @@ (* ********************************************************************** *) Goal "[| (UN b EX c EX c f` (LEAST i. f`i = {x}) = {x}"; +\ ==> f` (LEAST i. f`i = {x}) = {x}"; by (dtac lemma1 1 THEN REPEAT (assume_tac 1)); by (fast_tac (claset() addSEs [lt_Ord] addIs [LeastI]) 1); val lemma2 = result(); @@ -425,10 +423,10 @@ by (fast_tac (claset() addSIs [prem2]) 1); qed "rev_induct_lemma"; -val prems = goal thy - "[| P(n); n:nat; n~=0; \ -\ !!m. [| m:nat; m~=0; P(succ(m)) |] ==> P(m) |] \ -\ ==> P(1)"; +val prems = +Goal "[| P(n); n:nat; n~=0; \ +\ !!m. [| m:nat; m~=0; P(succ(m)) |] ==> P(m) |] \ +\ ==> P(1)"; by (resolve_tac [rev_induct_lemma RS impE] 1); by (etac impE 4 THEN (assume_tac 5)); by (REPEAT (ares_tac prems 1)); @@ -450,7 +448,7 @@ (* another helpful lemma *) Goalw [NN_def] "0:NN(y) ==> y=0"; by (fast_tac (claset() addSIs [equalityI] - addSDs [lepoll_0_is_0] addEs [subst]) 1); + addSDs [lepoll_0_is_0] addEs [subst]) 1); qed "NN_y_0"; Goalw [WO1_def] "WO6 ==> WO1";