author | berghofe |
Wed, 06 Aug 1997 01:13:46 +0200 | |
changeset 3615 | e5322197cfea |
parent 3577 | 9715b6e3ec5f |
child 3654 | ebad042c0bba |
permissions | -rw-r--r-- |
1465 | 1 |
(* Title: HOL/simpdata.ML |
923 | 2 |
ID: $Id$ |
1465 | 3 |
Author: Tobias Nipkow |
923 | 4 |
Copyright 1991 University of Cambridge |
5 |
||
6 |
Instantiation of the generic simplifier |
|
7 |
*) |
|
8 |
||
1984 | 9 |
section "Simplifier"; |
10 |
||
923 | 11 |
open Simplifier; |
12 |
||
1984 | 13 |
(*** Addition of rules to simpsets and clasets simultaneously ***) |
14 |
||
15 |
(*Takes UNCONDITIONAL theorems of the form A<->B to |
|
2031 | 16 |
the Safe Intr rule B==>A and |
17 |
the Safe Destruct rule A==>B. |
|
1984 | 18 |
Also ~A goes to the Safe Elim rule A ==> ?R |
19 |
Failing other cases, A is added as a Safe Intr rule*) |
|
20 |
local |
|
21 |
val iff_const = HOLogic.eq_const HOLogic.boolT; |
|
22 |
||
23 |
fun addIff th = |
|
24 |
(case HOLogic.dest_Trueprop (#prop(rep_thm th)) of |
|
2718 | 25 |
(Const("Not",_) $ A) => |
2031 | 26 |
AddSEs [zero_var_indexes (th RS notE)] |
27 |
| (con $ _ $ _) => |
|
28 |
if con=iff_const |
|
29 |
then (AddSIs [zero_var_indexes (th RS iffD2)]; |
|
30 |
AddSDs [zero_var_indexes (th RS iffD1)]) |
|
31 |
else AddSIs [th] |
|
32 |
| _ => AddSIs [th]; |
|
1984 | 33 |
Addsimps [th]) |
34 |
handle _ => error ("AddIffs: theorem must be unconditional\n" ^ |
|
2031 | 35 |
string_of_thm th) |
1984 | 36 |
|
37 |
fun delIff th = |
|
38 |
(case HOLogic.dest_Trueprop (#prop(rep_thm th)) of |
|
2718 | 39 |
(Const("Not",_) $ A) => |
2031 | 40 |
Delrules [zero_var_indexes (th RS notE)] |
41 |
| (con $ _ $ _) => |
|
42 |
if con=iff_const |
|
43 |
then Delrules [zero_var_indexes (th RS iffD2), |
|
3518 | 44 |
make_elim (zero_var_indexes (th RS iffD1))] |
2031 | 45 |
else Delrules [th] |
46 |
| _ => Delrules [th]; |
|
1984 | 47 |
Delsimps [th]) |
48 |
handle _ => warning("DelIffs: ignoring conditional theorem\n" ^ |
|
2031 | 49 |
string_of_thm th) |
1984 | 50 |
in |
51 |
val AddIffs = seq addIff |
|
52 |
val DelIffs = seq delIff |
|
53 |
end; |
|
54 |
||
55 |
||
923 | 56 |
local |
57 |
||
2935 | 58 |
fun prover s = prove_goal HOL.thy s (fn _ => [blast_tac HOL_cs 1]); |
923 | 59 |
|
1922 | 60 |
val P_imp_P_iff_True = prover "P --> (P = True)" RS mp; |
61 |
val P_imp_P_eq_True = P_imp_P_iff_True RS eq_reflection; |
|
923 | 62 |
|
1922 | 63 |
val not_P_imp_P_iff_F = prover "~P --> (P = False)" RS mp; |
64 |
val not_P_imp_P_eq_False = not_P_imp_P_iff_F RS eq_reflection; |
|
923 | 65 |
|
1922 | 66 |
fun atomize pairs = |
67 |
let fun atoms th = |
|
2031 | 68 |
(case concl_of th of |
69 |
Const("Trueprop",_) $ p => |
|
70 |
(case head_of p of |
|
71 |
Const(a,_) => |
|
72 |
(case assoc(pairs,a) of |
|
73 |
Some(rls) => flat (map atoms ([th] RL rls)) |
|
74 |
| None => [th]) |
|
75 |
| _ => [th]) |
|
76 |
| _ => [th]) |
|
1922 | 77 |
in atoms end; |
923 | 78 |
|
2134 | 79 |
fun gen_all th = forall_elim_vars (#maxidx(rep_thm th)+1) th; |
80 |
||
81 |
in |
|
82 |
||
1922 | 83 |
fun mk_meta_eq r = case concl_of r of |
2031 | 84 |
Const("==",_)$_$_ => r |
1922 | 85 |
| _$(Const("op =",_)$_$_) => r RS eq_reflection |
2718 | 86 |
| _$(Const("Not",_)$_) => r RS not_P_imp_P_eq_False |
1922 | 87 |
| _ => r RS P_imp_P_eq_True; |
88 |
(* last 2 lines requires all formulae to be of the from Trueprop(.) *) |
|
923 | 89 |
|
2082 | 90 |
val simp_thms = map prover |
91 |
[ "(x=x) = True", |
|
92 |
"(~True) = False", "(~False) = True", "(~ ~ P) = P", |
|
93 |
"(~P) ~= P", "P ~= (~P)", "(P ~= Q) = (P = (~Q))", |
|
94 |
"(True=P) = P", "(P=True) = P", |
|
95 |
"(True --> P) = P", "(False --> P) = True", |
|
96 |
"(P --> True) = True", "(P --> P) = True", |
|
97 |
"(P --> False) = (~P)", "(P --> ~P) = (~P)", |
|
98 |
"(P & True) = P", "(True & P) = P", |
|
2800 | 99 |
"(P & False) = False", "(False & P) = False", |
100 |
"(P & P) = P", "(P & (P & Q)) = (P & Q)", |
|
2082 | 101 |
"(P | True) = True", "(True | P) = True", |
2800 | 102 |
"(P | False) = P", "(False | P) = P", |
103 |
"(P | P) = P", "(P | (P | Q)) = (P | Q)", |
|
2082 | 104 |
"((~P) = (~Q)) = (P=Q)", |
2129 | 105 |
"(!x.P) = P", "(? x.P) = P", "? x. x=t", "? x. t=x", |
3573 | 106 |
"(? x. x=t & P(x)) = P(t)", |
3568
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
107 |
"(! x. t=x --> P(x)) = P(t)" ]; |
923 | 108 |
|
988 | 109 |
(*Add congruence rules for = (instead of ==) *) |
2636
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
110 |
infix 4 addcongs delcongs; |
3559 | 111 |
fun ss addcongs congs = ss addeqcongs (map standard (congs RL [eq_reflection])); |
112 |
fun ss delcongs congs = ss deleqcongs (map standard (congs RL [eq_reflection])); |
|
923 | 113 |
|
1264 | 114 |
fun Addcongs congs = (simpset := !simpset addcongs congs); |
2636
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
115 |
fun Delcongs congs = (simpset := !simpset delcongs congs); |
1264 | 116 |
|
923 | 117 |
fun mksimps pairs = map mk_meta_eq o atomize pairs o gen_all; |
118 |
||
1922 | 119 |
val imp_cong = impI RSN |
120 |
(2, prove_goal HOL.thy "(P=P')--> (P'--> (Q=Q'))--> ((P-->Q) = (P'-->Q'))" |
|
2935 | 121 |
(fn _=> [blast_tac HOL_cs 1]) RS mp RS mp); |
1922 | 122 |
|
1948
78e5bfcbc1e9
Added miniscoping to the simplifier: quantifiers are now pushed in
paulson
parents:
1922
diff
changeset
|
123 |
(*Miniscoping: pushing in existential quantifiers*) |
78e5bfcbc1e9
Added miniscoping to the simplifier: quantifiers are now pushed in
paulson
parents:
1922
diff
changeset
|
124 |
val ex_simps = map prover |
2031 | 125 |
["(EX x. P x & Q) = ((EX x.P x) & Q)", |
126 |
"(EX x. P & Q x) = (P & (EX x.Q x))", |
|
127 |
"(EX x. P x | Q) = ((EX x.P x) | Q)", |
|
128 |
"(EX x. P | Q x) = (P | (EX x.Q x))", |
|
129 |
"(EX x. P x --> Q) = ((ALL x.P x) --> Q)", |
|
130 |
"(EX x. P --> Q x) = (P --> (EX x.Q x))"]; |
|
1948
78e5bfcbc1e9
Added miniscoping to the simplifier: quantifiers are now pushed in
paulson
parents:
1922
diff
changeset
|
131 |
|
78e5bfcbc1e9
Added miniscoping to the simplifier: quantifiers are now pushed in
paulson
parents:
1922
diff
changeset
|
132 |
(*Miniscoping: pushing in universal quantifiers*) |
78e5bfcbc1e9
Added miniscoping to the simplifier: quantifiers are now pushed in
paulson
parents:
1922
diff
changeset
|
133 |
val all_simps = map prover |
2031 | 134 |
["(ALL x. P x & Q) = ((ALL x.P x) & Q)", |
135 |
"(ALL x. P & Q x) = (P & (ALL x.Q x))", |
|
136 |
"(ALL x. P x | Q) = ((ALL x.P x) | Q)", |
|
137 |
"(ALL x. P | Q x) = (P | (ALL x.Q x))", |
|
138 |
"(ALL x. P x --> Q) = ((EX x.P x) --> Q)", |
|
139 |
"(ALL x. P --> Q x) = (P --> (ALL x.Q x))"]; |
|
1948
78e5bfcbc1e9
Added miniscoping to the simplifier: quantifiers are now pushed in
paulson
parents:
1922
diff
changeset
|
140 |
|
3568
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
141 |
(*** Simplification procedure for turning ? x. ... & x = t & ... |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
142 |
into ? x. x = t & ... & ... |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
143 |
where the latter can be rewritten via (? x. x = t & P(x)) = P(t) |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
144 |
***) |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
145 |
|
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
146 |
local |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
147 |
|
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
148 |
fun def(eq as (c as Const("op =",_)) $ s $ t) = |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
149 |
if s = Bound 0 andalso not(loose_bvar1(t,0)) then Some eq else |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
150 |
if t = Bound 0 andalso not(loose_bvar1(s,0)) then Some(c$t$s) |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
151 |
else None |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
152 |
| def _ = None; |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
153 |
|
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
154 |
fun extract(Const("op &",_) $ P $ Q) = |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
155 |
(case def P of |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
156 |
Some eq => Some(eq,Q) |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
157 |
| None => (case def Q of |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
158 |
Some eq => Some(eq,P) |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
159 |
| None => |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
160 |
(case extract P of |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
161 |
Some(eq,P') => Some(eq, HOLogic.conj $ P' $ Q) |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
162 |
| None => (case extract Q of |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
163 |
Some(eq,Q') => Some(eq,HOLogic.conj $ P $ Q') |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
164 |
| None => None)))) |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
165 |
| extract _ = None; |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
166 |
|
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
167 |
fun prove_eq(ceqt) = |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
168 |
let val tac = rtac eq_reflection 1 THEN rtac iffI 1 THEN |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
169 |
ALLGOALS(EVERY'[etac exE, REPEAT o (etac conjE), |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
170 |
rtac exI, REPEAT o (ares_tac [conjI] ORELSE' etac sym)]) |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
171 |
in rule_by_tactic tac (trivial ceqt) end; |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
172 |
|
3577
9715b6e3ec5f
added prems argument to simplification procedures;
wenzelm
parents:
3573
diff
changeset
|
173 |
fun rearrange sg _ (F as ex $ Abs(x,T,P)) = |
3568
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
174 |
(case extract P of |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
175 |
None => None |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
176 |
| Some(eq,Q) => |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
177 |
let val ceqt = cterm_of sg |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
178 |
(Logic.mk_equals(F,ex $ Abs(x,T,HOLogic.conj$eq$Q))) |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
179 |
in Some(prove_eq ceqt) end) |
3577
9715b6e3ec5f
added prems argument to simplification procedures;
wenzelm
parents:
3573
diff
changeset
|
180 |
| rearrange _ _ _ = None; |
3568
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
181 |
|
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
182 |
val pattern = read_cterm (sign_of HOL.thy) ("? x.P(x) & Q(x)",HOLogic.boolT) |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
183 |
|
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
184 |
in |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
185 |
val defEX_regroup = mk_simproc "defined EX" [pattern] rearrange; |
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
186 |
end; |
1722 | 187 |
|
923 | 188 |
|
2022 | 189 |
(* elimination of existential quantifiers in assumptions *) |
923 | 190 |
|
191 |
val ex_all_equiv = |
|
192 |
let val lemma1 = prove_goal HOL.thy |
|
193 |
"(? x. P(x) ==> PROP Q) ==> (!!x. P(x) ==> PROP Q)" |
|
194 |
(fn prems => [resolve_tac prems 1, etac exI 1]); |
|
195 |
val lemma2 = prove_goalw HOL.thy [Ex_def] |
|
196 |
"(!!x. P(x) ==> PROP Q) ==> (? x. P(x) ==> PROP Q)" |
|
197 |
(fn prems => [REPEAT(resolve_tac prems 1)]) |
|
198 |
in equal_intr lemma1 lemma2 end; |
|
199 |
||
200 |
end; |
|
201 |
||
2935 | 202 |
fun prove nm thm = qed_goal nm HOL.thy thm (fn _ => [blast_tac HOL_cs 1]); |
923 | 203 |
|
204 |
prove "conj_commute" "(P&Q) = (Q&P)"; |
|
205 |
prove "conj_left_commute" "(P&(Q&R)) = (Q&(P&R))"; |
|
206 |
val conj_comms = [conj_commute, conj_left_commute]; |
|
2134 | 207 |
prove "conj_assoc" "((P&Q)&R) = (P&(Q&R))"; |
923 | 208 |
|
1922 | 209 |
prove "disj_commute" "(P|Q) = (Q|P)"; |
210 |
prove "disj_left_commute" "(P|(Q|R)) = (Q|(P|R))"; |
|
211 |
val disj_comms = [disj_commute, disj_left_commute]; |
|
2134 | 212 |
prove "disj_assoc" "((P|Q)|R) = (P|(Q|R))"; |
1922 | 213 |
|
923 | 214 |
prove "conj_disj_distribL" "(P&(Q|R)) = (P&Q | P&R)"; |
215 |
prove "conj_disj_distribR" "((P|Q)&R) = (P&R | Q&R)"; |
|
1485
240cc98b94a7
Added qed_spec_mp to avoid renaming of bound vars in 'th RS spec'
nipkow
parents:
1465
diff
changeset
|
216 |
|
1892 | 217 |
prove "disj_conj_distribL" "(P|(Q&R)) = ((P|Q) & (P|R))"; |
218 |
prove "disj_conj_distribR" "((P&Q)|R) = ((P|R) & (Q|R))"; |
|
219 |
||
2134 | 220 |
prove "imp_conjR" "(P --> (Q&R)) = ((P-->Q) & (P-->R))"; |
221 |
prove "imp_conjL" "((P&Q) -->R) = (P --> (Q --> R))"; |
|
222 |
prove "imp_disjL" "((P|Q) --> R) = ((P-->R)&(Q-->R))"; |
|
1892 | 223 |
|
3448 | 224 |
(*These two are specialized, but imp_disj_not1 is useful in Auth/Yahalom.ML*) |
225 |
prove "imp_disj_not1" "((P --> Q | R)) = (~Q --> P --> R)"; |
|
226 |
prove "imp_disj_not2" "((P --> Q | R)) = (~R --> P --> Q)"; |
|
227 |
||
1485
240cc98b94a7
Added qed_spec_mp to avoid renaming of bound vars in 'th RS spec'
nipkow
parents:
1465
diff
changeset
|
228 |
prove "de_Morgan_disj" "(~(P | Q)) = (~P & ~Q)"; |
240cc98b94a7
Added qed_spec_mp to avoid renaming of bound vars in 'th RS spec'
nipkow
parents:
1465
diff
changeset
|
229 |
prove "de_Morgan_conj" "(~(P & Q)) = (~P | ~Q)"; |
3446
a14e5451f613
Addition of not_imp (which pushes negation into implication) as a default
paulson
parents:
3282
diff
changeset
|
230 |
prove "not_imp" "(~(P --> Q)) = (P & ~Q)"; |
1922 | 231 |
prove "not_iff" "(P~=Q) = (P = (~Q))"; |
1485
240cc98b94a7
Added qed_spec_mp to avoid renaming of bound vars in 'th RS spec'
nipkow
parents:
1465
diff
changeset
|
232 |
|
2134 | 233 |
(*Avoids duplication of subgoals after expand_if, when the true and false |
234 |
cases boil down to the same thing.*) |
|
235 |
prove "cases_simp" "((P --> Q) & (~P --> Q)) = Q"; |
|
236 |
||
1660 | 237 |
prove "not_all" "(~ (! x.P(x))) = (? x.~P(x))"; |
1922 | 238 |
prove "imp_all" "((! x. P x) --> Q) = (? x. P x --> Q)"; |
1660 | 239 |
prove "not_ex" "(~ (? x.P(x))) = (! x.~P(x))"; |
1922 | 240 |
prove "imp_ex" "((? x. P x) --> Q) = (! x. P x --> Q)"; |
1660 | 241 |
|
1655 | 242 |
prove "ex_disj_distrib" "(? x. P(x) | Q(x)) = ((? x. P(x)) | (? x. Q(x)))"; |
243 |
prove "all_conj_distrib" "(!x. P(x) & Q(x)) = ((! x. P(x)) & (! x. Q(x)))"; |
|
244 |
||
2134 | 245 |
(* '&' congruence rule: not included by default! |
246 |
May slow rewrite proofs down by as much as 50% *) |
|
247 |
||
248 |
let val th = prove_goal HOL.thy |
|
249 |
"(P=P')--> (P'--> (Q=Q'))--> ((P&Q) = (P'&Q'))" |
|
2935 | 250 |
(fn _=> [blast_tac HOL_cs 1]) |
2134 | 251 |
in bind_thm("conj_cong",standard (impI RSN (2, th RS mp RS mp))) end; |
252 |
||
253 |
let val th = prove_goal HOL.thy |
|
254 |
"(Q=Q')--> (Q'--> (P=P'))--> ((P&Q) = (P'&Q'))" |
|
2935 | 255 |
(fn _=> [blast_tac HOL_cs 1]) |
2134 | 256 |
in bind_thm("rev_conj_cong",standard (impI RSN (2, th RS mp RS mp))) end; |
257 |
||
258 |
(* '|' congruence rule: not included by default! *) |
|
259 |
||
260 |
let val th = prove_goal HOL.thy |
|
261 |
"(P=P')--> (~P'--> (Q=Q'))--> ((P|Q) = (P'|Q'))" |
|
2935 | 262 |
(fn _=> [blast_tac HOL_cs 1]) |
2134 | 263 |
in bind_thm("disj_cong",standard (impI RSN (2, th RS mp RS mp))) end; |
264 |
||
265 |
prove "eq_sym_conv" "(x=y) = (y=x)"; |
|
266 |
||
267 |
qed_goalw "o_apply" HOL.thy [o_def] "(f o g) x = f (g x)" |
|
268 |
(fn _ => [rtac refl 1]); |
|
269 |
||
270 |
qed_goal "meta_eq_to_obj_eq" HOL.thy "x==y ==> x=y" |
|
271 |
(fn [prem] => [rewtac prem, rtac refl 1]); |
|
272 |
||
273 |
qed_goalw "if_True" HOL.thy [if_def] "(if True then x else y) = x" |
|
2935 | 274 |
(fn _=>[blast_tac (HOL_cs addIs [select_equality]) 1]); |
2134 | 275 |
|
276 |
qed_goalw "if_False" HOL.thy [if_def] "(if False then x else y) = y" |
|
2935 | 277 |
(fn _=>[blast_tac (HOL_cs addIs [select_equality]) 1]); |
2134 | 278 |
|
279 |
qed_goal "if_P" HOL.thy "P ==> (if P then x else y) = x" |
|
280 |
(fn [prem] => [ stac (prem RS eqTrueI) 1, rtac if_True 1 ]); |
|
281 |
(* |
|
282 |
qed_goal "if_not_P" HOL.thy "~P ==> (if P then x else y) = y" |
|
283 |
(fn [prem] => [ stac (prem RS not_P_imp_P_iff_F) 1, rtac if_False 1 ]); |
|
284 |
*) |
|
285 |
qed_goalw "if_not_P" HOL.thy [if_def] "!!P. ~P ==> (if P then x else y) = y" |
|
2935 | 286 |
(fn _ => [blast_tac (HOL_cs addIs [select_equality]) 1]); |
2134 | 287 |
|
288 |
qed_goal "expand_if" HOL.thy |
|
289 |
"P(if Q then x else y) = ((Q --> P(x)) & (~Q --> P(y)))" |
|
290 |
(fn _=> [ (res_inst_tac [("Q","Q")] (excluded_middle RS disjE) 1), |
|
291 |
stac if_P 2, |
|
292 |
stac if_not_P 1, |
|
2935 | 293 |
REPEAT(blast_tac HOL_cs 1) ]); |
2134 | 294 |
|
295 |
qed_goal "if_bool_eq" HOL.thy |
|
296 |
"(if P then Q else R) = ((P-->Q) & (~P-->R))" |
|
297 |
(fn _ => [rtac expand_if 1]); |
|
298 |
||
2263 | 299 |
local val mktac = mk_case_split_tac (meta_eq_to_obj_eq RS iffD2) |
300 |
in |
|
301 |
fun split_tac splits = mktac (map mk_meta_eq splits) |
|
302 |
end; |
|
303 |
||
304 |
local val mktac = mk_case_split_inside_tac (meta_eq_to_obj_eq RS iffD2) |
|
305 |
in |
|
306 |
fun split_inside_tac splits = mktac (map mk_meta_eq splits) |
|
307 |
end; |
|
308 |
||
309 |
||
2251 | 310 |
qed_goal "if_cancel" HOL.thy "(if c then x else x) = x" |
2935 | 311 |
(fn _ => [split_tac [expand_if] 1, blast_tac HOL_cs 1]); |
2251 | 312 |
|
2134 | 313 |
(** 'if' congruence rules: neither included by default! *) |
314 |
||
315 |
(*Simplifies x assuming c and y assuming ~c*) |
|
316 |
qed_goal "if_cong" HOL.thy |
|
317 |
"[| b=c; c ==> x=u; ~c ==> y=v |] ==>\ |
|
318 |
\ (if b then x else y) = (if c then u else v)" |
|
319 |
(fn rew::prems => |
|
320 |
[stac rew 1, stac expand_if 1, stac expand_if 1, |
|
2935 | 321 |
blast_tac (HOL_cs addDs prems) 1]); |
2134 | 322 |
|
323 |
(*Prevents simplification of x and y: much faster*) |
|
324 |
qed_goal "if_weak_cong" HOL.thy |
|
325 |
"b=c ==> (if b then x else y) = (if c then x else y)" |
|
326 |
(fn [prem] => [rtac (prem RS arg_cong) 1]); |
|
327 |
||
328 |
(*Prevents simplification of t: much faster*) |
|
329 |
qed_goal "let_weak_cong" HOL.thy |
|
330 |
"a = b ==> (let x=a in t(x)) = (let x=b in t(x))" |
|
331 |
(fn [prem] => [rtac (prem RS arg_cong) 1]); |
|
332 |
||
333 |
(*In general it seems wrong to add distributive laws by default: they |
|
334 |
might cause exponential blow-up. But imp_disjL has been in for a while |
|
335 |
and cannot be removed without affecting existing proofs. Moreover, |
|
336 |
rewriting by "(P|Q --> R) = ((P-->R)&(Q-->R))" might be justified on the |
|
337 |
grounds that it allows simplification of R in the two cases.*) |
|
338 |
||
339 |
val mksimps_pairs = |
|
340 |
[("op -->", [mp]), ("op &", [conjunct1,conjunct2]), |
|
341 |
("All", [spec]), ("True", []), ("False", []), |
|
342 |
("If", [if_bool_eq RS iffD1])]; |
|
1758 | 343 |
|
2636
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
344 |
fun unsafe_solver prems = FIRST'[resolve_tac (TrueI::refl::prems), |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
345 |
atac, etac FalseE]; |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
346 |
(*No premature instantiation of variables during simplification*) |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
347 |
fun safe_solver prems = FIRST'[match_tac (TrueI::refl::prems), |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
348 |
eq_assume_tac, ematch_tac [FalseE]]; |
2443
a81d4c219c3c
factored out HOL_base_ss and val HOL_min_ss, added HOL_safe_min_ss
oheimb
parents:
2263
diff
changeset
|
349 |
|
2636
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
350 |
val HOL_basic_ss = empty_ss setsubgoaler asm_simp_tac |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
351 |
setSSolver safe_solver |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
352 |
setSolver unsafe_solver |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
353 |
setmksimps (mksimps mksimps_pairs); |
2443
a81d4c219c3c
factored out HOL_base_ss and val HOL_min_ss, added HOL_safe_min_ss
oheimb
parents:
2263
diff
changeset
|
354 |
|
3446
a14e5451f613
Addition of not_imp (which pushes negation into implication) as a default
paulson
parents:
3282
diff
changeset
|
355 |
val HOL_ss = |
a14e5451f613
Addition of not_imp (which pushes negation into implication) as a default
paulson
parents:
3282
diff
changeset
|
356 |
HOL_basic_ss addsimps |
a14e5451f613
Addition of not_imp (which pushes negation into implication) as a default
paulson
parents:
3282
diff
changeset
|
357 |
([triv_forall_equality, (* prunes params *) |
a14e5451f613
Addition of not_imp (which pushes negation into implication) as a default
paulson
parents:
3282
diff
changeset
|
358 |
if_True, if_False, if_cancel, |
a14e5451f613
Addition of not_imp (which pushes negation into implication) as a default
paulson
parents:
3282
diff
changeset
|
359 |
o_apply, imp_disjL, conj_assoc, disj_assoc, |
a14e5451f613
Addition of not_imp (which pushes negation into implication) as a default
paulson
parents:
3282
diff
changeset
|
360 |
de_Morgan_conj, de_Morgan_disj, not_imp, |
a14e5451f613
Addition of not_imp (which pushes negation into implication) as a default
paulson
parents:
3282
diff
changeset
|
361 |
not_all, not_ex, cases_simp] |
a14e5451f613
Addition of not_imp (which pushes negation into implication) as a default
paulson
parents:
3282
diff
changeset
|
362 |
@ ex_simps @ all_simps @ simp_thms) |
3568
36ff1ab12021
Prod.ML: Added split_paired_EX and lots of comments about failed attempts to
nipkow
parents:
3559
diff
changeset
|
363 |
addsimprocs [defEX_regroup] |
3446
a14e5451f613
Addition of not_imp (which pushes negation into implication) as a default
paulson
parents:
3282
diff
changeset
|
364 |
addcongs [imp_cong]; |
2082 | 365 |
|
1655 | 366 |
qed_goal "if_distrib" HOL.thy |
367 |
"f(if c then x else y) = (if c then f x else f y)" |
|
368 |
(fn _ => [simp_tac (HOL_ss setloop (split_tac [expand_if])) 1]); |
|
369 |
||
2097 | 370 |
qed_goalw "o_assoc" HOL.thy [o_def] "f o (g o h) = f o g o h" |
2098
2bfc0675c92f
corrected `correction` of o_assoc (of version 1.14),
oheimb
parents:
2097
diff
changeset
|
371 |
(fn _ => [rtac ext 1, rtac refl 1]); |
1984 | 372 |
|
373 |
||
2948
f18035b1d531
Moved expand_case_tac from Auth/Message.ML to simpdata.ML
paulson
parents:
2935
diff
changeset
|
374 |
val prems = goal HOL.thy "[| P ==> Q(True); ~P ==> Q(False) |] ==> Q(P)"; |
f18035b1d531
Moved expand_case_tac from Auth/Message.ML to simpdata.ML
paulson
parents:
2935
diff
changeset
|
375 |
by (case_tac "P" 1); |
f18035b1d531
Moved expand_case_tac from Auth/Message.ML to simpdata.ML
paulson
parents:
2935
diff
changeset
|
376 |
by (ALLGOALS (asm_simp_tac (HOL_ss addsimps prems))); |
f18035b1d531
Moved expand_case_tac from Auth/Message.ML to simpdata.ML
paulson
parents:
2935
diff
changeset
|
377 |
val expand_case = result(); |
f18035b1d531
Moved expand_case_tac from Auth/Message.ML to simpdata.ML
paulson
parents:
2935
diff
changeset
|
378 |
|
f18035b1d531
Moved expand_case_tac from Auth/Message.ML to simpdata.ML
paulson
parents:
2935
diff
changeset
|
379 |
fun expand_case_tac P i = |
f18035b1d531
Moved expand_case_tac from Auth/Message.ML to simpdata.ML
paulson
parents:
2935
diff
changeset
|
380 |
res_inst_tac [("P",P)] expand_case i THEN |
f18035b1d531
Moved expand_case_tac from Auth/Message.ML to simpdata.ML
paulson
parents:
2935
diff
changeset
|
381 |
Simp_tac (i+1) THEN |
f18035b1d531
Moved expand_case_tac from Auth/Message.ML to simpdata.ML
paulson
parents:
2935
diff
changeset
|
382 |
Simp_tac i; |
f18035b1d531
Moved expand_case_tac from Auth/Message.ML to simpdata.ML
paulson
parents:
2935
diff
changeset
|
383 |
|
f18035b1d531
Moved expand_case_tac from Auth/Message.ML to simpdata.ML
paulson
parents:
2935
diff
changeset
|
384 |
|
1984 | 385 |
|
386 |
||
387 |
(*** Install simpsets and datatypes in theory structure ***) |
|
388 |
||
2251 | 389 |
simpset := HOL_ss; |
1984 | 390 |
|
391 |
exception SS_DATA of simpset; |
|
392 |
||
393 |
let fun merge [] = SS_DATA empty_ss |
|
394 |
| merge ss = let val ss = map (fn SS_DATA x => x) ss; |
|
395 |
in SS_DATA (foldl merge_ss (hd ss, tl ss)) end; |
|
396 |
||
397 |
fun put (SS_DATA ss) = simpset := ss; |
|
398 |
||
399 |
fun get () = SS_DATA (!simpset); |
|
400 |
in add_thydata "HOL" |
|
401 |
("simpset", ThyMethods {merge = merge, put = put, get = get}) |
|
402 |
end; |
|
403 |
||
3615
e5322197cfea
Moved some functions which used to be part of thy_data.ML
berghofe
parents:
3577
diff
changeset
|
404 |
fun simpset_of tname = |
e5322197cfea
Moved some functions which used to be part of thy_data.ML
berghofe
parents:
3577
diff
changeset
|
405 |
case get_thydata tname "simpset" of |
e5322197cfea
Moved some functions which used to be part of thy_data.ML
berghofe
parents:
3577
diff
changeset
|
406 |
None => empty_ss |
e5322197cfea
Moved some functions which used to be part of thy_data.ML
berghofe
parents:
3577
diff
changeset
|
407 |
| Some (SS_DATA ss) => ss; |
e5322197cfea
Moved some functions which used to be part of thy_data.ML
berghofe
parents:
3577
diff
changeset
|
408 |
|
3040
7d48671753da
Introduced a generic "induct_tac" which picks up the right induction scheme
nipkow
parents:
2948
diff
changeset
|
409 |
type dtype_info = {case_const:term, |
7d48671753da
Introduced a generic "induct_tac" which picks up the right induction scheme
nipkow
parents:
2948
diff
changeset
|
410 |
case_rewrites:thm list, |
7d48671753da
Introduced a generic "induct_tac" which picks up the right induction scheme
nipkow
parents:
2948
diff
changeset
|
411 |
constructors:term list, |
7d48671753da
Introduced a generic "induct_tac" which picks up the right induction scheme
nipkow
parents:
2948
diff
changeset
|
412 |
induct_tac: string -> int -> tactic, |
3282
c31e6239d4c9
Added exhaustion thm and exhaust_tac for each datatype.
nipkow
parents:
3206
diff
changeset
|
413 |
nchotomy: thm, |
c31e6239d4c9
Added exhaustion thm and exhaust_tac for each datatype.
nipkow
parents:
3206
diff
changeset
|
414 |
exhaustion: thm, |
c31e6239d4c9
Added exhaustion thm and exhaust_tac for each datatype.
nipkow
parents:
3206
diff
changeset
|
415 |
exhaust_tac: string -> int -> tactic, |
3040
7d48671753da
Introduced a generic "induct_tac" which picks up the right induction scheme
nipkow
parents:
2948
diff
changeset
|
416 |
case_cong:thm}; |
1984 | 417 |
|
418 |
exception DT_DATA of (string * dtype_info) list; |
|
419 |
val datatypes = ref [] : (string * dtype_info) list ref; |
|
420 |
||
421 |
let fun merge [] = DT_DATA [] |
|
422 |
| merge ds = |
|
423 |
let val ds = map (fn DT_DATA x => x) ds; |
|
424 |
in DT_DATA (foldl (gen_union eq_fst) (hd ds, tl ds)) end; |
|
425 |
||
426 |
fun put (DT_DATA ds) = datatypes := ds; |
|
427 |
||
428 |
fun get () = DT_DATA (!datatypes); |
|
429 |
in add_thydata "HOL" |
|
430 |
("datatypes", ThyMethods {merge = merge, put = put, get = get}) |
|
431 |
end; |
|
432 |
||
433 |
||
2636
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
434 |
|
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
435 |
(*** Integration of simplifier with classical reasoner ***) |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
436 |
|
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
437 |
(* rot_eq_tac rotates the first equality premise of subgoal i to the front, |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
438 |
fails if there is no equaliy or if an equality is already at the front *) |
3538 | 439 |
local |
440 |
fun is_eq (Const ("Trueprop", _) $ (Const("op =" ,_) $ _ $ _)) = true |
|
441 |
| is_eq _ = false; |
|
442 |
fun find_eq n [] = None |
|
443 |
| find_eq n (t :: ts) = if (is_eq t) then Some n |
|
444 |
else find_eq (n + 1) ts; |
|
445 |
in |
|
446 |
val rot_eq_tac = |
|
447 |
SUBGOAL (fn (Bi,i) => |
|
448 |
case find_eq 0 (Logic.strip_assums_hyp Bi) of |
|
2805 | 449 |
None => no_tac |
450 |
| Some 0 => no_tac |
|
3538 | 451 |
| Some n => rotate_tac n i) |
452 |
end; |
|
2636
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
453 |
|
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
454 |
(*an unsatisfactory fix for the incomplete asm_full_simp_tac! |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
455 |
better: asm_really_full_simp_tac, a yet to be implemented version of |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
456 |
asm_full_simp_tac that applies all equalities in the |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
457 |
premises to all the premises *) |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
458 |
fun safe_asm_more_full_simp_tac ss = TRY o rot_eq_tac THEN' |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
459 |
safe_asm_full_simp_tac ss; |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
460 |
|
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
461 |
(*Add a simpset to a classical set!*) |
3206
a3de7f32728c
renamed addss to addSss, unsafe_addss to addss, extended auto_tac
oheimb
parents:
3040
diff
changeset
|
462 |
infix 4 addSss addss; |
a3de7f32728c
renamed addss to addSss, unsafe_addss to addss, extended auto_tac
oheimb
parents:
3040
diff
changeset
|
463 |
fun cs addSss ss = cs addSaltern (CHANGED o (safe_asm_more_full_simp_tac ss)); |
a3de7f32728c
renamed addss to addSss, unsafe_addss to addss, extended auto_tac
oheimb
parents:
3040
diff
changeset
|
464 |
fun cs addss ss = cs addbefore asm_full_simp_tac ss; |
2636
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
465 |
|
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
466 |
fun Addss ss = (claset := !claset addss ss); |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
467 |
|
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
468 |
(*Designed to be idempotent, except if best_tac instantiates variables |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
469 |
in some of the subgoals*) |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
470 |
|
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
471 |
type clasimpset = (claset * simpset); |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
472 |
|
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
473 |
val HOL_css = (HOL_cs, HOL_ss); |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
474 |
|
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
475 |
fun pair_upd1 f ((a,b),x) = (f(a,x), b); |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
476 |
fun pair_upd2 f ((a,b),x) = (a, f(b,x)); |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
477 |
|
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
478 |
infix 4 addSIs2 addSEs2 addSDs2 addIs2 addEs2 addDs2 |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
479 |
addsimps2 delsimps2 addcongs2 delcongs2; |
2748
3ae9ccdd701e
Eta-expanded some declarations for compatibility with value polymorphism
paulson
parents:
2718
diff
changeset
|
480 |
fun op addSIs2 arg = pair_upd1 (op addSIs) arg; |
3ae9ccdd701e
Eta-expanded some declarations for compatibility with value polymorphism
paulson
parents:
2718
diff
changeset
|
481 |
fun op addSEs2 arg = pair_upd1 (op addSEs) arg; |
3ae9ccdd701e
Eta-expanded some declarations for compatibility with value polymorphism
paulson
parents:
2718
diff
changeset
|
482 |
fun op addSDs2 arg = pair_upd1 (op addSDs) arg; |
3ae9ccdd701e
Eta-expanded some declarations for compatibility with value polymorphism
paulson
parents:
2718
diff
changeset
|
483 |
fun op addIs2 arg = pair_upd1 (op addIs ) arg; |
3ae9ccdd701e
Eta-expanded some declarations for compatibility with value polymorphism
paulson
parents:
2718
diff
changeset
|
484 |
fun op addEs2 arg = pair_upd1 (op addEs ) arg; |
3ae9ccdd701e
Eta-expanded some declarations for compatibility with value polymorphism
paulson
parents:
2718
diff
changeset
|
485 |
fun op addDs2 arg = pair_upd1 (op addDs ) arg; |
3ae9ccdd701e
Eta-expanded some declarations for compatibility with value polymorphism
paulson
parents:
2718
diff
changeset
|
486 |
fun op addsimps2 arg = pair_upd2 (op addsimps) arg; |
3ae9ccdd701e
Eta-expanded some declarations for compatibility with value polymorphism
paulson
parents:
2718
diff
changeset
|
487 |
fun op delsimps2 arg = pair_upd2 (op delsimps) arg; |
3ae9ccdd701e
Eta-expanded some declarations for compatibility with value polymorphism
paulson
parents:
2718
diff
changeset
|
488 |
fun op addcongs2 arg = pair_upd2 (op addcongs) arg; |
3ae9ccdd701e
Eta-expanded some declarations for compatibility with value polymorphism
paulson
parents:
2718
diff
changeset
|
489 |
fun op delcongs2 arg = pair_upd2 (op delcongs) arg; |
2636
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
490 |
|
2805 | 491 |
fun auto_tac (cs,ss) = |
492 |
let val cs' = cs addss ss |
|
493 |
in EVERY [TRY (safe_tac cs'), |
|
494 |
REPEAT (FIRSTGOAL (fast_tac cs')), |
|
3206
a3de7f32728c
renamed addss to addSss, unsafe_addss to addss, extended auto_tac
oheimb
parents:
3040
diff
changeset
|
495 |
TRY (safe_tac (cs addSss ss)), |
2805 | 496 |
prune_params_tac] |
497 |
end; |
|
2636
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
498 |
|
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
499 |
fun Auto_tac () = auto_tac (!claset, !simpset); |
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
500 |
|
4b30dbe4a020
added delcongs, Delcongs, unsafe_solver, safe_solver, HOL_basic_ss,
oheimb
parents:
2595
diff
changeset
|
501 |
fun auto () = by (Auto_tac ()); |