author | wenzelm |
Tue, 13 Aug 2024 15:50:25 +0200 | |
changeset 80698 | 2d2f476ab56e |
parent 80697 | 48eaf5c85d6e |
child 80699 | 34db40261287 |
permissions | -rw-r--r-- |
41228
e1fce873b814
renamed structure MetaSimplifier to raw_Simplifer, to emphasize its meaning;
wenzelm
parents:
41227
diff
changeset
|
1 |
(* Title: Pure/raw_simplifier.ML |
29269
5c25a2012975
moved term order operations to structure TermOrd (cf. Pure/term_ord.ML);
wenzelm
parents:
28839
diff
changeset
|
2 |
Author: Tobias Nipkow and Stefan Berghofer, TU Muenchen |
10413 | 3 |
|
41228
e1fce873b814
renamed structure MetaSimplifier to raw_Simplifer, to emphasize its meaning;
wenzelm
parents:
41227
diff
changeset
|
4 |
Higher-order Simplification. |
10413 | 5 |
*) |
6 |
||
15006
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
7 |
infix 4 |
45620
f2a587696afb
modernized some old-style infix operations, which were left over from the time of ML proof scripts;
wenzelm
parents:
45405
diff
changeset
|
8 |
addsimps delsimps addsimprocs delsimprocs |
52037 | 9 |
setloop addloop delloop |
45625
750c5a47400b
modernized some old-style infix operations, which were left over from the time of ML proof scripts;
wenzelm
parents:
45621
diff
changeset
|
10 |
setSSolver addSSolver setSolver addSolver; |
15006
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
11 |
|
41228
e1fce873b814
renamed structure MetaSimplifier to raw_Simplifer, to emphasize its meaning;
wenzelm
parents:
41227
diff
changeset
|
12 |
signature BASIC_RAW_SIMPLIFIER = |
11672 | 13 |
sig |
41227 | 14 |
val simp_depth_limit: int Config.T |
15 |
val simp_trace_depth_limit: int Config.T |
|
40878
7695e4de4d86
renamed trace_simp to simp_trace, and debug_simp to simp_debug;
wenzelm
parents:
39163
diff
changeset
|
16 |
val simp_debug: bool Config.T |
7695e4de4d86
renamed trace_simp to simp_trace, and debug_simp to simp_debug;
wenzelm
parents:
39163
diff
changeset
|
17 |
val simp_trace: bool Config.T |
51590 | 18 |
type cong_name = bool * string |
15023 | 19 |
type rrule |
55316
885500f4aa6a
interactive simplifier trace: new panel in Isabelle/jEdit to inspect and modify simplification state
Lars Hupel <lars.hupel@mytum.de>
parents:
55032
diff
changeset
|
20 |
val mk_rrules: Proof.context -> thm list -> rrule list |
16807 | 21 |
val eq_rrule: rrule * rrule -> bool |
78800 | 22 |
type proc = Proof.context -> cterm -> thm option |
17614 | 23 |
type solver |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
24 |
val mk_solver: string -> (Proof.context -> int -> tactic) -> solver |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
25 |
type simpset |
15023 | 26 |
val empty_ss: simpset |
27 |
val merge_ss: simpset * simpset -> simpset |
|
30356 | 28 |
val dest_ss: simpset -> |
80306 | 29 |
{simps: (Thm_Name.T * thm) list, |
61098 | 30 |
procs: (string * term list) list, |
51590 | 31 |
congs: (cong_name * thm) list, |
32 |
weak_congs: cong_name list, |
|
30356 | 33 |
loopers: string list, |
34 |
unsafe_solvers: string list, |
|
35 |
safe_solvers: string list} |
|
78453
3fdf3c5cfa9d
performance tuning: prefer static simpset within functional closure of morphism (with notable impact on specifications "in" class, e.g. AFP/No_FTL_observers);
wenzelm
parents:
78136
diff
changeset
|
36 |
val dest_simps: simpset -> thm list |
15023 | 37 |
type simproc |
78812
d769a183d51d
simprocs may be distinguished via 'identifier': only works for ML antiquotation (see also 13252110a6fe);
wenzelm
parents:
78800
diff
changeset
|
38 |
val cert_simproc: theory -> |
d769a183d51d
simprocs may be distinguished via 'identifier': only works for ML antiquotation (see also 13252110a6fe);
wenzelm
parents:
78800
diff
changeset
|
39 |
{name: string, lhss: term list, proc: proc Morphism.entity, identifier: thm list} -> simproc |
45290 | 40 |
val transform_simproc: morphism -> simproc -> simproc |
78114 | 41 |
val trim_context_simproc: simproc -> simproc |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
42 |
val simpset_of: Proof.context -> simpset |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
43 |
val put_simpset: simpset -> Proof.context -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
44 |
val simpset_map: Proof.context -> (Proof.context -> Proof.context) -> simpset -> simpset |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
45 |
val map_theory_simpset: (Proof.context -> Proof.context) -> theory -> theory |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
46 |
val empty_simpset: Proof.context -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
47 |
val clear_simpset: Proof.context -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
48 |
val addsimps: Proof.context * thm list -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
49 |
val delsimps: Proof.context * thm list -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
50 |
val addsimprocs: Proof.context * simproc list -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
51 |
val delsimprocs: Proof.context * simproc list -> Proof.context |
52037 | 52 |
val setloop: Proof.context * (Proof.context -> int -> tactic) -> Proof.context |
53 |
val addloop: Proof.context * (string * (Proof.context -> int -> tactic)) -> Proof.context |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
54 |
val delloop: Proof.context * string -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
55 |
val setSSolver: Proof.context * solver -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
56 |
val addSSolver: Proof.context * solver -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
57 |
val setSolver: Proof.context * solver -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
58 |
val addSolver: Proof.context * solver -> Proof.context |
21708 | 59 |
|
54742
7a86358a3c0b
proper context for basic Simplifier operations: rewrite_rule, rewrite_goals_rule, rewrite_goals_tac etc.;
wenzelm
parents:
54731
diff
changeset
|
60 |
val rewrite_rule: Proof.context -> thm list -> thm -> thm |
7a86358a3c0b
proper context for basic Simplifier operations: rewrite_rule, rewrite_goals_rule, rewrite_goals_tac etc.;
wenzelm
parents:
54731
diff
changeset
|
61 |
val rewrite_goals_rule: Proof.context -> thm list -> thm -> thm |
7a86358a3c0b
proper context for basic Simplifier operations: rewrite_rule, rewrite_goals_rule, rewrite_goals_tac etc.;
wenzelm
parents:
54731
diff
changeset
|
62 |
val rewrite_goals_tac: Proof.context -> thm list -> tactic |
7a86358a3c0b
proper context for basic Simplifier operations: rewrite_rule, rewrite_goals_rule, rewrite_goals_tac etc.;
wenzelm
parents:
54731
diff
changeset
|
63 |
val rewrite_goal_tac: Proof.context -> thm list -> int -> tactic |
7a86358a3c0b
proper context for basic Simplifier operations: rewrite_rule, rewrite_goals_rule, rewrite_goals_tac etc.;
wenzelm
parents:
54731
diff
changeset
|
64 |
val prune_params_tac: Proof.context -> tactic |
7a86358a3c0b
proper context for basic Simplifier operations: rewrite_rule, rewrite_goals_rule, rewrite_goals_tac etc.;
wenzelm
parents:
54731
diff
changeset
|
65 |
val fold_rule: Proof.context -> thm list -> thm -> thm |
7a86358a3c0b
proper context for basic Simplifier operations: rewrite_rule, rewrite_goals_rule, rewrite_goals_tac etc.;
wenzelm
parents:
54731
diff
changeset
|
66 |
val fold_goals_tac: Proof.context -> thm list -> tactic |
54883
dd04a8b654fc
proper context for norm_hhf and derived operations;
wenzelm
parents:
54742
diff
changeset
|
67 |
val norm_hhf: Proof.context -> thm -> thm |
dd04a8b654fc
proper context for norm_hhf and derived operations;
wenzelm
parents:
54742
diff
changeset
|
68 |
val norm_hhf_protect: Proof.context -> thm -> thm |
15006
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
69 |
end; |
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
70 |
|
41228
e1fce873b814
renamed structure MetaSimplifier to raw_Simplifer, to emphasize its meaning;
wenzelm
parents:
41227
diff
changeset
|
71 |
signature RAW_SIMPLIFIER = |
10413 | 72 |
sig |
41228
e1fce873b814
renamed structure MetaSimplifier to raw_Simplifer, to emphasize its meaning;
wenzelm
parents:
41227
diff
changeset
|
73 |
include BASIC_RAW_SIMPLIFIER |
54997 | 74 |
exception SIMPLIFIER of string * thm list |
54729
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
75 |
type trace_ops |
54731
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
76 |
val set_trace_ops: trace_ops -> theory -> theory |
71235 | 77 |
val subgoal_tac: Proof.context -> int -> tactic |
78 |
val loop_tac: Proof.context -> int -> tactic |
|
79 |
val solvers: Proof.context -> solver list * solver list |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
80 |
val map_ss: (Proof.context -> Proof.context) -> Context.generic -> Context.generic |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
81 |
val prems_of: Proof.context -> thm list |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
82 |
val add_simp: thm -> Proof.context -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
83 |
val del_simp: thm -> Proof.context -> Proof.context |
68403 | 84 |
val flip_simp: thm -> Proof.context -> Proof.context |
63221
7d43fbbaba28
avoid warnings on duplicate rules in the given list;
wenzelm
parents:
62913
diff
changeset
|
85 |
val init_simpset: thm list -> Proof.context -> Proof.context |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
86 |
val add_eqcong: thm -> Proof.context -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
87 |
val del_eqcong: thm -> Proof.context -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
88 |
val add_cong: thm -> Proof.context -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
89 |
val del_cong: thm -> Proof.context -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
90 |
val mksimps: Proof.context -> thm -> thm list |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
91 |
val set_mksimps: (Proof.context -> thm -> thm list) -> Proof.context -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
92 |
val set_mkcong: (Proof.context -> thm -> thm) -> Proof.context -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
93 |
val set_mksym: (Proof.context -> thm -> thm option) -> Proof.context -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
94 |
val set_mkeqTrue: (Proof.context -> thm -> thm option) -> Proof.context -> Proof.context |
70586 | 95 |
val set_term_ord: term ord -> Proof.context -> Proof.context |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
96 |
val set_subgoaler: (Proof.context -> int -> tactic) -> Proof.context -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
97 |
val solver: Proof.context -> solver -> int -> tactic |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
98 |
val default_mk_sym: Proof.context -> thm -> thm option |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
99 |
val add_prems: thm list -> Proof.context -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
100 |
val set_reorient: (Proof.context -> term list -> term -> term -> bool) -> |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
101 |
Proof.context -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
102 |
val set_solvers: solver list -> Proof.context -> Proof.context |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
103 |
val rewrite_cterm: bool * bool * bool -> |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
104 |
(Proof.context -> thm -> thm option) -> Proof.context -> conv |
16458 | 105 |
val rewrite_term: theory -> thm list -> (term -> term option) list -> term -> term |
15023 | 106 |
val rewrite_thm: bool * bool * bool -> |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
107 |
(Proof.context -> thm -> thm option) -> Proof.context -> thm -> thm |
46465 | 108 |
val generic_rewrite_goal_tac: bool * bool * bool -> |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
109 |
(Proof.context -> tactic) -> Proof.context -> int -> tactic |
78453
3fdf3c5cfa9d
performance tuning: prefer static simpset within functional closure of morphism (with notable impact on specifications "in" class, e.g. AFP/No_FTL_observers);
wenzelm
parents:
78136
diff
changeset
|
110 |
val rewrite0: Proof.context -> bool -> conv |
54742
7a86358a3c0b
proper context for basic Simplifier operations: rewrite_rule, rewrite_goals_rule, rewrite_goals_tac etc.;
wenzelm
parents:
54731
diff
changeset
|
111 |
val rewrite: Proof.context -> bool -> thm list -> conv |
78453
3fdf3c5cfa9d
performance tuning: prefer static simpset within functional closure of morphism (with notable impact on specifications "in" class, e.g. AFP/No_FTL_observers);
wenzelm
parents:
78136
diff
changeset
|
112 |
val rewrite0_rule: Proof.context -> thm -> thm |
10413 | 113 |
end; |
114 |
||
41228
e1fce873b814
renamed structure MetaSimplifier to raw_Simplifer, to emphasize its meaning;
wenzelm
parents:
41227
diff
changeset
|
115 |
structure Raw_Simplifier: RAW_SIMPLIFIER = |
10413 | 116 |
struct |
117 |
||
15023 | 118 |
(** datatype simpset **) |
119 |
||
51590 | 120 |
(* congruence rules *) |
121 |
||
122 |
type cong_name = bool * string; |
|
123 |
||
124 |
fun cong_name (Const (a, _)) = SOME (true, a) |
|
125 |
| cong_name (Free (a, _)) = SOME (false, a) |
|
126 |
| cong_name _ = NONE; |
|
127 |
||
71239 | 128 |
structure Congtab = Table(type key = cong_name val ord = prod_ord bool_ord fast_string_ord); |
129 |
||
51590 | 130 |
|
15023 | 131 |
(* rewrite rules *) |
10413 | 132 |
|
20546
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
133 |
type rrule = |
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
134 |
{thm: thm, (*the rewrite rule*) |
80306 | 135 |
name: Thm_Name.T, (*name of theorem from which rewrite rule was extracted*) |
20546
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
136 |
lhs: term, (*the left-hand side*) |
58836 | 137 |
elhs: cterm, (*the eta-contracted lhs*) |
20546
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
138 |
extra: bool, (*extra variables outside of elhs*) |
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
139 |
fo: bool, (*use first-order matching*) |
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
140 |
perm: bool}; (*the rewrite rule is permutative*) |
15023 | 141 |
|
61057 | 142 |
fun trim_context_rrule ({thm, name, lhs, elhs, extra, fo, perm}: rrule) = |
143 |
{thm = Thm.trim_context thm, name = name, lhs = lhs, elhs = Thm.trim_context_cterm elhs, |
|
144 |
extra = extra, fo = fo, perm = perm}; |
|
145 |
||
20546
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
146 |
(* |
12603 | 147 |
Remarks: |
10413 | 148 |
- elhs is used for matching, |
15023 | 149 |
lhs only for preservation of bound variable names; |
10413 | 150 |
- fo is set iff |
151 |
either elhs is first-order (no Var is applied), |
|
15023 | 152 |
in which case fo-matching is complete, |
10413 | 153 |
or elhs is not a pattern, |
20546
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
154 |
in which case there is nothing better to do; |
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
155 |
*) |
10413 | 156 |
|
157 |
fun eq_rrule ({thm = thm1, ...}: rrule, {thm = thm2, ...}: rrule) = |
|
22360
26ead7ed4f4b
moved eq_thm etc. to structure Thm in Pure/more_thm.ML;
wenzelm
parents:
22254
diff
changeset
|
158 |
Thm.eq_thm_prop (thm1, thm2); |
15023 | 159 |
|
20546
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
160 |
(* FIXME: it seems that the conditions on extra variables are too liberal if |
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
161 |
prems are nonempty: does solving the prems really guarantee instantiation of |
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
162 |
all its Vars? Better: a dynamic check each time a rule is applied. |
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
163 |
*) |
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
164 |
fun rewrite_rule_extra_vars prems elhs erhs = |
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
165 |
let |
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
166 |
val elhss = elhs :: prems; |
74266 | 167 |
val tvars = TVars.build (fold TVars.add_tvars elhss); |
168 |
val vars = Vars.build (fold Vars.add_vars elhss); |
|
20546
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
169 |
in |
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
170 |
erhs |> Term.exists_type (Term.exists_subtype |
74266 | 171 |
(fn TVar v => not (TVars.defined tvars v) | _ => false)) orelse |
20546
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
172 |
erhs |> Term.exists_subterm |
74266 | 173 |
(fn Var v => not (Vars.defined vars v) | _ => false) |
20546
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
174 |
end; |
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
175 |
|
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
176 |
fun rrule_extra_vars elhs thm = |
59582 | 177 |
rewrite_rule_extra_vars [] (Thm.term_of elhs) (Thm.full_prop_of thm); |
20546
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
178 |
|
15023 | 179 |
fun mk_rrule2 {thm, name, lhs, elhs, perm} = |
180 |
let |
|
59582 | 181 |
val t = Thm.term_of elhs; |
20546
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
182 |
val fo = Pattern.first_order t orelse not (Pattern.pattern t); |
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
183 |
val extra = rrule_extra_vars elhs thm; |
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
184 |
in {thm = thm, name = name, lhs = lhs, elhs = elhs, extra = extra, fo = fo, perm = perm} end; |
10413 | 185 |
|
15023 | 186 |
(*simple test for looping rewrite rules and stupid orientations*) |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
187 |
fun default_reorient ctxt prems lhs rhs = |
15023 | 188 |
rewrite_rule_extra_vars prems lhs rhs |
189 |
orelse |
|
190 |
is_Var (head_of lhs) |
|
191 |
orelse |
|
16305 | 192 |
(* turns t = x around, which causes a headache if x is a local variable - |
193 |
usually it is very useful :-( |
|
194 |
is_Free rhs andalso not(is_Free lhs) andalso not(Logic.occs(rhs,lhs)) |
|
195 |
andalso not(exists_subterm is_Var lhs) |
|
196 |
orelse |
|
197 |
*) |
|
16842 | 198 |
exists (fn t => Logic.occs (lhs, t)) (rhs :: prems) |
15023 | 199 |
orelse |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
200 |
null prems andalso Pattern.matches (Proof_Context.theory_of ctxt) (lhs, rhs) |
10413 | 201 |
(*the condition "null prems" is necessary because conditional rewrites |
202 |
with extra variables in the conditions may terminate although |
|
67721 | 203 |
the rhs is an instance of the lhs; example: ?m < ?n \<Longrightarrow> f ?n \<equiv> f ?m *) |
15023 | 204 |
orelse |
205 |
is_Const lhs andalso not (is_Const rhs); |
|
10413 | 206 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
207 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
208 |
(* simplification procedures *) |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
209 |
|
78800 | 210 |
type proc = Proof.context -> cterm -> thm option; |
211 |
||
80697
48eaf5c85d6e
tuned signature: support more general procedures;
wenzelm
parents:
80306
diff
changeset
|
212 |
datatype procedure = |
48eaf5c85d6e
tuned signature: support more general procedures;
wenzelm
parents:
80306
diff
changeset
|
213 |
Procedure of |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
214 |
{name: string, |
61098 | 215 |
lhs: term, |
78800 | 216 |
proc: proc Morphism.entity, |
78812
d769a183d51d
simprocs may be distinguished via 'identifier': only works for ML antiquotation (see also 13252110a6fe);
wenzelm
parents:
78800
diff
changeset
|
217 |
id: stamp * thm list}; |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
218 |
|
80697
48eaf5c85d6e
tuned signature: support more general procedures;
wenzelm
parents:
80306
diff
changeset
|
219 |
fun eq_procedure (Procedure {id = (s1, ths1), ...}, Procedure {id = (s2, ths2), ...}) = |
78812
d769a183d51d
simprocs may be distinguished via 'identifier': only works for ML antiquotation (see also 13252110a6fe);
wenzelm
parents:
78800
diff
changeset
|
220 |
s1 = s2 andalso eq_list Thm.eq_thm_prop (ths1, ths2); |
d769a183d51d
simprocs may be distinguished via 'identifier': only works for ML antiquotation (see also 13252110a6fe);
wenzelm
parents:
78800
diff
changeset
|
221 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
222 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
223 |
(* solvers *) |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
224 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
225 |
datatype solver = |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
226 |
Solver of |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
227 |
{name: string, |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
228 |
solver: Proof.context -> int -> tactic, |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
229 |
id: stamp}; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
230 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
231 |
fun mk_solver name solver = Solver {name = name, solver = solver, id = stamp ()}; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
232 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
233 |
fun solver_name (Solver {name, ...}) = name; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
234 |
fun solver ctxt (Solver {solver = tac, ...}) = tac ctxt; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
235 |
fun eq_solver (Solver {id = id1, ...}, Solver {id = id2, ...}) = (id1 = id2); |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
236 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
237 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
238 |
(* simplification sets *) |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
239 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
240 |
(*A simpset contains data required during conversion: |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
241 |
rules: discrimination net of rewrite rules; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
242 |
prems: current premises; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
243 |
depth: simp_depth and exceeded flag; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
244 |
congs: association list of congruence rules and |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
245 |
a list of `weak' congruence constants. |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
246 |
A congruence is `weak' if it avoids normalization of some argument. |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
247 |
procs: discrimination net of simplification procedures |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
248 |
(functions that prove rewrite rules on the fly); |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
249 |
mk_rews: |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
250 |
mk: turn simplification thms into rewrite rules; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
251 |
mk_cong: prepare congruence rules; |
67721 | 252 |
mk_sym: turn \<equiv> around; |
253 |
mk_eq_True: turn P into P \<equiv> True; |
|
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
254 |
term_ord: for ordered rewriting;*) |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
255 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
256 |
datatype simpset = |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
257 |
Simpset of |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
258 |
{rules: rrule Net.net, |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
259 |
prems: thm list, |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
260 |
depth: int * bool Unsynchronized.ref} * |
71239 | 261 |
{congs: thm Congtab.table * cong_name list, |
80697
48eaf5c85d6e
tuned signature: support more general procedures;
wenzelm
parents:
80306
diff
changeset
|
262 |
procs: procedure Net.net, |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
263 |
mk_rews: |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
264 |
{mk: Proof.context -> thm -> thm list, |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
265 |
mk_cong: Proof.context -> thm -> thm, |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
266 |
mk_sym: Proof.context -> thm -> thm option, |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
267 |
mk_eq_True: Proof.context -> thm -> thm option, |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
268 |
reorient: Proof.context -> term list -> term -> term -> bool}, |
70586 | 269 |
term_ord: term ord, |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
270 |
subgoal_tac: Proof.context -> int -> tactic, |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
271 |
loop_tacs: (string * (Proof.context -> int -> tactic)) list, |
54731
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
272 |
solvers: solver list * solver list}; |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
273 |
|
54728 | 274 |
fun internal_ss (Simpset (_, ss2)) = ss2; |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
275 |
|
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
55000
diff
changeset
|
276 |
fun make_ss1 (rules, prems, depth) = {rules = rules, prems = prems, depth = depth}; |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
277 |
|
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
55000
diff
changeset
|
278 |
fun map_ss1 f {rules, prems, depth} = make_ss1 (f (rules, prems, depth)); |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
279 |
|
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
280 |
fun make_ss2 (congs, procs, mk_rews, term_ord, subgoal_tac, loop_tacs, solvers) = |
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
281 |
{congs = congs, procs = procs, mk_rews = mk_rews, term_ord = term_ord, |
54731
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
282 |
subgoal_tac = subgoal_tac, loop_tacs = loop_tacs, solvers = solvers}; |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
283 |
|
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
284 |
fun map_ss2 f {congs, procs, mk_rews, term_ord, subgoal_tac, loop_tacs, solvers} = |
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
285 |
make_ss2 (f (congs, procs, mk_rews, term_ord, subgoal_tac, loop_tacs, solvers)); |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
286 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
287 |
fun make_simpset (args1, args2) = Simpset (make_ss1 args1, make_ss2 args2); |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
288 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
289 |
fun dest_ss (Simpset ({rules, ...}, {congs, procs, loop_tacs, solvers, ...})) = |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
290 |
{simps = Net.entries rules |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
291 |
|> map (fn {name, thm, ...} => (name, thm)), |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
292 |
procs = Net.entries procs |
80697
48eaf5c85d6e
tuned signature: support more general procedures;
wenzelm
parents:
80306
diff
changeset
|
293 |
|> partition_eq eq_procedure |
48eaf5c85d6e
tuned signature: support more general procedures;
wenzelm
parents:
80306
diff
changeset
|
294 |
|> map (fn ps as Procedure {name, ...} :: _ => (name, map (fn Procedure {lhs, ...} => lhs) ps)), |
71239 | 295 |
congs = congs |> fst |> Congtab.dest, |
296 |
weak_congs = congs |> snd, |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
297 |
loopers = map fst loop_tacs, |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
298 |
unsafe_solvers = map solver_name (#1 solvers), |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
299 |
safe_solvers = map solver_name (#2 solvers)}; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
300 |
|
78453
3fdf3c5cfa9d
performance tuning: prefer static simpset within functional closure of morphism (with notable impact on specifications "in" class, e.g. AFP/No_FTL_observers);
wenzelm
parents:
78136
diff
changeset
|
301 |
fun dest_simps (Simpset ({rules, ...}, _)) = map #thm (Net.entries rules); |
3fdf3c5cfa9d
performance tuning: prefer static simpset within functional closure of morphism (with notable impact on specifications "in" class, e.g. AFP/No_FTL_observers);
wenzelm
parents:
78136
diff
changeset
|
302 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
303 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
304 |
(* empty *) |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
305 |
|
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
306 |
fun init_ss depth mk_rews term_ord subgoal_tac solvers = |
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
55000
diff
changeset
|
307 |
make_simpset ((Net.empty, [], depth), |
71239 | 308 |
((Congtab.empty, []), Net.empty, mk_rews, term_ord, subgoal_tac, [], solvers)); |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
309 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
310 |
fun default_mk_sym _ th = SOME (th RS Drule.symmetric_thm); |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
311 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
312 |
val empty_ss = |
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
55000
diff
changeset
|
313 |
init_ss (0, Unsynchronized.ref false) |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
314 |
{mk = fn _ => fn th => if can Logic.dest_equals (Thm.concl_of th) then [th] else [], |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
315 |
mk_cong = K I, |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
316 |
mk_sym = default_mk_sym, |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
317 |
mk_eq_True = K (K NONE), |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
318 |
reorient = default_reorient} |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
319 |
Term_Ord.term_ord (K (K no_tac)) ([], []); |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
320 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
321 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
322 |
(* merge *) (*NOTE: ignores some fields of 2nd simpset*) |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
323 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
324 |
fun merge_ss (ss1, ss2) = |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
325 |
if pointer_eq (ss1, ss2) then ss1 |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
326 |
else |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
327 |
let |
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
55000
diff
changeset
|
328 |
val Simpset ({rules = rules1, prems = prems1, depth = depth1}, |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
329 |
{congs = (congs1, weak1), procs = procs1, mk_rews, term_ord, subgoal_tac, |
54731
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
330 |
loop_tacs = loop_tacs1, solvers = (unsafe_solvers1, solvers1)}) = ss1; |
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
55000
diff
changeset
|
331 |
val Simpset ({rules = rules2, prems = prems2, depth = depth2}, |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
332 |
{congs = (congs2, weak2), procs = procs2, mk_rews = _, term_ord = _, subgoal_tac = _, |
54731
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
333 |
loop_tacs = loop_tacs2, solvers = (unsafe_solvers2, solvers2)}) = ss2; |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
334 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
335 |
val rules' = Net.merge eq_rrule (rules1, rules2); |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
336 |
val prems' = Thm.merge_thms (prems1, prems2); |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
337 |
val depth' = if #1 depth1 < #1 depth2 then depth2 else depth1; |
71239 | 338 |
val congs' = Congtab.merge (K true) (congs1, congs2); |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
339 |
val weak' = merge (op =) (weak1, weak2); |
80697
48eaf5c85d6e
tuned signature: support more general procedures;
wenzelm
parents:
80306
diff
changeset
|
340 |
val procs' = Net.merge eq_procedure (procs1, procs2); |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
341 |
val loop_tacs' = AList.merge (op =) (K true) (loop_tacs1, loop_tacs2); |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
342 |
val unsafe_solvers' = merge eq_solver (unsafe_solvers1, unsafe_solvers2); |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
343 |
val solvers' = merge eq_solver (solvers1, solvers2); |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
344 |
in |
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
55000
diff
changeset
|
345 |
make_simpset ((rules', prems', depth'), ((congs', weak'), procs', |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
346 |
mk_rews, term_ord, subgoal_tac, loop_tacs', (unsafe_solvers', solvers'))) |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
347 |
end; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
348 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
349 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
350 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
351 |
(** context data **) |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
352 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
353 |
structure Simpset = Generic_Data |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
354 |
( |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
355 |
type T = simpset; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
356 |
val empty = empty_ss; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
357 |
val merge = merge_ss; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
358 |
); |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
359 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
360 |
val simpset_of = Simpset.get o Context.Proof; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
361 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
362 |
fun map_simpset f = Context.proof_map (Simpset.map f); |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
363 |
fun map_simpset1 f = map_simpset (fn Simpset (ss1, ss2) => Simpset (map_ss1 f ss1, ss2)); |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
364 |
fun map_simpset2 f = map_simpset (fn Simpset (ss1, ss2) => Simpset (ss1, map_ss2 f ss2)); |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
365 |
|
71403 | 366 |
fun put_simpset ss = map_simpset (K ss); |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
367 |
|
71403 | 368 |
fun simpset_map ctxt f ss = ctxt |> put_simpset ss |> f |> simpset_of; |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
369 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
370 |
val empty_simpset = put_simpset empty_ss; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
371 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
372 |
fun map_theory_simpset f thy = |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
373 |
let |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
374 |
val ctxt' = f (Proof_Context.init_global thy); |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
375 |
val thy' = Proof_Context.theory_of ctxt'; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
376 |
in Context.theory_map (Simpset.map (K (simpset_of ctxt'))) thy' end; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
377 |
|
57859
29e728588163
more careful treatment of context visibility for rule declarations (see also 39d9c7f175e0, e639d91d9073) -- avoid duplicate warnings;
wenzelm
parents:
56438
diff
changeset
|
378 |
fun map_ss f = Context.mapping (map_theory_simpset (f o Context_Position.not_really)) f; |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
379 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
380 |
val clear_simpset = |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
381 |
map_simpset (fn Simpset ({depth, ...}, {mk_rews, term_ord, subgoal_tac, solvers, ...}) => |
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
382 |
init_ss depth mk_rews term_ord subgoal_tac solvers); |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
383 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
384 |
|
71235 | 385 |
(* accessors for tactis *) |
386 |
||
387 |
fun subgoal_tac ctxt = (#subgoal_tac o internal_ss o simpset_of) ctxt ctxt; |
|
388 |
||
389 |
fun loop_tac ctxt = |
|
390 |
FIRST' (map (fn (_, tac) => tac ctxt) (rev ((#loop_tacs o internal_ss o simpset_of) ctxt))); |
|
391 |
||
392 |
val solvers = #solvers o internal_ss o simpset_of |
|
393 |
||
394 |
||
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
395 |
(* simp depth *) |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
396 |
|
66934 | 397 |
(* |
398 |
The simp_depth_limit is meant to abort infinite recursion of the simplifier |
|
399 |
early but should not terminate "normal" executions. |
|
400 |
As of 2017, 25 would suffice; 40 builds in a safety margin. |
|
401 |
*) |
|
402 |
||
69575 | 403 |
val simp_depth_limit = Config.declare_int ("simp_depth_limit", \<^here>) (K 40); |
404 |
val simp_trace_depth_limit = Config.declare_int ("simp_trace_depth_limit", \<^here>) (K 1); |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
405 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
406 |
fun inc_simp_depth ctxt = |
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
55000
diff
changeset
|
407 |
ctxt |> map_simpset1 (fn (rules, prems, (depth, exceeded)) => |
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
55000
diff
changeset
|
408 |
(rules, prems, |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
409 |
(depth + 1, |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
410 |
if depth = Config.get ctxt simp_trace_depth_limit |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
411 |
then Unsynchronized.ref false else exceeded))); |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
412 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
413 |
fun simp_depth ctxt = |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
414 |
let val Simpset ({depth = (depth, _), ...}, _) = simpset_of ctxt |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
415 |
in depth end; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
416 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
417 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
418 |
(* diagnostics *) |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
419 |
|
54997 | 420 |
exception SIMPLIFIER of string * thm list; |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
421 |
|
69575 | 422 |
val simp_debug = Config.declare_bool ("simp_debug", \<^here>) (K false); |
423 |
val simp_trace = Config.declare_bool ("simp_trace", \<^here>) (K false); |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
424 |
|
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
425 |
fun cond_warning ctxt msg = |
57859
29e728588163
more careful treatment of context visibility for rule declarations (see also 39d9c7f175e0, e639d91d9073) -- avoid duplicate warnings;
wenzelm
parents:
56438
diff
changeset
|
426 |
if Context_Position.is_really_visible ctxt then warning (msg ()) else (); |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
427 |
|
55031 | 428 |
fun cond_tracing' ctxt flag msg = |
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
429 |
if Config.get ctxt flag then |
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
430 |
let |
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
431 |
val Simpset ({depth = (depth, exceeded), ...}, _) = simpset_of ctxt; |
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
432 |
val depth_limit = Config.get ctxt simp_trace_depth_limit; |
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
433 |
in |
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
434 |
if depth > depth_limit then |
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
435 |
if ! exceeded then () else (tracing "simp_trace_depth_limit exceeded!"; exceeded := true) |
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
436 |
else (tracing (enclose "[" "]" (string_of_int depth) ^ msg ()); exceeded := false) |
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
437 |
end |
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
438 |
else (); |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
439 |
|
55031 | 440 |
fun cond_tracing ctxt = cond_tracing' ctxt simp_trace; |
441 |
||
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
442 |
fun print_term ctxt s t = |
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
443 |
s ^ "\n" ^ Syntax.string_of_term ctxt t; |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
444 |
|
80306 | 445 |
fun print_thm ctxt msg (name, th) = |
446 |
let |
|
447 |
val thy = Proof_Context.theory_of ctxt; |
|
448 |
val sffx = |
|
449 |
if Thm_Name.is_empty name then "" |
|
450 |
else " " ^ quote (Global_Theory.print_thm_name thy name) ^ ":"; |
|
451 |
in print_term ctxt (msg ^ sffx) (Thm.full_prop_of th) end; |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
452 |
|
80306 | 453 |
fun print_thm0 ctxt msg th = print_thm ctxt msg (Thm_Name.empty, th); |
80304 | 454 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
455 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
456 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
457 |
(** simpset operations **) |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
458 |
|
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
55000
diff
changeset
|
459 |
(* prems *) |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
460 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
461 |
fun prems_of ctxt = |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
462 |
let val Simpset ({prems, ...}, _) = simpset_of ctxt in prems end; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
463 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
464 |
fun add_prems ths = |
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
55000
diff
changeset
|
465 |
map_simpset1 (fn (rules, prems, depth) => (rules, ths @ prems, depth)); |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
466 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
467 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
468 |
(* maintain simp rules *) |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
469 |
|
68403 | 470 |
fun del_rrule loud (rrule as {thm, elhs, ...}) ctxt = |
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
55000
diff
changeset
|
471 |
ctxt |> map_simpset1 (fn (rules, prems, depth) => |
59582 | 472 |
(Net.delete_term eq_rrule (Thm.term_of elhs, rrule) rules, prems, depth)) |
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
473 |
handle Net.DELETE => |
68403 | 474 |
(if not loud then () |
80304 | 475 |
else cond_warning ctxt (fn () => print_thm0 ctxt "Rewrite rule not in simpset:" thm); |
68403 | 476 |
ctxt); |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
477 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
478 |
fun insert_rrule (rrule as {thm, name, ...}) ctxt = |
55031 | 479 |
(cond_tracing ctxt (fn () => print_thm ctxt "Adding rewrite rule" (name, thm)); |
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
55000
diff
changeset
|
480 |
ctxt |> map_simpset1 (fn (rules, prems, depth) => |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
481 |
let |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
482 |
val rrule2 as {elhs, ...} = mk_rrule2 rrule; |
61057 | 483 |
val rules' = Net.insert_term eq_rrule (Thm.term_of elhs, trim_context_rrule rrule2) rules; |
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
55000
diff
changeset
|
484 |
in (rules', prems, depth) end) |
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
485 |
handle Net.INSERT => |
80304 | 486 |
(cond_warning ctxt (fn () => print_thm0 ctxt "Ignoring duplicate rewrite rule:" thm); ctxt)); |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
487 |
|
74266 | 488 |
val vars_set = Vars.build o Vars.add_vars; |
74227 | 489 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
490 |
local |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
491 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
492 |
fun vperm (Var _, Var _) = true |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
493 |
| vperm (Abs (_, _, s), Abs (_, _, t)) = vperm (s, t) |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
494 |
| vperm (t1 $ t2, u1 $ u2) = vperm (t1, u1) andalso vperm (t2, u2) |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
495 |
| vperm (t, u) = (t = u); |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
496 |
|
74266 | 497 |
fun var_perm (t, u) = vperm (t, u) andalso Vars.eq_set (apply2 vars_set (t, u)); |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
498 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
499 |
in |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
500 |
|
10413 | 501 |
fun decomp_simp thm = |
15023 | 502 |
let |
26626
c6231d64d264
rep_cterm/rep_thm: no longer dereference theory_ref;
wenzelm
parents:
26424
diff
changeset
|
503 |
val prop = Thm.prop_of thm; |
15023 | 504 |
val prems = Logic.strip_imp_prems prop; |
505 |
val concl = Drule.strip_imp_concl (Thm.cprop_of thm); |
|
22902
ac833b4bb7ee
moved some Drule operations to Thm (see more_thm.ML);
wenzelm
parents:
22892
diff
changeset
|
506 |
val (lhs, rhs) = Thm.dest_equals concl handle TERM _ => |
54997 | 507 |
raise SIMPLIFIER ("Rewrite rule not a meta-equality", [thm]); |
20579 | 508 |
val elhs = Thm.dest_arg (Thm.cprop_of (Thm.eta_conversion lhs)); |
59582 | 509 |
val erhs = Envir.eta_contract (Thm.term_of rhs); |
15023 | 510 |
val perm = |
59582 | 511 |
var_perm (Thm.term_of elhs, erhs) andalso |
512 |
not (Thm.term_of elhs aconv erhs) andalso |
|
513 |
not (is_Var (Thm.term_of elhs)); |
|
514 |
in (prems, Thm.term_of lhs, elhs, Thm.term_of rhs, perm) end; |
|
10413 | 515 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
516 |
end; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
517 |
|
12783 | 518 |
fun decomp_simp' thm = |
52091 | 519 |
let val (_, lhs, _, rhs, _) = decomp_simp thm in |
54997 | 520 |
if Thm.nprems_of thm > 0 then raise SIMPLIFIER ("Bad conditional rewrite rule", [thm]) |
12979
4c76bce4ce39
decomp_simp': use lhs instead of elhs (preserves more bound variable names);
wenzelm
parents:
12783
diff
changeset
|
521 |
else (lhs, rhs) |
12783 | 522 |
end; |
523 |
||
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
524 |
fun mk_eq_True ctxt (thm, name) = |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
525 |
let val Simpset (_, {mk_rews = {mk_eq_True, ...}, ...}) = simpset_of ctxt in |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
526 |
(case mk_eq_True ctxt thm of |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
527 |
NONE => [] |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
528 |
| SOME eq_True => |
52091 | 529 |
let val (_, lhs, elhs, _, _) = decomp_simp eq_True; |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
530 |
in [{thm = eq_True, name = name, lhs = lhs, elhs = elhs, perm = false}] end) |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
531 |
end; |
10413 | 532 |
|
15023 | 533 |
(*create the rewrite rule and possibly also the eq_True variant, |
534 |
in case there are extra vars on the rhs*) |
|
52082 | 535 |
fun rrule_eq_True ctxt thm name lhs elhs rhs thm2 = |
15023 | 536 |
let val rrule = {thm = thm, name = name, lhs = lhs, elhs = elhs, perm = false} in |
20546
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
537 |
if rewrite_rule_extra_vars [] lhs rhs then |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
538 |
mk_eq_True ctxt (thm2, name) @ [rrule] |
20546
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
539 |
else [rrule] |
10413 | 540 |
end; |
541 |
||
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
542 |
fun mk_rrule ctxt (thm, name) = |
52091 | 543 |
let val (prems, lhs, elhs, rhs, perm) = decomp_simp thm in |
15023 | 544 |
if perm then [{thm = thm, name = name, lhs = lhs, elhs = elhs, perm = true}] |
545 |
else |
|
546 |
(*weak test for loops*) |
|
59582 | 547 |
if rewrite_rule_extra_vars prems lhs rhs orelse is_Var (Thm.term_of elhs) |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
548 |
then mk_eq_True ctxt (thm, name) |
52082 | 549 |
else rrule_eq_True ctxt thm name lhs elhs rhs thm |
70472
cf66d2db97fe
more robust and convenient treatment of implicit context;
wenzelm
parents:
69575
diff
changeset
|
550 |
end |> map (fn {thm, name, lhs, elhs, perm} => |
cf66d2db97fe
more robust and convenient treatment of implicit context;
wenzelm
parents:
69575
diff
changeset
|
551 |
{thm = Thm.trim_context thm, name = name, lhs = lhs, |
cf66d2db97fe
more robust and convenient treatment of implicit context;
wenzelm
parents:
69575
diff
changeset
|
552 |
elhs = Thm.trim_context_cterm elhs, perm = perm}); |
10413 | 553 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
554 |
fun orient_rrule ctxt (thm, name) = |
18208 | 555 |
let |
52091 | 556 |
val (prems, lhs, elhs, rhs, perm) = decomp_simp thm; |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
557 |
val Simpset (_, {mk_rews = {reorient, mk_sym, ...}, ...}) = simpset_of ctxt; |
18208 | 558 |
in |
15023 | 559 |
if perm then [{thm = thm, name = name, lhs = lhs, elhs = elhs, perm = true}] |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
560 |
else if reorient ctxt prems lhs rhs then |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
561 |
if reorient ctxt prems rhs lhs |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
562 |
then mk_eq_True ctxt (thm, name) |
15023 | 563 |
else |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
564 |
(case mk_sym ctxt thm of |
18208 | 565 |
NONE => [] |
566 |
| SOME thm' => |
|
52091 | 567 |
let val (_, lhs', elhs', rhs', _) = decomp_simp thm' |
52082 | 568 |
in rrule_eq_True ctxt thm' name lhs' elhs' rhs' thm end) |
569 |
else rrule_eq_True ctxt thm name lhs elhs rhs thm |
|
10413 | 570 |
end; |
571 |
||
68046 | 572 |
fun extract_rews ctxt sym thms = |
573 |
let |
|
574 |
val Simpset (_, {mk_rews = {mk, ...}, ...}) = simpset_of ctxt; |
|
575 |
val mk = |
|
576 |
if sym then fn ctxt => fn th => (mk ctxt th) RL [Drule.symmetric_thm] |
|
69137
90fce429e1bc
Jenkins: run ocaml_setup
Lars Hupel <lars.hupel@mytum.de>
parents:
68405
diff
changeset
|
577 |
else mk |
68046 | 578 |
in maps (fn thm => map (rpair (Thm.get_name_hint thm)) (mk ctxt thm)) thms |
579 |
end; |
|
10413 | 580 |
|
54982 | 581 |
fun extract_safe_rrules ctxt thm = |
68046 | 582 |
maps (orient_rrule ctxt) (extract_rews ctxt false [thm]); |
10413 | 583 |
|
55316
885500f4aa6a
interactive simplifier trace: new panel in Isabelle/jEdit to inspect and modify simplification state
Lars Hupel <lars.hupel@mytum.de>
parents:
55032
diff
changeset
|
584 |
fun mk_rrules ctxt thms = |
885500f4aa6a
interactive simplifier trace: new panel in Isabelle/jEdit to inspect and modify simplification state
Lars Hupel <lars.hupel@mytum.de>
parents:
55032
diff
changeset
|
585 |
let |
68046 | 586 |
val rews = extract_rews ctxt false thms |
55316
885500f4aa6a
interactive simplifier trace: new panel in Isabelle/jEdit to inspect and modify simplification state
Lars Hupel <lars.hupel@mytum.de>
parents:
55032
diff
changeset
|
587 |
val raw_rrules = flat (map (mk_rrule ctxt) rews) |
885500f4aa6a
interactive simplifier trace: new panel in Isabelle/jEdit to inspect and modify simplification state
Lars Hupel <lars.hupel@mytum.de>
parents:
55032
diff
changeset
|
588 |
in map mk_rrule2 raw_rrules end |
885500f4aa6a
interactive simplifier trace: new panel in Isabelle/jEdit to inspect and modify simplification state
Lars Hupel <lars.hupel@mytum.de>
parents:
55032
diff
changeset
|
589 |
|
10413 | 590 |
|
20028
b9752164ad92
add/del_simps: warning for inactive simpset (no context);
wenzelm
parents:
19798
diff
changeset
|
591 |
(* add/del rules explicitly *) |
10413 | 592 |
|
61090 | 593 |
local |
594 |
||
68046 | 595 |
fun comb_simps ctxt comb mk_rrule sym thms = |
596 |
let val rews = extract_rews ctxt sym (map (Thm.transfer' ctxt) thms); |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
597 |
in fold (fold comb o mk_rrule) rews ctxt end; |
10413 | 598 |
|
68405 | 599 |
(* |
600 |
This code checks if the symetric version of a rule is already in the simpset. |
|
601 |
However, the variable names in the two versions of the rule may differ. |
|
602 |
Thus the current test modulo eq_rrule is too weak to be useful |
|
603 |
and needs to be refined. |
|
604 |
||
605 |
fun present ctxt rules (rrule as {thm, elhs, ...}) = |
|
606 |
(Net.insert_term eq_rrule (Thm.term_of elhs, trim_context_rrule rrule) rules; |
|
607 |
false) |
|
608 |
handle Net.INSERT => |
|
609 |
(cond_warning ctxt |
|
80304 | 610 |
(fn () => print_thm0 ctxt "Symmetric rewrite rule already in simpset:" thm); |
68405 | 611 |
true); |
612 |
||
613 |
fun sym_present ctxt thms = |
|
614 |
let |
|
615 |
val rews = extract_rews ctxt true (map (Thm.transfer' ctxt) thms); |
|
616 |
val rrules = map mk_rrule2 (flat(map (mk_rrule ctxt) rews)) |
|
617 |
val Simpset({rules, ...},_) = simpset_of ctxt |
|
618 |
in exists (present ctxt rules) rrules end |
|
619 |
*) |
|
61090 | 620 |
in |
621 |
||
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
622 |
fun ctxt addsimps thms = |
68046 | 623 |
comb_simps ctxt insert_rrule (mk_rrule ctxt) false thms; |
624 |
||
625 |
fun addsymsimps ctxt thms = |
|
626 |
comb_simps ctxt insert_rrule (mk_rrule ctxt) true thms; |
|
10413 | 627 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
628 |
fun ctxt delsimps thms = |
68403 | 629 |
comb_simps ctxt (del_rrule true) (map mk_rrule2 o mk_rrule ctxt) false thms; |
630 |
||
631 |
fun delsimps_quiet ctxt thms = |
|
632 |
comb_simps ctxt (del_rrule false) (map mk_rrule2 o mk_rrule ctxt) false thms; |
|
15023 | 633 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
634 |
fun add_simp thm ctxt = ctxt addsimps [thm]; |
68405 | 635 |
(* |
636 |
with check for presence of symmetric version: |
|
637 |
if sym_present ctxt [thm] |
|
80304 | 638 |
then (cond_warning ctxt (fn () => print_thm0 ctxt "Ignoring rewrite rule:" thm); ctxt) |
68405 | 639 |
else ctxt addsimps [thm]; |
640 |
*) |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
641 |
fun del_simp thm ctxt = ctxt delsimps [thm]; |
68403 | 642 |
fun flip_simp thm ctxt = addsymsimps (delsimps_quiet ctxt [thm]) [thm]; |
15023 | 643 |
|
61090 | 644 |
end; |
645 |
||
63221
7d43fbbaba28
avoid warnings on duplicate rules in the given list;
wenzelm
parents:
62913
diff
changeset
|
646 |
fun init_simpset thms ctxt = ctxt |
7d43fbbaba28
avoid warnings on duplicate rules in the given list;
wenzelm
parents:
62913
diff
changeset
|
647 |
|> Context_Position.set_visible false |
7d43fbbaba28
avoid warnings on duplicate rules in the given list;
wenzelm
parents:
62913
diff
changeset
|
648 |
|> empty_simpset |
7d43fbbaba28
avoid warnings on duplicate rules in the given list;
wenzelm
parents:
62913
diff
changeset
|
649 |
|> fold add_simp thms |
7d43fbbaba28
avoid warnings on duplicate rules in the given list;
wenzelm
parents:
62913
diff
changeset
|
650 |
|> Context_Position.restore_visible ctxt; |
7d43fbbaba28
avoid warnings on duplicate rules in the given list;
wenzelm
parents:
62913
diff
changeset
|
651 |
|
57859
29e728588163
more careful treatment of context visibility for rule declarations (see also 39d9c7f175e0, e639d91d9073) -- avoid duplicate warnings;
wenzelm
parents:
56438
diff
changeset
|
652 |
|
15023 | 653 |
(* congs *) |
10413 | 654 |
|
15023 | 655 |
local |
656 |
||
657 |
fun is_full_cong_prems [] [] = true |
|
658 |
| is_full_cong_prems [] _ = false |
|
659 |
| is_full_cong_prems (p :: prems) varpairs = |
|
660 |
(case Logic.strip_assums_concl p of |
|
56245 | 661 |
Const ("Pure.eq", _) $ lhs $ rhs => |
15023 | 662 |
let val (x, xs) = strip_comb lhs and (y, ys) = strip_comb rhs in |
663 |
is_Var x andalso forall is_Bound xs andalso |
|
20972 | 664 |
not (has_duplicates (op =) xs) andalso xs = ys andalso |
20671 | 665 |
member (op =) varpairs (x, y) andalso |
19303 | 666 |
is_full_cong_prems prems (remove (op =) (x, y) varpairs) |
15023 | 667 |
end |
668 |
| _ => false); |
|
669 |
||
670 |
fun is_full_cong thm = |
|
10413 | 671 |
let |
43597 | 672 |
val prems = Thm.prems_of thm and concl = Thm.concl_of thm; |
15023 | 673 |
val (lhs, rhs) = Logic.dest_equals concl; |
674 |
val (f, xs) = strip_comb lhs and (g, ys) = strip_comb rhs; |
|
10413 | 675 |
in |
20972 | 676 |
f = g andalso not (has_duplicates (op =) (xs @ ys)) andalso length xs = length ys andalso |
15023 | 677 |
is_full_cong_prems prems (xs ~~ ys) |
10413 | 678 |
end; |
679 |
||
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
680 |
fun mk_cong ctxt = |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
681 |
let val Simpset (_, {mk_rews = {mk_cong = f, ...}, ...}) = simpset_of ctxt |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
682 |
in f ctxt end; |
45620
f2a587696afb
modernized some old-style infix operations, which were left over from the time of ML proof scripts;
wenzelm
parents:
45405
diff
changeset
|
683 |
|
f2a587696afb
modernized some old-style infix operations, which were left over from the time of ML proof scripts;
wenzelm
parents:
45405
diff
changeset
|
684 |
in |
f2a587696afb
modernized some old-style infix operations, which were left over from the time of ML proof scripts;
wenzelm
parents:
45405
diff
changeset
|
685 |
|
54729
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
686 |
fun add_eqcong thm ctxt = ctxt |> map_simpset2 |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
687 |
(fn (congs, procs, mk_rews, term_ord, subgoal_tac, loop_tacs, solvers) => |
15023 | 688 |
let |
45621 | 689 |
val (lhs, _) = Logic.dest_equals (Thm.concl_of thm) |
54997 | 690 |
handle TERM _ => raise SIMPLIFIER ("Congruence not a meta-equality", [thm]); |
18929 | 691 |
(*val lhs = Envir.eta_contract lhs;*) |
45621 | 692 |
val a = the (cong_name (head_of lhs)) handle Option.Option => |
54997 | 693 |
raise SIMPLIFIER ("Congruence must start with a constant or free variable", [thm]); |
22221
8a8aa6114a89
changed cong alist - now using AList operations instead of overwrite_warn
haftmann
parents:
22008
diff
changeset
|
694 |
val (xs, weak) = congs; |
71239 | 695 |
val xs' = Congtab.update (a, Thm.trim_context thm) xs; |
22221
8a8aa6114a89
changed cong alist - now using AList operations instead of overwrite_warn
haftmann
parents:
22008
diff
changeset
|
696 |
val weak' = if is_full_cong thm then weak else a :: weak; |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
697 |
in ((xs', weak'), procs, mk_rews, term_ord, subgoal_tac, loop_tacs, solvers) end); |
10413 | 698 |
|
54729
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
699 |
fun del_eqcong thm ctxt = ctxt |> map_simpset2 |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
700 |
(fn (congs, procs, mk_rews, term_ord, subgoal_tac, loop_tacs, solvers) => |
15023 | 701 |
let |
45621 | 702 |
val (lhs, _) = Logic.dest_equals (Thm.concl_of thm) |
54997 | 703 |
handle TERM _ => raise SIMPLIFIER ("Congruence not a meta-equality", [thm]); |
18929 | 704 |
(*val lhs = Envir.eta_contract lhs;*) |
20057 | 705 |
val a = the (cong_name (head_of lhs)) handle Option.Option => |
54997 | 706 |
raise SIMPLIFIER ("Congruence must start with a constant", [thm]); |
22221
8a8aa6114a89
changed cong alist - now using AList operations instead of overwrite_warn
haftmann
parents:
22008
diff
changeset
|
707 |
val (xs, _) = congs; |
71239 | 708 |
val xs' = Congtab.delete_safe a xs; |
709 |
val weak' = Congtab.fold (fn (a, th) => if is_full_cong th then I else insert (op =) a) xs' []; |
|
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
710 |
in ((xs', weak'), procs, mk_rews, term_ord, subgoal_tac, loop_tacs, solvers) end); |
10413 | 711 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
712 |
fun add_cong thm ctxt = add_eqcong (mk_cong ctxt thm) ctxt; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
713 |
fun del_cong thm ctxt = del_eqcong (mk_cong ctxt thm) ctxt; |
15023 | 714 |
|
715 |
end; |
|
10413 | 716 |
|
717 |
||
15023 | 718 |
(* simprocs *) |
719 |
||
22234 | 720 |
datatype simproc = |
721 |
Simproc of |
|
722 |
{name: string, |
|
61098 | 723 |
lhss: term list, |
78800 | 724 |
proc: proc Morphism.entity, |
78812
d769a183d51d
simprocs may be distinguished via 'identifier': only works for ML antiquotation (see also 13252110a6fe);
wenzelm
parents:
78800
diff
changeset
|
725 |
id: stamp * thm list}; |
22008 | 726 |
|
78812
d769a183d51d
simprocs may be distinguished via 'identifier': only works for ML antiquotation (see also 13252110a6fe);
wenzelm
parents:
78800
diff
changeset
|
727 |
fun cert_simproc thy {name, lhss, proc, identifier} = |
d769a183d51d
simprocs may be distinguished via 'identifier': only works for ML antiquotation (see also 13252110a6fe);
wenzelm
parents:
78800
diff
changeset
|
728 |
Simproc |
d769a183d51d
simprocs may be distinguished via 'identifier': only works for ML antiquotation (see also 13252110a6fe);
wenzelm
parents:
78800
diff
changeset
|
729 |
{name = name, |
d769a183d51d
simprocs may be distinguished via 'identifier': only works for ML antiquotation (see also 13252110a6fe);
wenzelm
parents:
78800
diff
changeset
|
730 |
lhss = map (Sign.cert_term thy) lhss, |
d769a183d51d
simprocs may be distinguished via 'identifier': only works for ML antiquotation (see also 13252110a6fe);
wenzelm
parents:
78800
diff
changeset
|
731 |
proc = proc, |
d769a183d51d
simprocs may be distinguished via 'identifier': only works for ML antiquotation (see also 13252110a6fe);
wenzelm
parents:
78800
diff
changeset
|
732 |
id = (stamp (), map (Thm.transfer thy) identifier)}; |
61144 | 733 |
|
78812
d769a183d51d
simprocs may be distinguished via 'identifier': only works for ML antiquotation (see also 13252110a6fe);
wenzelm
parents:
78800
diff
changeset
|
734 |
fun transform_simproc phi (Simproc {name, lhss, proc, id = (stamp, identifier)}) = |
22234 | 735 |
Simproc |
736 |
{name = name, |
|
61098 | 737 |
lhss = map (Morphism.term phi) lhss, |
78114 | 738 |
proc = Morphism.transform phi proc, |
78812
d769a183d51d
simprocs may be distinguished via 'identifier': only works for ML antiquotation (see also 13252110a6fe);
wenzelm
parents:
78800
diff
changeset
|
739 |
id = (stamp, Morphism.fact phi identifier)}; |
78114 | 740 |
|
78812
d769a183d51d
simprocs may be distinguished via 'identifier': only works for ML antiquotation (see also 13252110a6fe);
wenzelm
parents:
78800
diff
changeset
|
741 |
fun trim_context_simproc (Simproc {name, lhss, proc, id = (stamp, identifier)}) = |
78114 | 742 |
Simproc |
743 |
{name = name, |
|
744 |
lhss = lhss, |
|
745 |
proc = Morphism.entity_reset_context proc, |
|
78812
d769a183d51d
simprocs may be distinguished via 'identifier': only works for ML antiquotation (see also 13252110a6fe);
wenzelm
parents:
78800
diff
changeset
|
746 |
id = (stamp, map Thm.trim_context identifier)}; |
22234 | 747 |
|
15023 | 748 |
local |
10413 | 749 |
|
80697
48eaf5c85d6e
tuned signature: support more general procedures;
wenzelm
parents:
80306
diff
changeset
|
750 |
fun add_proc (proc as Procedure {name, lhs, ...}) ctxt = |
55031 | 751 |
(cond_tracing ctxt (fn () => |
61098 | 752 |
print_term ctxt ("Adding simplification procedure " ^ quote name ^ " for") lhs); |
54729
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
753 |
ctxt |> map_simpset2 |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
754 |
(fn (congs, procs, mk_rews, term_ord, subgoal_tac, loop_tacs, solvers) => |
80697
48eaf5c85d6e
tuned signature: support more general procedures;
wenzelm
parents:
80306
diff
changeset
|
755 |
(congs, Net.insert_term eq_procedure (lhs, proc) procs, |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
756 |
mk_rews, term_ord, subgoal_tac, loop_tacs, solvers)) |
15023 | 757 |
handle Net.INSERT => |
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
758 |
(cond_warning ctxt (fn () => "Ignoring duplicate simplification procedure " ^ quote name); |
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
759 |
ctxt)); |
10413 | 760 |
|
80697
48eaf5c85d6e
tuned signature: support more general procedures;
wenzelm
parents:
80306
diff
changeset
|
761 |
fun del_proc (proc as Procedure {name, lhs, ...}) ctxt = |
54729
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
762 |
ctxt |> map_simpset2 |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
763 |
(fn (congs, procs, mk_rews, term_ord, subgoal_tac, loop_tacs, solvers) => |
80697
48eaf5c85d6e
tuned signature: support more general procedures;
wenzelm
parents:
80306
diff
changeset
|
764 |
(congs, Net.delete_term eq_procedure (lhs, proc) procs, |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
765 |
mk_rews, term_ord, subgoal_tac, loop_tacs, solvers)) |
15023 | 766 |
handle Net.DELETE => |
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
767 |
(cond_warning ctxt (fn () => "Simplification procedure " ^ quote name ^ " not in simpset"); |
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
768 |
ctxt); |
10413 | 769 |
|
78812
d769a183d51d
simprocs may be distinguished via 'identifier': only works for ML antiquotation (see also 13252110a6fe);
wenzelm
parents:
78800
diff
changeset
|
770 |
fun prep_procs (Simproc {name, lhss, proc, id}) = |
80697
48eaf5c85d6e
tuned signature: support more general procedures;
wenzelm
parents:
80306
diff
changeset
|
771 |
lhss |> map (fn lhs => Procedure {name = name, lhs = lhs, proc = proc, id = id}); |
22234 | 772 |
|
15023 | 773 |
in |
10413 | 774 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
775 |
fun ctxt addsimprocs ps = fold (fold add_proc o prep_procs) ps ctxt; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
776 |
fun ctxt delsimprocs ps = fold (fold del_proc o prep_procs) ps ctxt; |
10413 | 777 |
|
15023 | 778 |
end; |
10413 | 779 |
|
780 |
||
781 |
(* mk_rews *) |
|
782 |
||
15023 | 783 |
local |
784 |
||
54729
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
785 |
fun map_mk_rews f = |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
786 |
map_simpset2 (fn (congs, procs, mk_rews, term_ord, subgoal_tac, loop_tacs, solvers) => |
54729
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
787 |
let |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
788 |
val {mk, mk_cong, mk_sym, mk_eq_True, reorient} = mk_rews; |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
789 |
val (mk', mk_cong', mk_sym', mk_eq_True', reorient') = |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
790 |
f (mk, mk_cong, mk_sym, mk_eq_True, reorient); |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
791 |
val mk_rews' = {mk = mk', mk_cong = mk_cong', mk_sym = mk_sym', mk_eq_True = mk_eq_True', |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
792 |
reorient = reorient'}; |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
793 |
in (congs, procs, mk_rews', term_ord, subgoal_tac, loop_tacs, solvers) end); |
15023 | 794 |
|
795 |
in |
|
10413 | 796 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
797 |
fun mksimps ctxt = |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
798 |
let val Simpset (_, {mk_rews = {mk, ...}, ...}) = simpset_of ctxt |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
799 |
in mk ctxt end; |
30318
3d03190d2864
replaced archaic use of rep_ss by Simplifier.mksimps;
wenzelm
parents:
29269
diff
changeset
|
800 |
|
45625
750c5a47400b
modernized some old-style infix operations, which were left over from the time of ML proof scripts;
wenzelm
parents:
45621
diff
changeset
|
801 |
fun set_mksimps mk = map_mk_rews (fn (_, mk_cong, mk_sym, mk_eq_True, reorient) => |
18208 | 802 |
(mk, mk_cong, mk_sym, mk_eq_True, reorient)); |
15023 | 803 |
|
45625
750c5a47400b
modernized some old-style infix operations, which were left over from the time of ML proof scripts;
wenzelm
parents:
45621
diff
changeset
|
804 |
fun set_mkcong mk_cong = map_mk_rews (fn (mk, _, mk_sym, mk_eq_True, reorient) => |
18208 | 805 |
(mk, mk_cong, mk_sym, mk_eq_True, reorient)); |
10413 | 806 |
|
45625
750c5a47400b
modernized some old-style infix operations, which were left over from the time of ML proof scripts;
wenzelm
parents:
45621
diff
changeset
|
807 |
fun set_mksym mk_sym = map_mk_rews (fn (mk, mk_cong, _, mk_eq_True, reorient) => |
18208 | 808 |
(mk, mk_cong, mk_sym, mk_eq_True, reorient)); |
10413 | 809 |
|
45625
750c5a47400b
modernized some old-style infix operations, which were left over from the time of ML proof scripts;
wenzelm
parents:
45621
diff
changeset
|
810 |
fun set_mkeqTrue mk_eq_True = map_mk_rews (fn (mk, mk_cong, mk_sym, _, reorient) => |
18208 | 811 |
(mk, mk_cong, mk_sym, mk_eq_True, reorient)); |
812 |
||
813 |
fun set_reorient reorient = map_mk_rews (fn (mk, mk_cong, mk_sym, mk_eq_True, _) => |
|
814 |
(mk, mk_cong, mk_sym, mk_eq_True, reorient)); |
|
15023 | 815 |
|
816 |
end; |
|
817 |
||
14242
ec70653a02bf
Added access to the mk_rews field (and friends).
skalberg
parents:
14040
diff
changeset
|
818 |
|
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
819 |
(* term_ord *) |
10413 | 820 |
|
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
821 |
fun set_term_ord term_ord = |
54731
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
822 |
map_simpset2 (fn (congs, procs, mk_rews, _, subgoal_tac, loop_tacs, solvers) => |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
823 |
(congs, procs, mk_rews, term_ord, subgoal_tac, loop_tacs, solvers)); |
15006
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
824 |
|
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
825 |
|
15023 | 826 |
(* tactics *) |
15006
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
827 |
|
45625
750c5a47400b
modernized some old-style infix operations, which were left over from the time of ML proof scripts;
wenzelm
parents:
45621
diff
changeset
|
828 |
fun set_subgoaler subgoal_tac = |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
829 |
map_simpset2 (fn (congs, procs, mk_rews, term_ord, _, loop_tacs, solvers) => |
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
830 |
(congs, procs, mk_rews, term_ord, subgoal_tac, loop_tacs, solvers)); |
15006
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
831 |
|
52037 | 832 |
fun ctxt setloop tac = ctxt |> |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
833 |
map_simpset2 (fn (congs, procs, mk_rews, term_ord, subgoal_tac, _, solvers) => |
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
834 |
(congs, procs, mk_rews, term_ord, subgoal_tac, [("", tac)], solvers)); |
15006
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
835 |
|
52037 | 836 |
fun ctxt addloop (name, tac) = ctxt |> |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
837 |
map_simpset2 (fn (congs, procs, mk_rews, term_ord, subgoal_tac, loop_tacs, solvers) => |
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
838 |
(congs, procs, mk_rews, term_ord, subgoal_tac, |
54731
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
839 |
AList.update (op =) (name, tac) loop_tacs, solvers)); |
15006
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
840 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
841 |
fun ctxt delloop name = ctxt |> |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
842 |
map_simpset2 (fn (congs, procs, mk_rews, term_ord, subgoal_tac, loop_tacs, solvers) => |
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
843 |
(congs, procs, mk_rews, term_ord, subgoal_tac, |
38834
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
844 |
(if AList.defined (op =) loop_tacs name then () |
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
845 |
else cond_warning ctxt (fn () => "No such looper in simpset: " ^ quote name); |
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
846 |
AList.delete (op =) name loop_tacs), solvers)); |
15006
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
847 |
|
54729
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
848 |
fun ctxt setSSolver solver = ctxt |> map_simpset2 |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
849 |
(fn (congs, procs, mk_rews, term_ord, subgoal_tac, loop_tacs, (unsafe_solvers, _)) => |
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
850 |
(congs, procs, mk_rews, term_ord, subgoal_tac, loop_tacs, (unsafe_solvers, [solver]))); |
15006
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
851 |
|
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
852 |
fun ctxt addSSolver solver = ctxt |> map_simpset2 (fn (congs, procs, mk_rews, term_ord, |
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
853 |
subgoal_tac, loop_tacs, (unsafe_solvers, solvers)) => (congs, procs, mk_rews, term_ord, |
54731
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
854 |
subgoal_tac, loop_tacs, (unsafe_solvers, insert eq_solver solver solvers))); |
15006
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
855 |
|
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
856 |
fun ctxt setSolver solver = ctxt |> map_simpset2 (fn (congs, procs, mk_rews, term_ord, |
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
857 |
subgoal_tac, loop_tacs, (_, solvers)) => (congs, procs, mk_rews, term_ord, |
54731
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
858 |
subgoal_tac, loop_tacs, ([solver], solvers))); |
15006
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
859 |
|
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
860 |
fun ctxt addSolver solver = ctxt |> map_simpset2 (fn (congs, procs, mk_rews, term_ord, |
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
861 |
subgoal_tac, loop_tacs, (unsafe_solvers, solvers)) => (congs, procs, mk_rews, term_ord, |
54731
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
862 |
subgoal_tac, loop_tacs, (insert eq_solver solver unsafe_solvers, solvers))); |
15006
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
863 |
|
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
864 |
fun set_solvers solvers = map_simpset2 (fn (congs, procs, mk_rews, term_ord, |
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
865 |
subgoal_tac, loop_tacs, _) => (congs, procs, mk_rews, term_ord, |
54731
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
866 |
subgoal_tac, loop_tacs, (solvers, solvers))); |
54729
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
867 |
|
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
868 |
|
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
869 |
(* trace operations *) |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
870 |
|
54731
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
871 |
type trace_ops = |
80065
60b6c735b5d5
clarified signature: prefer authentic cterm used in Simplifier, avoid potential re-certification in user-code;
wenzelm
parents:
80064
diff
changeset
|
872 |
{trace_invoke: {depth: int, cterm: cterm} -> Proof.context -> Proof.context, |
60b6c735b5d5
clarified signature: prefer authentic cterm used in Simplifier, avoid potential re-certification in user-code;
wenzelm
parents:
80064
diff
changeset
|
873 |
trace_rrule: {unconditional: bool, cterm: cterm, thm: thm, rrule: rrule} -> |
79737 | 874 |
Proof.context -> (Proof.context -> (thm * term) option) -> (thm * term) option, |
79738 | 875 |
trace_simproc: {name: string, cterm: cterm} -> |
79737 | 876 |
Proof.context -> (Proof.context -> thm option) -> thm option}; |
54729
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
877 |
|
54731
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
878 |
structure Trace_Ops = Theory_Data |
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
879 |
( |
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
880 |
type T = trace_ops; |
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
881 |
val empty: T = |
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
882 |
{trace_invoke = fn _ => fn ctxt => ctxt, |
80064
0d94dd2fd2d0
clarified names (see also 9c00a46d69d0, c5cd7a58cf2d);
wenzelm
parents:
79738
diff
changeset
|
883 |
trace_rrule = fn _ => fn ctxt => fn cont => cont ctxt, |
79737 | 884 |
trace_simproc = fn _ => fn ctxt => fn cont => cont ctxt}; |
54731
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
885 |
fun merge (trace_ops, _) = trace_ops; |
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
886 |
); |
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
887 |
|
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
888 |
val set_trace_ops = Trace_Ops.put; |
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
889 |
|
384ac33802b0
clarified Trace_Ops: global theory data avoids init of simpset in Pure.thy, which is important to act as neutral element in merge;
wenzelm
parents:
54729
diff
changeset
|
890 |
val trace_ops = Trace_Ops.get o Proof_Context.theory_of; |
54729
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
891 |
fun trace_invoke args ctxt = #trace_invoke (trace_ops ctxt) args ctxt; |
80064
0d94dd2fd2d0
clarified names (see also 9c00a46d69d0, c5cd7a58cf2d);
wenzelm
parents:
79738
diff
changeset
|
892 |
fun trace_rrule args ctxt = #trace_rrule (trace_ops ctxt) args ctxt; |
79737 | 893 |
fun trace_simproc args ctxt = #trace_simproc (trace_ops ctxt) args ctxt; |
15006
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
894 |
|
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
895 |
|
107e4dfd3b96
Merging the meta-simplifier with the Provers-simplifier. Next step:
skalberg
parents:
15001
diff
changeset
|
896 |
|
10413 | 897 |
(** rewriting **) |
898 |
||
899 |
(* |
|
900 |
Uses conversions, see: |
|
901 |
L C Paulson, A higher-order implementation of rewriting, |
|
902 |
Science of Computer Programming 3 (1983), pages 119-149. |
|
903 |
*) |
|
904 |
||
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
905 |
fun check_conv ctxt msg thm thm' = |
10413 | 906 |
let |
36944 | 907 |
val thm'' = Thm.transitive thm thm' handle THM _ => |
59690
46b635624feb
rhs of eqn is only eta- but not beta-eta-contracted; hence the latter is performed explicitly if needed
nipkow
parents:
59647
diff
changeset
|
908 |
let |
46b635624feb
rhs of eqn is only eta- but not beta-eta-contracted; hence the latter is performed explicitly if needed
nipkow
parents:
59647
diff
changeset
|
909 |
val nthm' = |
46b635624feb
rhs of eqn is only eta- but not beta-eta-contracted; hence the latter is performed explicitly if needed
nipkow
parents:
59647
diff
changeset
|
910 |
Thm.transitive (Thm.symmetric (Drule.beta_eta_conversion (Thm.lhs_of thm'))) thm' |
46b635624feb
rhs of eqn is only eta- but not beta-eta-contracted; hence the latter is performed explicitly if needed
nipkow
parents:
59647
diff
changeset
|
911 |
in Thm.transitive thm nthm' handle THM _ => |
46b635624feb
rhs of eqn is only eta- but not beta-eta-contracted; hence the latter is performed explicitly if needed
nipkow
parents:
59647
diff
changeset
|
912 |
let |
46b635624feb
rhs of eqn is only eta- but not beta-eta-contracted; hence the latter is performed explicitly if needed
nipkow
parents:
59647
diff
changeset
|
913 |
val nthm = |
46b635624feb
rhs of eqn is only eta- but not beta-eta-contracted; hence the latter is performed explicitly if needed
nipkow
parents:
59647
diff
changeset
|
914 |
Thm.transitive thm (Drule.beta_eta_conversion (Thm.rhs_of thm)) |
46b635624feb
rhs of eqn is only eta- but not beta-eta-contracted; hence the latter is performed explicitly if needed
nipkow
parents:
59647
diff
changeset
|
915 |
in Thm.transitive nthm nthm' end |
46b635624feb
rhs of eqn is only eta- but not beta-eta-contracted; hence the latter is performed explicitly if needed
nipkow
parents:
59647
diff
changeset
|
916 |
end |
80304 | 917 |
val _ = if msg then cond_tracing ctxt (fn () => print_thm0 ctxt "SUCCEEDED" thm') else (); |
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
918 |
in SOME thm'' end |
10413 | 919 |
handle THM _ => |
26626
c6231d64d264
rep_cterm/rep_thm: no longer dereference theory_ref;
wenzelm
parents:
26424
diff
changeset
|
920 |
let |
c6231d64d264
rep_cterm/rep_thm: no longer dereference theory_ref;
wenzelm
parents:
26424
diff
changeset
|
921 |
val _ $ _ $ prop0 = Thm.prop_of thm; |
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
922 |
val _ = |
55032
b49366215417
back to conditional tracing instead of noisy warning (see also 00e849f5b397): these incidents happen occasionally;
wenzelm
parents:
55031
diff
changeset
|
923 |
cond_tracing ctxt (fn () => |
80304 | 924 |
print_thm0 ctxt "Proved wrong theorem (bad subgoaler?)" thm' ^ "\n" ^ |
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
925 |
print_term ctxt "Should have proved:" prop0); |
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
926 |
in NONE end; |
10413 | 927 |
|
928 |
||
929 |
(* mk_procrule *) |
|
930 |
||
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
931 |
fun mk_procrule ctxt thm = |
70528
9b3610fe74d6
treat simproc results as atomic -- more compact proof terms;
wenzelm
parents:
70472
diff
changeset
|
932 |
let |
9b3610fe74d6
treat simproc results as atomic -- more compact proof terms;
wenzelm
parents:
70472
diff
changeset
|
933 |
val (prems, lhs, elhs, rhs, _) = decomp_simp thm |
9b3610fe74d6
treat simproc results as atomic -- more compact proof terms;
wenzelm
parents:
70472
diff
changeset
|
934 |
val thm' = Thm.close_derivation \<^here> thm; |
9b3610fe74d6
treat simproc results as atomic -- more compact proof terms;
wenzelm
parents:
70472
diff
changeset
|
935 |
in |
15023 | 936 |
if rewrite_rule_extra_vars prems lhs rhs |
80304 | 937 |
then (cond_warning ctxt (fn () => print_thm0 ctxt "Extra vars on rhs:" thm); []) |
80306 | 938 |
else [mk_rrule2 {thm = thm', name = Thm_Name.empty, lhs = lhs, elhs = elhs, perm = false}] |
10413 | 939 |
end; |
940 |
||
941 |
||
15023 | 942 |
(* rewritec: conversion to apply the meta simpset to a term *) |
10413 | 943 |
|
15023 | 944 |
(*Since the rewriting strategy is bottom-up, we avoid re-normalizing already |
945 |
normalized terms by carrying around the rhs of the rewrite rule just |
|
946 |
applied. This is called the `skeleton'. It is decomposed in parallel |
|
947 |
with the term. Once a Var is encountered, the corresponding term is |
|
948 |
already in normal form. |
|
949 |
skel0 is a dummy skeleton that is to enforce complete normalization.*) |
|
950 |
||
10413 | 951 |
val skel0 = Bound 0; |
952 |
||
15023 | 953 |
(*Use rhs as skeleton only if the lhs does not contain unnormalized bits. |
954 |
The latter may happen iff there are weak congruence rules for constants |
|
955 |
in the lhs.*) |
|
10413 | 956 |
|
15023 | 957 |
fun uncond_skel ((_, weak), (lhs, rhs)) = |
958 |
if null weak then rhs (*optimization*) |
|
51591
e4aeb102ad70
amended uncond_skel to observe notion of cong_name properly -- may affect simplification with Free congs;
wenzelm
parents:
51590
diff
changeset
|
959 |
else if exists_subterm |
e4aeb102ad70
amended uncond_skel to observe notion of cong_name properly -- may affect simplification with Free congs;
wenzelm
parents:
51590
diff
changeset
|
960 |
(fn Const (a, _) => member (op =) weak (true, a) |
e4aeb102ad70
amended uncond_skel to observe notion of cong_name properly -- may affect simplification with Free congs;
wenzelm
parents:
51590
diff
changeset
|
961 |
| Free (a, _) => member (op =) weak (false, a) |
e4aeb102ad70
amended uncond_skel to observe notion of cong_name properly -- may affect simplification with Free congs;
wenzelm
parents:
51590
diff
changeset
|
962 |
| _ => false) lhs then skel0 |
15023 | 963 |
else rhs; |
964 |
||
965 |
(*Behaves like unconditional rule if rhs does not contain vars not in the lhs. |
|
966 |
Otherwise those vars may become instantiated with unnormalized terms |
|
967 |
while the premises are solved.*) |
|
968 |
||
32797 | 969 |
fun cond_skel (args as (_, (lhs, rhs))) = |
74266 | 970 |
if Vars.subset (vars_set rhs, vars_set lhs) then uncond_skel args |
10413 | 971 |
else skel0; |
972 |
||
973 |
(* |
|
15023 | 974 |
Rewriting -- we try in order: |
10413 | 975 |
(1) beta reduction |
976 |
(2) unconditional rewrite rules |
|
977 |
(3) conditional rewrite rules |
|
978 |
(4) simplification procedures |
|
979 |
||
980 |
IMPORTANT: rewrite rules must not introduce new Vars or TVars! |
|
981 |
*) |
|
982 |
||
52091 | 983 |
fun rewritec (prover, maxt) ctxt t = |
10413 | 984 |
let |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
985 |
val Simpset ({rules, ...}, {congs, procs, term_ord, ...}) = simpset_of ctxt; |
10413 | 986 |
val eta_thm = Thm.eta_conversion t; |
22902
ac833b4bb7ee
moved some Drule operations to Thm (see more_thm.ML);
wenzelm
parents:
22892
diff
changeset
|
987 |
val eta_t' = Thm.rhs_of eta_thm; |
59582 | 988 |
val eta_t = Thm.term_of eta_t'; |
55316
885500f4aa6a
interactive simplifier trace: new panel in Isabelle/jEdit to inspect and modify simplification state
Lars Hupel <lars.hupel@mytum.de>
parents:
55032
diff
changeset
|
989 |
fun rew rrule = |
10413 | 990 |
let |
61057 | 991 |
val {thm = thm0, name, lhs, elhs = elhs0, extra, fo, perm} = rrule; |
78136 | 992 |
val thm = Thm.transfer' ctxt thm0; |
993 |
val elhs = Thm.transfer_cterm' ctxt elhs0; |
|
32797 | 994 |
val prop = Thm.prop_of thm; |
20546
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
995 |
val (rthm, elhs') = |
8923deb735ad
rrule: maintain 'extra' field for rule that contain extra vars outside elhs;
wenzelm
parents:
20330
diff
changeset
|
996 |
if maxt = ~1 orelse not extra then (thm, elhs) |
22902
ac833b4bb7ee
moved some Drule operations to Thm (see more_thm.ML);
wenzelm
parents:
22892
diff
changeset
|
997 |
else (Thm.incr_indexes (maxt + 1) thm, Thm.incr_indexes_cterm (maxt + 1) elhs); |
61057 | 998 |
|
22902
ac833b4bb7ee
moved some Drule operations to Thm (see more_thm.ML);
wenzelm
parents:
22892
diff
changeset
|
999 |
val insts = |
ac833b4bb7ee
moved some Drule operations to Thm (see more_thm.ML);
wenzelm
parents:
22892
diff
changeset
|
1000 |
if fo then Thm.first_order_match (elhs', eta_t') |
ac833b4bb7ee
moved some Drule operations to Thm (see more_thm.ML);
wenzelm
parents:
22892
diff
changeset
|
1001 |
else Thm.match (elhs', eta_t'); |
10413 | 1002 |
val thm' = Thm.instantiate insts (Thm.rename_boundvars lhs eta_t rthm); |
14643 | 1003 |
val prop' = Thm.prop_of thm'; |
74509 | 1004 |
val unconditional = Logic.no_prems prop'; |
54725 | 1005 |
val (lhs', rhs') = Logic.dest_equals (Logic.strip_imp_concl prop'); |
80065
60b6c735b5d5
clarified signature: prefer authentic cterm used in Simplifier, avoid potential re-certification in user-code;
wenzelm
parents:
80064
diff
changeset
|
1006 |
val trace_args = {unconditional = unconditional, cterm = eta_t', thm = thm', rrule = rrule}; |
10413 | 1007 |
in |
67561
f0b11413f1c9
clarified signature: prefer proper order operation;
wenzelm
parents:
66934
diff
changeset
|
1008 |
if perm andalso is_greater_equal (term_ord (rhs', lhs')) |
54725 | 1009 |
then |
55031 | 1010 |
(cond_tracing ctxt (fn () => |
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
1011 |
print_thm ctxt "Cannot apply permutative rewrite rule" (name, thm) ^ "\n" ^ |
80304 | 1012 |
print_thm0 ctxt "Term does not become smaller:" thm'); |
54725 | 1013 |
NONE) |
1014 |
else |
|
55031 | 1015 |
(cond_tracing ctxt (fn () => |
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
1016 |
print_thm ctxt "Applying instance of rewrite rule" (name, thm)); |
54725 | 1017 |
if unconditional |
1018 |
then |
|
80304 | 1019 |
(cond_tracing ctxt (fn () => print_thm0 ctxt "Rewriting:" thm'); |
80064
0d94dd2fd2d0
clarified names (see also 9c00a46d69d0, c5cd7a58cf2d);
wenzelm
parents:
79738
diff
changeset
|
1020 |
trace_rrule trace_args ctxt (fn ctxt' => |
54729
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1021 |
let |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1022 |
val lr = Logic.dest_equals prop; |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1023 |
val SOME thm'' = check_conv ctxt' false eta_thm thm'; |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1024 |
in SOME (thm'', uncond_skel (congs, lr)) end)) |
54725 | 1025 |
else |
80304 | 1026 |
(cond_tracing ctxt (fn () => print_thm0 ctxt "Trying to rewrite:" thm'); |
54725 | 1027 |
if simp_depth ctxt > Config.get ctxt simp_depth_limit |
55031 | 1028 |
then (cond_tracing ctxt (fn () => "simp_depth_limit exceeded - giving up"); NONE) |
54725 | 1029 |
else |
80064
0d94dd2fd2d0
clarified names (see also 9c00a46d69d0, c5cd7a58cf2d);
wenzelm
parents:
79738
diff
changeset
|
1030 |
trace_rrule trace_args ctxt (fn ctxt' => |
54729
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1031 |
(case prover ctxt' thm' of |
80304 | 1032 |
NONE => (cond_tracing ctxt' (fn () => print_thm0 ctxt' "FAILED" thm'); NONE) |
54729
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1033 |
| SOME thm2 => |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1034 |
(case check_conv ctxt' true eta_thm thm2 of |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1035 |
NONE => NONE |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1036 |
| SOME thm2' => |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1037 |
let |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1038 |
val concl = Logic.strip_imp_concl prop; |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1039 |
val lr = Logic.dest_equals concl; |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1040 |
in SOME (thm2', cond_skel (congs, lr)) end))))) |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1041 |
end; |
10413 | 1042 |
|
15531 | 1043 |
fun rews [] = NONE |
10413 | 1044 |
| rews (rrule :: rrules) = |
15531 | 1045 |
let val opt = rew rrule handle Pattern.MATCH => NONE |
54725 | 1046 |
in (case opt of NONE => rews rrules | some => some) end; |
10413 | 1047 |
|
38834
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1048 |
fun sort_rrules rrs = |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1049 |
let |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1050 |
fun is_simple ({thm, ...}: rrule) = |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1051 |
(case Thm.prop_of thm of |
56245 | 1052 |
Const ("Pure.eq", _) $ _ $ _ => true |
38834
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1053 |
| _ => false); |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1054 |
fun sort [] (re1, re2) = re1 @ re2 |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1055 |
| sort (rr :: rrs) (re1, re2) = |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1056 |
if is_simple rr |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1057 |
then sort rrs (rr :: re1, re2) |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1058 |
else sort rrs (re1, rr :: re2); |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1059 |
in sort rrs ([], []) end; |
10413 | 1060 |
|
15531 | 1061 |
fun proc_rews [] = NONE |
80697
48eaf5c85d6e
tuned signature: support more general procedures;
wenzelm
parents:
80306
diff
changeset
|
1062 |
| proc_rews (Procedure {name, proc, lhs, ...} :: ps) = |
61098 | 1063 |
if Pattern.matches (Proof_Context.theory_of ctxt) (lhs, Thm.term_of t) then |
55031 | 1064 |
(cond_tracing' ctxt simp_debug (fn () => |
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
1065 |
print_term ctxt ("Trying procedure " ^ quote name ^ " on:") eta_t); |
79737 | 1066 |
(let |
1067 |
val ctxt' = Config.put simp_trace (Config.get ctxt simp_debug) ctxt |
|
79738 | 1068 |
val res = trace_simproc {name = name, cterm = eta_t'} ctxt' |
79737 | 1069 |
(fn ctxt'' => Morphism.form_context' ctxt'' proc eta_t') |
1070 |
in case res of |
|
79731
6dbe7910dcfc
simplifier: no trace info from simprocs unless simp_debug = true.
nipkow
parents:
78814
diff
changeset
|
1071 |
NONE => (cond_tracing' ctxt simp_debug (fn () => "FAILED"); proc_rews ps) |
6dbe7910dcfc
simplifier: no trace info from simprocs unless simp_debug = true.
nipkow
parents:
78814
diff
changeset
|
1072 |
| SOME raw_thm => |
6dbe7910dcfc
simplifier: no trace info from simprocs unless simp_debug = true.
nipkow
parents:
78814
diff
changeset
|
1073 |
(cond_tracing ctxt (fn () => |
80304 | 1074 |
print_thm0 ctxt ("Procedure " ^ quote name ^ " produced rewrite rule:") raw_thm); |
79731
6dbe7910dcfc
simplifier: no trace info from simprocs unless simp_debug = true.
nipkow
parents:
78814
diff
changeset
|
1075 |
(case rews (mk_procrule ctxt raw_thm) of |
6dbe7910dcfc
simplifier: no trace info from simprocs unless simp_debug = true.
nipkow
parents:
78814
diff
changeset
|
1076 |
NONE => |
6dbe7910dcfc
simplifier: no trace info from simprocs unless simp_debug = true.
nipkow
parents:
78814
diff
changeset
|
1077 |
(cond_tracing ctxt (fn () => |
6dbe7910dcfc
simplifier: no trace info from simprocs unless simp_debug = true.
nipkow
parents:
78814
diff
changeset
|
1078 |
print_term ctxt ("IGNORED result of simproc " ^ quote name ^ |
6dbe7910dcfc
simplifier: no trace info from simprocs unless simp_debug = true.
nipkow
parents:
78814
diff
changeset
|
1079 |
" -- does not match") (Thm.term_of t)); |
6dbe7910dcfc
simplifier: no trace info from simprocs unless simp_debug = true.
nipkow
parents:
78814
diff
changeset
|
1080 |
proc_rews ps) |
6dbe7910dcfc
simplifier: no trace info from simprocs unless simp_debug = true.
nipkow
parents:
78814
diff
changeset
|
1081 |
| some => some)) |
6dbe7910dcfc
simplifier: no trace info from simprocs unless simp_debug = true.
nipkow
parents:
78814
diff
changeset
|
1082 |
end)) |
10413 | 1083 |
else proc_rews ps; |
38834
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1084 |
in |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1085 |
(case eta_t of |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1086 |
Abs _ $ _ => SOME (Thm.transitive eta_thm (Thm.beta_conversion false eta_t'), skel0) |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1087 |
| _ => |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1088 |
(case rews (sort_rrules (Net.match_term rules eta_t)) of |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1089 |
NONE => proc_rews (Net.match_term procs eta_t) |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1090 |
| some => some)) |
10413 | 1091 |
end; |
1092 |
||
1093 |
||
1094 |
(* conversion to apply a congruence rule to a term *) |
|
1095 |
||
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1096 |
fun congc prover ctxt maxt cong t = |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1097 |
let |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1098 |
val rthm = Thm.incr_indexes (maxt + 1) cong; |
59582 | 1099 |
val rlhs = fst (Thm.dest_equals (Drule.strip_imp_concl (Thm.cprop_of rthm))); |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1100 |
val insts = Thm.match (rlhs, t) |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1101 |
(* Thm.match can raise Pattern.MATCH; |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1102 |
is handled when congc is called *) |
59582 | 1103 |
val thm' = |
1104 |
Thm.instantiate insts (Thm.rename_boundvars (Thm.term_of rlhs) (Thm.term_of t) rthm); |
|
80304 | 1105 |
val _ = cond_tracing ctxt (fn () => print_thm0 ctxt "Applying congruence rule:" thm'); |
1106 |
fun err (msg, thm) = (cond_tracing ctxt (fn () => print_thm0 ctxt msg thm); NONE); |
|
38834
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1107 |
in |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1108 |
(case prover thm' of |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1109 |
NONE => err ("Congruence proof failed. Could not prove", thm') |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1110 |
| SOME thm2 => |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1111 |
(case check_conv ctxt true (Drule.beta_eta_conversion t) thm2 of |
15531 | 1112 |
NONE => err ("Congruence proof failed. Should not have proved", thm2) |
1113 |
| SOME thm2' => |
|
59582 | 1114 |
if op aconv (apply2 Thm.term_of (Thm.dest_equals (Thm.cprop_of thm2'))) |
38834
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1115 |
then NONE else SOME thm2')) |
10413 | 1116 |
end; |
1117 |
||
60642
48dd1cefb4ae
simplified Thm.instantiate and derivatives: the LHS refers to non-certified variables -- this merely serves as index into already certified structures (or is ignored);
wenzelm
parents:
60324
diff
changeset
|
1118 |
val vA = (("A", 0), propT); |
48dd1cefb4ae
simplified Thm.instantiate and derivatives: the LHS refers to non-certified variables -- this merely serves as index into already certified structures (or is ignored);
wenzelm
parents:
60324
diff
changeset
|
1119 |
val vB = (("B", 0), propT); |
48dd1cefb4ae
simplified Thm.instantiate and derivatives: the LHS refers to non-certified variables -- this merely serves as index into already certified structures (or is ignored);
wenzelm
parents:
60324
diff
changeset
|
1120 |
val vC = (("C", 0), propT); |
10413 | 1121 |
|
15531 | 1122 |
fun transitive1 NONE NONE = NONE |
1123 |
| transitive1 (SOME thm1) NONE = SOME thm1 |
|
1124 |
| transitive1 NONE (SOME thm2) = SOME thm2 |
|
54725 | 1125 |
| transitive1 (SOME thm1) (SOME thm2) = SOME (Thm.transitive thm1 thm2); |
10413 | 1126 |
|
15531 | 1127 |
fun transitive2 thm = transitive1 (SOME thm); |
1128 |
fun transitive3 thm = transitive1 thm o SOME; |
|
13607
6908230623a3
Completely reimplemented mutual simplification of premises.
berghofe
parents:
13569
diff
changeset
|
1129 |
|
52091 | 1130 |
fun bottomc ((simprem, useprem, mutsimp), prover, maxidx) = |
10413 | 1131 |
let |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1132 |
fun botc skel ctxt t = |
54725 | 1133 |
if is_Var skel then NONE |
1134 |
else |
|
1135 |
(case subc skel ctxt t of |
|
1136 |
some as SOME thm1 => |
|
1137 |
(case rewritec (prover, maxidx) ctxt (Thm.rhs_of thm1) of |
|
1138 |
SOME (thm2, skel2) => |
|
1139 |
transitive2 (Thm.transitive thm1 thm2) |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1140 |
(botc skel2 ctxt (Thm.rhs_of thm2)) |
54725 | 1141 |
| NONE => some) |
1142 |
| NONE => |
|
1143 |
(case rewritec (prover, maxidx) ctxt t of |
|
1144 |
SOME (thm2, skel2) => transitive2 thm2 |
|
1145 |
(botc skel2 ctxt (Thm.rhs_of thm2)) |
|
1146 |
| NONE => NONE)) |
|
10413 | 1147 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1148 |
and try_botc ctxt t = |
54725 | 1149 |
(case botc skel0 ctxt t of |
1150 |
SOME trec1 => trec1 |
|
1151 |
| NONE => Thm.reflexive t) |
|
10413 | 1152 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1153 |
and subc skel ctxt t0 = |
55014
a93f496f6c30
general notion of auxiliary bounds within context;
wenzelm
parents:
55000
diff
changeset
|
1154 |
let val Simpset (_, {congs, ...}) = simpset_of ctxt in |
59582 | 1155 |
(case Thm.term_of t0 of |
74525
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74518
diff
changeset
|
1156 |
Abs (a, _, _) => |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1157 |
let |
74525
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74518
diff
changeset
|
1158 |
val ((v, t'), ctxt') = Variable.dest_abs_cterm t0 ctxt; |
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74518
diff
changeset
|
1159 |
val skel' = (case skel of Abs (_, _, sk) => sk | _ => skel0); |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1160 |
in |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1161 |
(case botc skel' ctxt' t' of |
74525
c960bfcb91db
discontinued Term.dest_abs / Logic.dest_all, which are officially superseded by Variable.dest_abs etc., but there are also Term.dest_abs_global to recover existing tools easily;
wenzelm
parents:
74518
diff
changeset
|
1162 |
SOME thm => SOME (Thm.abstract_rule a v thm) |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1163 |
| NONE => NONE) |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1164 |
end |
54725 | 1165 |
| t $ _ => |
1166 |
(case t of |
|
56245 | 1167 |
Const ("Pure.imp", _) $ _ => impc t0 ctxt |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1168 |
| Abs _ => |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1169 |
let val thm = Thm.beta_conversion false t0 |
54725 | 1170 |
in |
1171 |
(case subc skel0 ctxt (Thm.rhs_of thm) of |
|
1172 |
NONE => SOME thm |
|
1173 |
| SOME thm' => SOME (Thm.transitive thm thm')) |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1174 |
end |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1175 |
| _ => |
54727 | 1176 |
let |
1177 |
fun appc () = |
|
1178 |
let |
|
1179 |
val (tskel, uskel) = |
|
1180 |
(case skel of |
|
1181 |
tskel $ uskel => (tskel, uskel) |
|
1182 |
| _ => (skel0, skel0)); |
|
1183 |
val (ct, cu) = Thm.dest_comb t0; |
|
1184 |
in |
|
1185 |
(case botc tskel ctxt ct of |
|
1186 |
SOME thm1 => |
|
1187 |
(case botc uskel ctxt cu of |
|
1188 |
SOME thm2 => SOME (Thm.combination thm1 thm2) |
|
1189 |
| NONE => SOME (Thm.combination thm1 (Thm.reflexive cu))) |
|
1190 |
| NONE => |
|
1191 |
(case botc uskel ctxt cu of |
|
1192 |
SOME thm1 => SOME (Thm.combination (Thm.reflexive ct) thm1) |
|
1193 |
| NONE => NONE)) |
|
1194 |
end; |
|
1195 |
val (h, ts) = strip_comb t; |
|
54725 | 1196 |
in |
1197 |
(case cong_name h of |
|
1198 |
SOME a => |
|
71239 | 1199 |
(case Congtab.lookup (fst congs) a of |
61095 | 1200 |
NONE => appc () |
54725 | 1201 |
| SOME cong => |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1202 |
(*post processing: some partial applications h t1 ... tj, j <= length ts, |
67721 | 1203 |
may be a redex. Example: map (\<lambda>x. x) = (\<lambda>xs. xs) wrt map_cong*) |
54725 | 1204 |
(let |
1205 |
val thm = congc (prover ctxt) ctxt maxidx cong t0; |
|
1206 |
val t = the_default t0 (Option.map Thm.rhs_of thm); |
|
1207 |
val (cl, cr) = Thm.dest_comb t |
|
1208 |
val dVar = Var(("", 0), dummyT) |
|
1209 |
val skel = |
|
1210 |
list_comb (h, replicate (length ts) dVar) |
|
1211 |
in |
|
1212 |
(case botc skel ctxt cl of |
|
1213 |
NONE => thm |
|
1214 |
| SOME thm' => |
|
1215 |
transitive3 thm (Thm.combination thm' (Thm.reflexive cr))) |
|
1216 |
end handle Pattern.MATCH => appc ())) |
|
1217 |
| _ => appc ()) |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1218 |
end) |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1219 |
| _ => NONE) |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1220 |
end |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1221 |
and impc ct ctxt = |
54725 | 1222 |
if mutsimp then mut_impc0 [] ct [] [] ctxt |
1223 |
else nonmut_impc ct ctxt |
|
10413 | 1224 |
|
54984
da70ab8531f4
more elementary management of declared hyps, below structure Assumption;
wenzelm
parents:
54982
diff
changeset
|
1225 |
and rules_of_prem prem ctxt = |
59582 | 1226 |
if maxidx_of_term (Thm.term_of prem) <> ~1 |
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
1227 |
then |
55031 | 1228 |
(cond_tracing ctxt (fn () => |
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
1229 |
print_term ctxt "Cannot add premise as rewrite rule because it contains (type) unknowns:" |
59582 | 1230 |
(Thm.term_of prem)); |
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
1231 |
(([], NONE), ctxt)) |
13607
6908230623a3
Completely reimplemented mutual simplification of premises.
berghofe
parents:
13569
diff
changeset
|
1232 |
else |
54984
da70ab8531f4
more elementary management of declared hyps, below structure Assumption;
wenzelm
parents:
54982
diff
changeset
|
1233 |
let val (asm, ctxt') = Thm.assume_hyps prem ctxt |
da70ab8531f4
more elementary management of declared hyps, below structure Assumption;
wenzelm
parents:
54982
diff
changeset
|
1234 |
in ((extract_safe_rrules ctxt' asm, SOME asm), ctxt') end |
10413 | 1235 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1236 |
and add_rrules (rrss, asms) ctxt = |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1237 |
(fold o fold) insert_rrule rrss ctxt |> add_prems (map_filter I asms) |
10413 | 1238 |
|
23178 | 1239 |
and disch r prem eq = |
13607
6908230623a3
Completely reimplemented mutual simplification of premises.
berghofe
parents:
13569
diff
changeset
|
1240 |
let |
22902
ac833b4bb7ee
moved some Drule operations to Thm (see more_thm.ML);
wenzelm
parents:
22892
diff
changeset
|
1241 |
val (lhs, rhs) = Thm.dest_equals (Thm.cprop_of eq); |
54727 | 1242 |
val eq' = |
1243 |
Thm.implies_elim |
|
77879 | 1244 |
(Thm.instantiate (TVars.empty, Vars.make3 (vA, prem) (vB, lhs) (vC, rhs)) |
74282 | 1245 |
Drule.imp_cong) |
54727 | 1246 |
(Thm.implies_intr prem eq); |
54725 | 1247 |
in |
1248 |
if not r then eq' |
|
1249 |
else |
|
1250 |
let |
|
1251 |
val (prem', concl) = Thm.dest_implies lhs; |
|
54727 | 1252 |
val (prem'', _) = Thm.dest_implies rhs; |
1253 |
in |
|
1254 |
Thm.transitive |
|
1255 |
(Thm.transitive |
|
77879 | 1256 |
(Thm.instantiate (TVars.empty, Vars.make3 (vA, prem') (vB, prem) (vC, concl)) |
74282 | 1257 |
Drule.swap_prems_eq) |
54727 | 1258 |
eq') |
77879 | 1259 |
(Thm.instantiate (TVars.empty, Vars.make3 (vA, prem) (vB, prem'') (vC, concl)) |
74282 | 1260 |
Drule.swap_prems_eq) |
54725 | 1261 |
end |
10413 | 1262 |
end |
1263 |
||
13607
6908230623a3
Completely reimplemented mutual simplification of premises.
berghofe
parents:
13569
diff
changeset
|
1264 |
and rebuild [] _ _ _ _ eq = eq |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1265 |
| rebuild (prem :: prems) concl (_ :: rrss) (_ :: asms) ctxt eq = |
13607
6908230623a3
Completely reimplemented mutual simplification of premises.
berghofe
parents:
13569
diff
changeset
|
1266 |
let |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1267 |
val ctxt' = add_rrules (rev rrss, rev asms) ctxt; |
13607
6908230623a3
Completely reimplemented mutual simplification of premises.
berghofe
parents:
13569
diff
changeset
|
1268 |
val concl' = |
22902
ac833b4bb7ee
moved some Drule operations to Thm (see more_thm.ML);
wenzelm
parents:
22892
diff
changeset
|
1269 |
Drule.mk_implies (prem, the_default concl (Option.map Thm.rhs_of eq)); |
54727 | 1270 |
val dprem = Option.map (disch false prem); |
38834
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1271 |
in |
52091 | 1272 |
(case rewritec (prover, maxidx) ctxt' concl' of |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1273 |
NONE => rebuild prems concl' rrss asms ctxt (dprem eq) |
54727 | 1274 |
| SOME (eq', _) => |
1275 |
transitive2 (fold (disch false) prems (the (transitive3 (dprem eq) eq'))) |
|
1276 |
(mut_impc0 (rev prems) (Thm.rhs_of eq') (rev rrss) (rev asms) ctxt)) |
|
13607
6908230623a3
Completely reimplemented mutual simplification of premises.
berghofe
parents:
13569
diff
changeset
|
1277 |
end |
15023 | 1278 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1279 |
and mut_impc0 prems concl rrss asms ctxt = |
13607
6908230623a3
Completely reimplemented mutual simplification of premises.
berghofe
parents:
13569
diff
changeset
|
1280 |
let |
6908230623a3
Completely reimplemented mutual simplification of premises.
berghofe
parents:
13569
diff
changeset
|
1281 |
val prems' = strip_imp_prems concl; |
54984
da70ab8531f4
more elementary management of declared hyps, below structure Assumption;
wenzelm
parents:
54982
diff
changeset
|
1282 |
val ((rrss', asms'), ctxt') = fold_map rules_of_prem prems' ctxt |>> split_list; |
38834
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1283 |
in |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1284 |
mut_impc (prems @ prems') (strip_imp_concl concl) (rrss @ rrss') |
54984
da70ab8531f4
more elementary management of declared hyps, below structure Assumption;
wenzelm
parents:
54982
diff
changeset
|
1285 |
(asms @ asms') [] [] [] [] ctxt' ~1 ~1 |
13607
6908230623a3
Completely reimplemented mutual simplification of premises.
berghofe
parents:
13569
diff
changeset
|
1286 |
end |
15023 | 1287 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1288 |
and mut_impc [] concl [] [] prems' rrss' asms' eqns ctxt changed k = |
33245 | 1289 |
transitive1 (fold (fn (eq1, prem) => fn eq2 => transitive1 eq1 |
1290 |
(Option.map (disch false prem) eq2)) (eqns ~~ prems') NONE) |
|
13607
6908230623a3
Completely reimplemented mutual simplification of premises.
berghofe
parents:
13569
diff
changeset
|
1291 |
(if changed > 0 then |
6908230623a3
Completely reimplemented mutual simplification of premises.
berghofe
parents:
13569
diff
changeset
|
1292 |
mut_impc (rev prems') concl (rev rrss') (rev asms') |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1293 |
[] [] [] [] ctxt ~1 changed |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1294 |
else rebuild prems' concl rrss' asms' ctxt |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1295 |
(botc skel0 (add_rrules (rev rrss', rev asms') ctxt) concl)) |
13607
6908230623a3
Completely reimplemented mutual simplification of premises.
berghofe
parents:
13569
diff
changeset
|
1296 |
|
6908230623a3
Completely reimplemented mutual simplification of premises.
berghofe
parents:
13569
diff
changeset
|
1297 |
| mut_impc (prem :: prems) concl (rrs :: rrss) (asm :: asms) |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1298 |
prems' rrss' asms' eqns ctxt changed k = |
54725 | 1299 |
(case (if k = 0 then NONE else botc skel0 (add_rrules |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1300 |
(rev rrss' @ rrss, rev asms' @ asms) ctxt) prem) of |
15531 | 1301 |
NONE => mut_impc prems concl rrss asms (prem :: prems') |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1302 |
(rrs :: rrss') (asm :: asms') (NONE :: eqns) ctxt changed |
13607
6908230623a3
Completely reimplemented mutual simplification of premises.
berghofe
parents:
13569
diff
changeset
|
1303 |
(if k = 0 then 0 else k - 1) |
54725 | 1304 |
| SOME eqn => |
13607
6908230623a3
Completely reimplemented mutual simplification of premises.
berghofe
parents:
13569
diff
changeset
|
1305 |
let |
22902
ac833b4bb7ee
moved some Drule operations to Thm (see more_thm.ML);
wenzelm
parents:
22892
diff
changeset
|
1306 |
val prem' = Thm.rhs_of eqn; |
59582 | 1307 |
val tprems = map Thm.term_of prems; |
77863
760515c45864
revert b43ee37926a9 due to problems with AFP/PAPP_Impossibility;
wenzelm
parents:
77808
diff
changeset
|
1308 |
val i = 1 + fold Integer.max (map (fn p => |
760515c45864
revert b43ee37926a9 due to problems with AFP/PAPP_Impossibility;
wenzelm
parents:
77808
diff
changeset
|
1309 |
find_index (fn q => q aconv p) tprems) (Thm.hyps_of eqn)) ~1; |
54984
da70ab8531f4
more elementary management of declared hyps, below structure Assumption;
wenzelm
parents:
54982
diff
changeset
|
1310 |
val ((rrs', asm'), ctxt') = rules_of_prem prem' ctxt; |
54725 | 1311 |
in |
1312 |
mut_impc prems concl rrss asms (prem' :: prems') |
|
1313 |
(rrs' :: rrss') (asm' :: asms') |
|
1314 |
(SOME (fold_rev (disch true) |
|
1315 |
(take i prems) |
|
1316 |
(Drule.imp_cong_rule eqn (Thm.reflexive (Drule.list_implies |
|
1317 |
(drop i prems, concl))))) :: eqns) |
|
54984
da70ab8531f4
more elementary management of declared hyps, below structure Assumption;
wenzelm
parents:
54982
diff
changeset
|
1318 |
ctxt' (length prems') ~1 |
54725 | 1319 |
end) |
13607
6908230623a3
Completely reimplemented mutual simplification of premises.
berghofe
parents:
13569
diff
changeset
|
1320 |
|
54725 | 1321 |
(*legacy code -- only for backwards compatibility*) |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1322 |
and nonmut_impc ct ctxt = |
38834
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1323 |
let |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1324 |
val (prem, conc) = Thm.dest_implies ct; |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1325 |
val thm1 = if simprem then botc skel0 ctxt prem else NONE; |
38834
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1326 |
val prem1 = the_default prem (Option.map Thm.rhs_of thm1); |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1327 |
val ctxt1 = |
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1328 |
if not useprem then ctxt |
54984
da70ab8531f4
more elementary management of declared hyps, below structure Assumption;
wenzelm
parents:
54982
diff
changeset
|
1329 |
else |
da70ab8531f4
more elementary management of declared hyps, below structure Assumption;
wenzelm
parents:
54982
diff
changeset
|
1330 |
let val ((rrs, asm), ctxt') = rules_of_prem prem1 ctxt |
da70ab8531f4
more elementary management of declared hyps, below structure Assumption;
wenzelm
parents:
54982
diff
changeset
|
1331 |
in add_rrules ([rrs], [asm]) ctxt' end; |
38834
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1332 |
in |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1333 |
(case botc skel0 ctxt1 conc of |
38834
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1334 |
NONE => |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1335 |
(case thm1 of |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1336 |
NONE => NONE |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1337 |
| SOME thm1' => SOME (Drule.imp_cong_rule thm1' (Thm.reflexive conc))) |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1338 |
| SOME thm2 => |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1339 |
let val thm2' = disch false prem1 thm2 in |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1340 |
(case thm1 of |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1341 |
NONE => SOME thm2' |
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1342 |
| SOME thm1' => |
36944 | 1343 |
SOME (Thm.transitive (Drule.imp_cong_rule thm1' (Thm.reflexive conc)) thm2')) |
38834
658fcba35ed7
more careful treatment of context visibility flag wrt. spurious warnings;
wenzelm
parents:
38715
diff
changeset
|
1344 |
end) |
54725 | 1345 |
end; |
10413 | 1346 |
|
54725 | 1347 |
in try_botc end; |
10413 | 1348 |
|
1349 |
||
67721 | 1350 |
(* Meta-rewriting: rewrites t to u and returns the theorem t \<equiv> u *) |
10413 | 1351 |
|
1352 |
(* |
|
1353 |
Parameters: |
|
1354 |
mode = (simplify A, |
|
1355 |
use A in simplifying B, |
|
1356 |
use prems of B (if B is again a meta-impl.) to simplify A) |
|
67721 | 1357 |
when simplifying A \<Longrightarrow> B |
10413 | 1358 |
prover: how to solve premises in conditional rewrites and congruences |
1359 |
*) |
|
1360 |
||
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1361 |
fun rewrite_cterm mode prover raw_ctxt raw_ct = |
17882
b6e44fc46cf0
added set/addloop' for simpset dependent loopers;
wenzelm
parents:
17756
diff
changeset
|
1362 |
let |
60324 | 1363 |
val ct = raw_ct |
78136 | 1364 |
|> Thm.transfer_cterm' raw_ctxt |
60324 | 1365 |
|> Thm.adjust_maxidx_cterm ~1; |
59586 | 1366 |
val maxidx = Thm.maxidx_of_cterm ct; |
52091 | 1367 |
|
54729
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1368 |
val ctxt = |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1369 |
raw_ctxt |
71318
1be996d8bb98
proper proof body context for Simplifier plugins (solvers, loopers, ...) -- avoid crash due to Subgoal.FOCUS (before e58bc223f46c);
wenzelm
parents:
71239
diff
changeset
|
1370 |
|> Variable.set_body true |
54729
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1371 |
|> Context_Position.set_visible false |
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1372 |
|> inc_simp_depth |
80065
60b6c735b5d5
clarified signature: prefer authentic cterm used in Simplifier, avoid potential re-certification in user-code;
wenzelm
parents:
80064
diff
changeset
|
1373 |
|> (fn ctxt => trace_invoke {depth = simp_depth ctxt, cterm = ct} ctxt); |
54729
c5cd7a58cf2d
generic trace operations for main steps of Simplifier;
wenzelm
parents:
54728
diff
changeset
|
1374 |
|
55028
00e849f5b397
clarified Simplifier diagnostics -- simplified ML;
wenzelm
parents:
55014
diff
changeset
|
1375 |
val _ = |
55031 | 1376 |
cond_tracing ctxt (fn () => |
59582 | 1377 |
print_term ctxt "SIMPLIFIER INVOKED ON THE FOLLOWING TERM:" (Thm.term_of ct)); |
70472
cf66d2db97fe
more robust and convenient treatment of implicit context;
wenzelm
parents:
69575
diff
changeset
|
1378 |
in |
cf66d2db97fe
more robust and convenient treatment of implicit context;
wenzelm
parents:
69575
diff
changeset
|
1379 |
ct |
cf66d2db97fe
more robust and convenient treatment of implicit context;
wenzelm
parents:
69575
diff
changeset
|
1380 |
|> bottomc (mode, Option.map (Drule.flexflex_unique (SOME ctxt)) oo prover, maxidx) ctxt |
cf66d2db97fe
more robust and convenient treatment of implicit context;
wenzelm
parents:
69575
diff
changeset
|
1381 |
|> Thm.solve_constraints |
cf66d2db97fe
more robust and convenient treatment of implicit context;
wenzelm
parents:
69575
diff
changeset
|
1382 |
end; |
10413 | 1383 |
|
21708 | 1384 |
val simple_prover = |
59498
50b60f501b05
proper context for resolve_tac, eresolve_tac, dresolve_tac, forward_tac etc.;
wenzelm
parents:
59058
diff
changeset
|
1385 |
SINGLE o (fn ctxt => ALLGOALS (resolve_tac ctxt (prems_of ctxt))); |
21708 | 1386 |
|
78453
3fdf3c5cfa9d
performance tuning: prefer static simpset within functional closure of morphism (with notable impact on specifications "in" class, e.g. AFP/No_FTL_observers);
wenzelm
parents:
78136
diff
changeset
|
1387 |
fun rewrite0 ctxt full = rewrite_cterm (full, false, false) simple_prover ctxt; |
3fdf3c5cfa9d
performance tuning: prefer static simpset within functional closure of morphism (with notable impact on specifications "in" class, e.g. AFP/No_FTL_observers);
wenzelm
parents:
78136
diff
changeset
|
1388 |
|
54742
7a86358a3c0b
proper context for basic Simplifier operations: rewrite_rule, rewrite_goals_rule, rewrite_goals_tac etc.;
wenzelm
parents:
54731
diff
changeset
|
1389 |
fun rewrite _ _ [] = Thm.reflexive |
78453
3fdf3c5cfa9d
performance tuning: prefer static simpset within functional closure of morphism (with notable impact on specifications "in" class, e.g. AFP/No_FTL_observers);
wenzelm
parents:
78136
diff
changeset
|
1390 |
| rewrite ctxt full thms = rewrite0 (init_simpset thms ctxt) full; |
11672 | 1391 |
|
78453
3fdf3c5cfa9d
performance tuning: prefer static simpset within functional closure of morphism (with notable impact on specifications "in" class, e.g. AFP/No_FTL_observers);
wenzelm
parents:
78136
diff
changeset
|
1392 |
fun rewrite0_rule ctxt = Conv.fconv_rule (rewrite0 ctxt true); |
54742
7a86358a3c0b
proper context for basic Simplifier operations: rewrite_rule, rewrite_goals_rule, rewrite_goals_tac etc.;
wenzelm
parents:
54731
diff
changeset
|
1393 |
fun rewrite_rule ctxt = Conv.fconv_rule o rewrite ctxt true; |
21708 | 1394 |
|
15023 | 1395 |
(*simple term rewriting -- no proof*) |
16458 | 1396 |
fun rewrite_term thy rules procs = |
17203 | 1397 |
Pattern.rewrite_term thy (map decomp_simp' rules) procs; |
15023 | 1398 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1399 |
fun rewrite_thm mode prover ctxt = Conv.fconv_rule (rewrite_cterm mode prover ctxt); |
10413 | 1400 |
|
23536
60a1672e298e
moved (asm_)rewrite_goal_tac from goal.ML to meta_simplifier.ML (no longer depends on SELECT_GOAL);
wenzelm
parents:
23221
diff
changeset
|
1401 |
(*Rewrite the subgoals of a proof state (represented by a theorem)*) |
54742
7a86358a3c0b
proper context for basic Simplifier operations: rewrite_rule, rewrite_goals_rule, rewrite_goals_tac etc.;
wenzelm
parents:
54731
diff
changeset
|
1402 |
fun rewrite_goals_rule ctxt thms th = |
23584 | 1403 |
Conv.fconv_rule (Conv.prems_conv ~1 (rewrite_cterm (true, true, true) simple_prover |
63221
7d43fbbaba28
avoid warnings on duplicate rules in the given list;
wenzelm
parents:
62913
diff
changeset
|
1404 |
(init_simpset thms ctxt))) th; |
10413 | 1405 |
|
20228
e0f9e8a6556b
moved Goal.norm_hhf(_protect) to meta_simplifier.ML (pervasive);
wenzelm
parents:
20197
diff
changeset
|
1406 |
|
21708 | 1407 |
(** meta-rewriting tactics **) |
1408 |
||
28839
32d498cf7595
eliminated rewrite_tac/fold_tac, which are not well-formed tactics due to change of main conclusion;
wenzelm
parents:
28620
diff
changeset
|
1409 |
(*Rewrite all subgoals*) |
54742
7a86358a3c0b
proper context for basic Simplifier operations: rewrite_rule, rewrite_goals_rule, rewrite_goals_tac etc.;
wenzelm
parents:
54731
diff
changeset
|
1410 |
fun rewrite_goals_tac ctxt defs = PRIMITIVE (rewrite_goals_rule ctxt defs); |
21708 | 1411 |
|
28839
32d498cf7595
eliminated rewrite_tac/fold_tac, which are not well-formed tactics due to change of main conclusion;
wenzelm
parents:
28620
diff
changeset
|
1412 |
(*Rewrite one subgoal*) |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1413 |
fun generic_rewrite_goal_tac mode prover_tac ctxt i thm = |
25203
e5b2dd8db7c8
asm_rewrite_goal_tac: avoiding PRIMITIVE lets informative exceptions (from simprocs) get through;
wenzelm
parents:
24707
diff
changeset
|
1414 |
if 0 < i andalso i <= Thm.nprems_of thm then |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1415 |
Seq.single (Conv.gconv_rule (rewrite_cterm mode (SINGLE o prover_tac) ctxt) i thm) |
25203
e5b2dd8db7c8
asm_rewrite_goal_tac: avoiding PRIMITIVE lets informative exceptions (from simprocs) get through;
wenzelm
parents:
24707
diff
changeset
|
1416 |
else Seq.empty; |
23536
60a1672e298e
moved (asm_)rewrite_goal_tac from goal.ML to meta_simplifier.ML (no longer depends on SELECT_GOAL);
wenzelm
parents:
23221
diff
changeset
|
1417 |
|
63221
7d43fbbaba28
avoid warnings on duplicate rules in the given list;
wenzelm
parents:
62913
diff
changeset
|
1418 |
fun rewrite_goal_tac ctxt thms = |
7d43fbbaba28
avoid warnings on duplicate rules in the given list;
wenzelm
parents:
62913
diff
changeset
|
1419 |
generic_rewrite_goal_tac (true, false, false) (K no_tac) (init_simpset thms ctxt); |
23536
60a1672e298e
moved (asm_)rewrite_goal_tac from goal.ML to meta_simplifier.ML (no longer depends on SELECT_GOAL);
wenzelm
parents:
23221
diff
changeset
|
1420 |
|
46707 | 1421 |
(*Prunes all redundant parameters from the proof state by rewriting.*) |
54742
7a86358a3c0b
proper context for basic Simplifier operations: rewrite_rule, rewrite_goals_rule, rewrite_goals_tac etc.;
wenzelm
parents:
54731
diff
changeset
|
1422 |
fun prune_params_tac ctxt = rewrite_goals_tac ctxt [Drule.triv_forall_equality]; |
21708 | 1423 |
|
1424 |
||
1425 |
(* for folding definitions, handling critical pairs *) |
|
1426 |
||
1427 |
(*The depth of nesting in a term*) |
|
32797 | 1428 |
fun term_depth (Abs (_, _, t)) = 1 + term_depth t |
1429 |
| term_depth (f $ t) = 1 + Int.max (term_depth f, term_depth t) |
|
21708 | 1430 |
| term_depth _ = 0; |
1431 |
||
59582 | 1432 |
val lhs_of_thm = #1 o Logic.dest_equals o Thm.prop_of; |
21708 | 1433 |
|
67721 | 1434 |
(*folding should handle critical pairs! E.g. K \<equiv> Inl 0, S \<equiv> Inr (Inl 0) |
21708 | 1435 |
Returns longest lhs first to avoid folding its subexpressions.*) |
1436 |
fun sort_lhs_depths defs = |
|
1437 |
let val keylist = AList.make (term_depth o lhs_of_thm) defs |
|
1438 |
val keys = sort_distinct (rev_order o int_ord) (map #2 keylist) |
|
1439 |
in map (AList.find (op =) keylist) keys end; |
|
1440 |
||
36944 | 1441 |
val rev_defs = sort_lhs_depths o map Thm.symmetric; |
21708 | 1442 |
|
54742
7a86358a3c0b
proper context for basic Simplifier operations: rewrite_rule, rewrite_goals_rule, rewrite_goals_tac etc.;
wenzelm
parents:
54731
diff
changeset
|
1443 |
fun fold_rule ctxt defs = fold (rewrite_rule ctxt) (rev_defs defs); |
7a86358a3c0b
proper context for basic Simplifier operations: rewrite_rule, rewrite_goals_rule, rewrite_goals_tac etc.;
wenzelm
parents:
54731
diff
changeset
|
1444 |
fun fold_goals_tac ctxt defs = EVERY (map (rewrite_goals_tac ctxt) (rev_defs defs)); |
21708 | 1445 |
|
1446 |
||
67721 | 1447 |
(* HHF normal form: \<And> before \<Longrightarrow>, outermost \<And> generalized *) |
20228
e0f9e8a6556b
moved Goal.norm_hhf(_protect) to meta_simplifier.ML (pervasive);
wenzelm
parents:
20197
diff
changeset
|
1448 |
|
e0f9e8a6556b
moved Goal.norm_hhf(_protect) to meta_simplifier.ML (pervasive);
wenzelm
parents:
20197
diff
changeset
|
1449 |
local |
e0f9e8a6556b
moved Goal.norm_hhf(_protect) to meta_simplifier.ML (pervasive);
wenzelm
parents:
20197
diff
changeset
|
1450 |
|
78046
78deba4fdf27
tuned: more accurate check (is_norm_hhf protect);
wenzelm
parents:
77879
diff
changeset
|
1451 |
fun gen_norm_hhf protect ss ctxt0 th0 = |
71177 | 1452 |
let |
1453 |
val (ctxt, th) = Thm.join_transfer_context (ctxt0, th0); |
|
1454 |
val th' = |
|
78046
78deba4fdf27
tuned: more accurate check (is_norm_hhf protect);
wenzelm
parents:
77879
diff
changeset
|
1455 |
if Drule.is_norm_hhf protect (Thm.prop_of th) then th |
71177 | 1456 |
else |
1457 |
Conv.fconv_rule (rewrite_cterm (true, false, false) (K (K NONE)) (put_simpset ss ctxt)) th; |
|
1458 |
in th' |> Thm.adjust_maxidx_thm ~1 |> Variable.gen_all ctxt end; |
|
20228
e0f9e8a6556b
moved Goal.norm_hhf(_protect) to meta_simplifier.ML (pervasive);
wenzelm
parents:
20197
diff
changeset
|
1459 |
|
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1460 |
val hhf_ss = |
63221
7d43fbbaba28
avoid warnings on duplicate rules in the given list;
wenzelm
parents:
62913
diff
changeset
|
1461 |
Context.the_local_context () |
7d43fbbaba28
avoid warnings on duplicate rules in the given list;
wenzelm
parents:
62913
diff
changeset
|
1462 |
|> init_simpset Drule.norm_hhf_eqs |
7d43fbbaba28
avoid warnings on duplicate rules in the given list;
wenzelm
parents:
62913
diff
changeset
|
1463 |
|> simpset_of; |
51717
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1464 |
|
9e7d1c139569
simplifier uses proper Proof.context instead of historic type simpset;
wenzelm
parents:
51611
diff
changeset
|
1465 |
val hhf_protect_ss = |
63221
7d43fbbaba28
avoid warnings on duplicate rules in the given list;
wenzelm
parents:
62913
diff
changeset
|
1466 |
Context.the_local_context () |
7d43fbbaba28
avoid warnings on duplicate rules in the given list;
wenzelm
parents:
62913
diff
changeset
|
1467 |
|> init_simpset Drule.norm_hhf_eqs |
7d43fbbaba28
avoid warnings on duplicate rules in the given list;
wenzelm
parents:
62913
diff
changeset
|
1468 |
|> add_eqcong Drule.protect_cong |
7d43fbbaba28
avoid warnings on duplicate rules in the given list;
wenzelm
parents:
62913
diff
changeset
|
1469 |
|> simpset_of; |
20228
e0f9e8a6556b
moved Goal.norm_hhf(_protect) to meta_simplifier.ML (pervasive);
wenzelm
parents:
20197
diff
changeset
|
1470 |
|
e0f9e8a6556b
moved Goal.norm_hhf(_protect) to meta_simplifier.ML (pervasive);
wenzelm
parents:
20197
diff
changeset
|
1471 |
in |
e0f9e8a6556b
moved Goal.norm_hhf(_protect) to meta_simplifier.ML (pervasive);
wenzelm
parents:
20197
diff
changeset
|
1472 |
|
78046
78deba4fdf27
tuned: more accurate check (is_norm_hhf protect);
wenzelm
parents:
77879
diff
changeset
|
1473 |
val norm_hhf = gen_norm_hhf {protect = false} hhf_ss; |
78deba4fdf27
tuned: more accurate check (is_norm_hhf protect);
wenzelm
parents:
77879
diff
changeset
|
1474 |
val norm_hhf_protect = gen_norm_hhf {protect = true} hhf_protect_ss; |
20228
e0f9e8a6556b
moved Goal.norm_hhf(_protect) to meta_simplifier.ML (pervasive);
wenzelm
parents:
20197
diff
changeset
|
1475 |
|
e0f9e8a6556b
moved Goal.norm_hhf(_protect) to meta_simplifier.ML (pervasive);
wenzelm
parents:
20197
diff
changeset
|
1476 |
end; |
e0f9e8a6556b
moved Goal.norm_hhf(_protect) to meta_simplifier.ML (pervasive);
wenzelm
parents:
20197
diff
changeset
|
1477 |
|
10413 | 1478 |
end; |
1479 |
||
41228
e1fce873b814
renamed structure MetaSimplifier to raw_Simplifer, to emphasize its meaning;
wenzelm
parents:
41227
diff
changeset
|
1480 |
structure Basic_Meta_Simplifier: BASIC_RAW_SIMPLIFIER = Raw_Simplifier; |
32738 | 1481 |
open Basic_Meta_Simplifier; |