author | paulson <lp15@cam.ac.uk> |
Sun, 20 May 2018 18:37:34 +0100 | |
changeset 68239 | 0764ee22a4d1 |
parent 68068 | 0acf3206a723 |
child 70388 | e31271559de8 |
permissions | -rw-r--r-- |
11519 | 1 |
(* Title: Pure/proofterm.ML |
11540 | 2 |
Author: Stefan Berghofer, TU Muenchen |
11519 | 3 |
|
11540 | 4 |
LF style proof terms. |
11519 | 5 |
*) |
6 |
||
11615 | 7 |
infix 8 % %% %>; |
11519 | 8 |
|
9 |
signature BASIC_PROOFTERM = |
|
10 |
sig |
|
64573 | 11 |
type thm_node |
11519 | 12 |
datatype proof = |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
13 |
MinProof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
14 |
| PBound of int |
11519 | 15 |
| Abst of string * typ option * proof |
16 |
| AbsP of string * term option * proof |
|
63857 | 17 |
| % of proof * term option |
18 |
| %% of proof * proof |
|
11519 | 19 |
| Hyp of term |
20 |
| PAxm of string * term * typ list option |
|
31943
5e960a0780a2
renamed inclass/Inclass to of_class/OfClass, in accordance to of_sort;
wenzelm
parents:
31903
diff
changeset
|
21 |
| OfClass of typ * class |
11519 | 22 |
| Oracle of string * term * typ list option |
28828
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
23 |
| Promise of serial * term * typ list |
29635
31d14e9fa0da
proof_body: turned lazy into future -- ensures that body is fulfilled eventually, without explicit force;
wenzelm
parents:
29270
diff
changeset
|
24 |
| PThm of serial * ((string * term * typ list option) * proof_body future) |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
25 |
and proof_body = PBody of |
39687 | 26 |
{oracles: (string * term) Ord_List.T, |
64573 | 27 |
thms: (serial * thm_node) Ord_List.T, |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
28 |
proof: proof} |
11615 | 29 |
val %> : proof * term -> proof |
11519 | 30 |
end; |
31 |
||
32 |
signature PROOFTERM = |
|
33 |
sig |
|
34 |
include BASIC_PROOFTERM |
|
65446 | 35 |
val proofs: int Unsynchronized.ref |
64573 | 36 |
type pthm = serial * thm_node |
28815 | 37 |
type oracle = string * term |
32094
89b9210c7506
prefer simultaneous join -- for improved scheduling;
wenzelm
parents:
32057
diff
changeset
|
38 |
val proof_of: proof_body -> proof |
64573 | 39 |
val thm_node_name: thm_node -> string |
40 |
val thm_node_prop: thm_node -> term |
|
41 |
val thm_node_body: thm_node -> proof_body future |
|
29635
31d14e9fa0da
proof_body: turned lazy into future -- ensures that body is fulfilled eventually, without explicit force;
wenzelm
parents:
29270
diff
changeset
|
42 |
val join_proof: proof_body future -> proof |
30711 | 43 |
val fold_proof_atoms: bool -> (proof -> 'a -> 'a) -> proof list -> 'a -> 'a |
64572 | 44 |
val fold_body_thms: ({serial: serial, name: string, prop: term, body: proof_body} -> 'a -> 'a) -> |
45 |
proof_body list -> 'a -> 'a |
|
66168 | 46 |
val consolidate: proof_body list -> unit |
50126
3dec88149176
theorem status about oracles/futures is no longer printed by default;
wenzelm
parents:
45156
diff
changeset
|
47 |
val peek_status: proof_body list -> {failed: bool, oracle: bool, unfinished: bool} |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
48 |
|
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
49 |
val oracle_ord: oracle * oracle -> order |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
50 |
val thm_ord: pthm * pthm -> order |
44334 | 51 |
val unions_oracles: oracle Ord_List.T list -> oracle Ord_List.T |
52 |
val unions_thms: pthm Ord_List.T list -> pthm Ord_List.T |
|
39687 | 53 |
val all_oracles_of: proof_body -> oracle Ord_List.T |
30716
2ee706293eb5
removed misleading make_proof_body, make_oracles, make_thms, which essentially assume a *full* proof;
wenzelm
parents:
30712
diff
changeset
|
54 |
val approximate_proof_body: proof -> proof_body |
52424
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
55 |
val no_proof_body: proof_body |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
56 |
val no_thm_proofs: proof -> proof |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
57 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
58 |
val encode: proof XML.Encode.T |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
59 |
val encode_body: proof_body XML.Encode.T |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
60 |
val decode: proof XML.Decode.T |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
61 |
val decode_body: proof_body XML.Decode.T |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
62 |
|
11519 | 63 |
(** primitive operations **) |
52487
48bc24467008
backout dedd7952a62c: static "proofs" value within theory prevents later inferencing with different configuration;
wenzelm
parents:
52470
diff
changeset
|
64 |
val proofs_enabled: unit -> bool |
64568
a504a3dec35a
more careful derivation_closed / close_derivation;
wenzelm
parents:
64566
diff
changeset
|
65 |
val atomic_proof: proof -> bool |
a504a3dec35a
more careful derivation_closed / close_derivation;
wenzelm
parents:
64566
diff
changeset
|
66 |
val compact_proof: proof -> bool |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
67 |
val proof_combt: proof * term list -> proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
68 |
val proof_combt': proof * term option list -> proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
69 |
val proof_combP: proof * proof list -> proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
70 |
val strip_combt: proof -> proof * term option list |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
71 |
val strip_combP: proof -> proof * proof list |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
72 |
val strip_thm: proof_body -> proof_body |
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
73 |
val map_proof_same: term Same.operation -> typ Same.operation |
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
74 |
-> (typ * class -> proof) -> proof Same.operation |
36620
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
75 |
val map_proof_terms_same: term Same.operation -> typ Same.operation -> proof Same.operation |
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
76 |
val map_proof_types_same: typ Same.operation -> proof Same.operation |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
77 |
val map_proof_terms: (term -> term) -> (typ -> typ) -> proof -> proof |
36620
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
78 |
val map_proof_types: (typ -> typ) -> proof -> proof |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
79 |
val fold_proof_terms: (term -> 'a -> 'a) -> (typ -> 'a -> 'a) -> proof -> 'a -> 'a |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
80 |
val maxidx_proof: proof -> int -> int |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
81 |
val size_of_proof: proof -> int |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
82 |
val change_type: typ list option -> proof -> proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
83 |
val prf_abstract_over: term -> proof -> proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
84 |
val prf_incr_bv: int -> int -> int -> int -> proof -> proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
85 |
val incr_pboundvars: int -> int -> proof -> proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
86 |
val prf_loose_bvar1: proof -> int -> bool |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
87 |
val prf_loose_Pbvar1: proof -> int -> bool |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
88 |
val prf_add_loose_bnos: int -> int -> proof -> int list * int list -> int list * int list |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
89 |
val norm_proof: Envir.env -> proof -> proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
90 |
val norm_proof': Envir.env -> proof -> proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
91 |
val prf_subst_bounds: term list -> proof -> proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
92 |
val prf_subst_pbounds: proof list -> proof -> proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
93 |
val freeze_thaw_prf: proof -> proof * (proof -> proof) |
11519 | 94 |
|
95 |
(** proof terms for specific inference rules **) |
|
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
96 |
val implies_intr_proof: term -> proof -> proof |
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
97 |
val implies_intr_proof': term -> proof -> proof |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
98 |
val forall_intr_proof: term -> string -> proof -> proof |
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
99 |
val forall_intr_proof': term -> proof -> proof |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
100 |
val varify_proof: term -> (string * sort) list -> proof -> proof |
36619
deadcd0ec431
renamed Proofterm.freezeT to Proofterm.legacy_freezeT (cf. 88756a5a92fc);
wenzelm
parents:
35851
diff
changeset
|
101 |
val legacy_freezeT: term -> proof -> proof |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
102 |
val rotate_proof: term list -> term -> int -> proof -> proof |
36742 | 103 |
val permute_prems_proof: term list -> int -> int -> proof -> proof |
19908 | 104 |
val generalize: string list * string list -> int -> proof -> proof |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
105 |
val instantiate: ((indexname * sort) * typ) list * ((indexname * typ) * term) list |
16880 | 106 |
-> proof -> proof |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
107 |
val lift_proof: term -> int -> term -> proof -> proof |
32027 | 108 |
val incr_indexes: int -> proof -> proof |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
109 |
val assumption_proof: term list -> term -> int -> proof -> proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
110 |
val bicompose_proof: bool -> term list -> term list -> term list -> term option -> |
23296
25f28f9c28a3
Adapted Proofterm.bicompose_proof to Larry's changes in
berghofe
parents:
23178
diff
changeset
|
111 |
int -> int -> proof -> proof -> proof |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
112 |
val equality_axms: (string * term) list |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
113 |
val reflexive_axm: proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
114 |
val symmetric_axm: proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
115 |
val transitive_axm: proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
116 |
val equal_intr_axm: proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
117 |
val equal_elim_axm: proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
118 |
val abstract_rule_axm: proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
119 |
val combination_axm: proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
120 |
val reflexive: proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
121 |
val symmetric: proof -> proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
122 |
val transitive: term -> typ -> proof -> proof -> proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
123 |
val abstract_rule: term -> string -> proof -> proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
124 |
val combination: term -> term -> term -> term -> typ -> proof -> proof -> proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
125 |
val equal_intr: term -> term -> proof -> proof -> proof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
126 |
val equal_elim: term -> term -> proof -> proof -> proof |
36621
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
wenzelm
parents:
36620
diff
changeset
|
127 |
val strip_shyps_proof: Sorts.algebra -> (typ * sort) list -> (typ * sort) list -> |
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
wenzelm
parents:
36620
diff
changeset
|
128 |
sort list -> proof -> proof |
36740 | 129 |
val classrel_proof: theory -> class * class -> proof |
130 |
val arity_proof: theory -> string * sort list * class -> proof |
|
36741
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
131 |
val of_sort_proof: theory -> (typ * class -> proof) -> typ * sort -> proof list |
36740 | 132 |
val install_axclass_proofs: |
133 |
{classrel_proof: theory -> class * class -> proof, |
|
62897
8093203f0b89
prefer regular context update, to allow continuous editing of Pure;
wenzelm
parents:
62538
diff
changeset
|
134 |
arity_proof: theory -> string * sort list * class -> proof} -> theory -> theory |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
135 |
val axm_proof: string -> term -> proof |
52487
48bc24467008
backout dedd7952a62c: static "proofs" value within theory prevents later inferencing with different configuration;
wenzelm
parents:
52470
diff
changeset
|
136 |
val oracle_proof: string -> term -> oracle * proof |
63623 | 137 |
val shrink_proof: proof -> proof |
11519 | 138 |
|
139 |
(** rewriting on proof terms **) |
|
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
140 |
val add_prf_rrule: proof * proof -> theory -> theory |
52487
48bc24467008
backout dedd7952a62c: static "proofs" value within theory prevents later inferencing with different configuration;
wenzelm
parents:
52470
diff
changeset
|
141 |
val add_prf_rproc: (typ list -> term option list -> proof -> (proof * proof) option) -> theory -> theory |
33722
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
142 |
val no_skel: proof |
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
143 |
val normal_skel: proof |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
144 |
val rewrite_proof: theory -> (proof * proof) list * |
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
145 |
(typ list -> term option list -> proof -> (proof * proof) option) list -> proof -> proof |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
146 |
val rewrite_proof_notypes: (proof * proof) list * |
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
147 |
(typ list -> term option list -> proof -> (proof * proof) option) list -> proof -> proof |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
148 |
val rew_proof: theory -> proof -> proof |
36877
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
149 |
|
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
150 |
val promise_proof: theory -> serial -> term -> proof |
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
151 |
val fulfill_norm_proof: theory -> (serial * proof_body) list -> proof_body -> proof_body |
36882
f33760bb8ca0
conditionally unconstrain thm proofs -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36880
diff
changeset
|
152 |
val thm_proof: theory -> string -> sort list -> term list -> term -> |
36877
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
153 |
(serial * proof_body future) list -> proof_body -> pthm * proof |
36883
4ed0d72def50
added Proofterm.unconstrain_thm_proof for Thm.unconstrainT -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36882
diff
changeset
|
154 |
val unconstrain_thm_proof: theory -> sort list -> term -> |
4ed0d72def50
added Proofterm.unconstrain_thm_proof for Thm.unconstrainT -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36882
diff
changeset
|
155 |
(serial * proof_body future) list -> proof_body -> pthm * proof |
37297 | 156 |
val get_name: sort list -> term list -> term -> proof -> string |
36877
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
157 |
val guess_name: proof -> string |
11519 | 158 |
end |
159 |
||
160 |
structure Proofterm : PROOFTERM = |
|
161 |
struct |
|
162 |
||
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
163 |
(***** datatype proof *****) |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
164 |
|
11519 | 165 |
datatype proof = |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
166 |
MinProof |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
167 |
| PBound of int |
11519 | 168 |
| Abst of string * typ option * proof |
169 |
| AbsP of string * term option * proof |
|
12497 | 170 |
| op % of proof * term option |
171 |
| op %% of proof * proof |
|
11519 | 172 |
| Hyp of term |
173 |
| PAxm of string * term * typ list option |
|
31943
5e960a0780a2
renamed inclass/Inclass to of_class/OfClass, in accordance to of_sort;
wenzelm
parents:
31903
diff
changeset
|
174 |
| OfClass of typ * class |
11519 | 175 |
| Oracle of string * term * typ list option |
28828
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
176 |
| Promise of serial * term * typ list |
29635
31d14e9fa0da
proof_body: turned lazy into future -- ensures that body is fulfilled eventually, without explicit force;
wenzelm
parents:
29270
diff
changeset
|
177 |
| PThm of serial * ((string * term * typ list option) * proof_body future) |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
178 |
and proof_body = PBody of |
39687 | 179 |
{oracles: (string * term) Ord_List.T, |
64573 | 180 |
thms: (serial * thm_node) Ord_List.T, |
181 |
proof: proof} |
|
64574
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
182 |
and thm_node = |
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
183 |
Thm_Node of {name: string, prop: term, body: proof_body future, consolidate: unit lazy}; |
11519 | 184 |
|
28815 | 185 |
type oracle = string * term; |
64573 | 186 |
type pthm = serial * thm_node; |
28815 | 187 |
|
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
188 |
fun proof_of (PBody {proof, ...}) = proof; |
32094
89b9210c7506
prefer simultaneous join -- for improved scheduling;
wenzelm
parents:
32057
diff
changeset
|
189 |
val join_proof = Future.join #> proof_of; |
17017 | 190 |
|
64574
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
191 |
fun rep_thm_node (Thm_Node args) = args; |
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
192 |
val thm_node_name = #name o rep_thm_node; |
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
193 |
val thm_node_prop = #prop o rep_thm_node; |
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
194 |
val thm_node_body = #body o rep_thm_node; |
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
195 |
val thm_node_consolidate = #consolidate o rep_thm_node; |
64573 | 196 |
|
197 |
fun join_thms (thms: pthm list) = |
|
64574
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
198 |
Future.joins (map (thm_node_body o #2) thms); |
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
199 |
|
66168 | 200 |
val consolidate = |
201 |
maps (fn PBody {thms, ...} => map (thm_node_consolidate o #2) thms) |
|
67669 | 202 |
#> Lazy.consolidate #> map Lazy.force #> ignore; |
64574
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
203 |
|
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
204 |
fun make_thm_node name prop body = |
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
205 |
Thm_Node {name = name, prop = prop, body = body, |
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
206 |
consolidate = |
66167 | 207 |
Lazy.lazy_name "Proofterm.make_thm_node" (fn () => |
64574
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
208 |
let val PBody {thms, ...} = Future.join body |
66168 | 209 |
in consolidate (join_thms thms) end)}; |
44333
cc53ce50f738
reverted to join_bodies/join_proofs based on fold_body_thms to regain performance (escpecially of HOL-Proofs) -- see also aa9c1e9ef2ce and 4e2abb045eac;
wenzelm
parents:
44332
diff
changeset
|
210 |
|
17017 | 211 |
|
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
212 |
(***** proof atoms *****) |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
213 |
|
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
214 |
fun fold_proof_atoms all f = |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
215 |
let |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
216 |
fun app (Abst (_, _, prf)) = app prf |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
217 |
| app (AbsP (_, _, prf)) = app prf |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
218 |
| app (prf % _) = app prf |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
219 |
| app (prf1 %% prf2) = app prf1 #> app prf2 |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
220 |
| app (prf as PThm (i, (_, body))) = (fn (x, seen) => |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
221 |
if Inttab.defined seen i then (x, seen) |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
222 |
else |
28815 | 223 |
let val (x', seen') = |
29635
31d14e9fa0da
proof_body: turned lazy into future -- ensures that body is fulfilled eventually, without explicit force;
wenzelm
parents:
29270
diff
changeset
|
224 |
(if all then app (join_proof body) else I) (x, Inttab.update (i, ()) seen) |
28815 | 225 |
in (f prf x', seen') end) |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
226 |
| app prf = (fn (x, seen) => (f prf x, seen)); |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
227 |
in fn prfs => fn x => #1 (fold app prfs (x, Inttab.empty)) end; |
19357
dade85a75c9f
Added alternative version of thms_of_proof that does not recursively
berghofe
parents:
19304
diff
changeset
|
228 |
|
30711 | 229 |
fun fold_body_thms f = |
230 |
let |
|
32726 | 231 |
fun app (PBody {thms, ...}) = |
64574
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
232 |
tap join_thms thms |> fold (fn (i, thm_node) => fn (x, seen) => |
32726 | 233 |
if Inttab.defined seen i then (x, seen) |
32094
89b9210c7506
prefer simultaneous join -- for improved scheduling;
wenzelm
parents:
32057
diff
changeset
|
234 |
else |
89b9210c7506
prefer simultaneous join -- for improved scheduling;
wenzelm
parents:
32057
diff
changeset
|
235 |
let |
64574
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
236 |
val name = thm_node_name thm_node; |
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
237 |
val prop = thm_node_prop thm_node; |
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
238 |
val body = Future.join (thm_node_body thm_node); |
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
239 |
val (x', seen') = app body (x, Inttab.update (i, ()) seen); |
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
240 |
in (f {serial = i, name = name, prop = prop, body = body} x', seen') end); |
32726 | 241 |
in fn bodies => fn x => #1 (fold app bodies (x, Inttab.empty)) end; |
30711 | 242 |
|
50126
3dec88149176
theorem status about oracles/futures is no longer printed by default;
wenzelm
parents:
45156
diff
changeset
|
243 |
fun peek_status bodies = |
30711 | 244 |
let |
245 |
fun status (PBody {oracles, thms, ...}) x = |
|
246 |
let |
|
247 |
val ((oracle, unfinished, failed), seen) = |
|
64574
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
248 |
(thms, x) |-> fold (fn (i, thm_node) => fn (st, seen) => |
30711 | 249 |
if Inttab.defined seen i then (st, seen) |
250 |
else |
|
251 |
let val seen' = Inttab.update (i, ()) seen in |
|
64574
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
252 |
(case Future.peek (thm_node_body thm_node) of |
43761
e72ba84ae58f
tuned signature -- corresponding to Scala version;
wenzelm
parents:
43329
diff
changeset
|
253 |
SOME (Exn.Res body') => status body' (st, seen') |
30711 | 254 |
| SOME (Exn.Exn _) => |
255 |
let val (oracle, unfinished, _) = st |
|
256 |
in ((oracle, unfinished, true), seen') end |
|
257 |
| NONE => |
|
258 |
let val (oracle, _, failed) = st |
|
259 |
in ((oracle, true, failed), seen') end) |
|
260 |
end); |
|
261 |
in ((oracle orelse not (null oracles), unfinished, failed), seen) end; |
|
32057 | 262 |
val (oracle, unfinished, failed) = |
263 |
#1 (fold status bodies ((false, false, false), Inttab.empty)); |
|
30711 | 264 |
in {oracle = oracle, unfinished = unfinished, failed = failed} end; |
265 |
||
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
266 |
|
28815 | 267 |
(* proof body *) |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
268 |
|
35408 | 269 |
val oracle_ord = prod_ord fast_string_ord Term_Ord.fast_term_ord; |
64573 | 270 |
fun thm_ord ((i, _): pthm, (j, _): pthm) = int_ord (j, i); |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
271 |
|
44334 | 272 |
val unions_oracles = Ord_List.unions oracle_ord; |
273 |
val unions_thms = Ord_List.unions thm_ord; |
|
30716
2ee706293eb5
removed misleading make_proof_body, make_oracles, make_thms, which essentially assume a *full* proof;
wenzelm
parents:
30712
diff
changeset
|
274 |
|
2ee706293eb5
removed misleading make_proof_body, make_oracles, make_thms, which essentially assume a *full* proof;
wenzelm
parents:
30712
diff
changeset
|
275 |
val all_oracles_of = |
2ee706293eb5
removed misleading make_proof_body, make_oracles, make_thms, which essentially assume a *full* proof;
wenzelm
parents:
30712
diff
changeset
|
276 |
let |
32057 | 277 |
fun collect (PBody {oracles, thms, ...}) = |
64574
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
278 |
tap join_thms thms |> fold (fn (i, thm_node) => fn (x, seen) => |
32057 | 279 |
if Inttab.defined seen i then (x, seen) |
280 |
else |
|
281 |
let |
|
64574
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
282 |
val body = Future.join (thm_node_body thm_node); |
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
283 |
val (x', seen') = collect body (x, Inttab.update (i, ()) seen); |
44334 | 284 |
in (if null oracles then x' else oracles :: x', seen') end); |
285 |
in fn body => unions_oracles (#1 (collect body ([], Inttab.empty))) end; |
|
30716
2ee706293eb5
removed misleading make_proof_body, make_oracles, make_thms, which essentially assume a *full* proof;
wenzelm
parents:
30712
diff
changeset
|
286 |
|
2ee706293eb5
removed misleading make_proof_body, make_oracles, make_thms, which essentially assume a *full* proof;
wenzelm
parents:
30712
diff
changeset
|
287 |
fun approximate_proof_body prf = |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
288 |
let |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
289 |
val (oracles, thms) = fold_proof_atoms false |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
290 |
(fn Oracle (s, prop, _) => apfst (cons (s, prop)) |
64574
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
291 |
| PThm (i, ((name, prop, _), body)) => apsnd (cons (i, make_thm_node name prop body)) |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
292 |
| _ => I) [prf] ([], []); |
30716
2ee706293eb5
removed misleading make_proof_body, make_oracles, make_thms, which essentially assume a *full* proof;
wenzelm
parents:
30712
diff
changeset
|
293 |
in |
2ee706293eb5
removed misleading make_proof_body, make_oracles, make_thms, which essentially assume a *full* proof;
wenzelm
parents:
30712
diff
changeset
|
294 |
PBody |
39687 | 295 |
{oracles = Ord_List.make oracle_ord oracles, |
296 |
thms = Ord_List.make thm_ord thms, |
|
30716
2ee706293eb5
removed misleading make_proof_body, make_oracles, make_thms, which essentially assume a *full* proof;
wenzelm
parents:
30712
diff
changeset
|
297 |
proof = prf} |
2ee706293eb5
removed misleading make_proof_body, make_oracles, make_thms, which essentially assume a *full* proof;
wenzelm
parents:
30712
diff
changeset
|
298 |
end; |
11519 | 299 |
|
52424
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
300 |
val no_proof_body = PBody {oracles = [], thms = [], proof = MinProof}; |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
301 |
val no_body = Future.value no_proof_body; |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
302 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
303 |
fun no_thm_proofs (PThm (i, (a, _))) = PThm (i, (a, no_body)) |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
304 |
| no_thm_proofs (Abst (x, T, prf)) = Abst (x, T, no_thm_proofs prf) |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
305 |
| no_thm_proofs (AbsP (x, t, prf)) = AbsP (x, t, no_thm_proofs prf) |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
306 |
| no_thm_proofs (prf % t) = no_thm_proofs prf % t |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
307 |
| no_thm_proofs (prf1 %% prf2) = no_thm_proofs prf1 %% no_thm_proofs prf2 |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
308 |
| no_thm_proofs a = a; |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
309 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
310 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
311 |
(***** XML data representation *****) |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
312 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
313 |
(* encode *) |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
314 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
315 |
local |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
316 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
317 |
open XML.Encode Term_XML.Encode; |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
318 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
319 |
fun proof prf = prf |> variant |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
320 |
[fn MinProof => ([], []), |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
321 |
fn PBound a => ([int_atom a], []), |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
322 |
fn Abst (a, b, c) => ([a], pair (option typ) proof (b, c)), |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
323 |
fn AbsP (a, b, c) => ([a], pair (option term) proof (b, c)), |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
324 |
fn a % b => ([], pair proof (option term) (a, b)), |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
325 |
fn a %% b => ([], pair proof proof (a, b)), |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
326 |
fn Hyp a => ([], term a), |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
327 |
fn PAxm (a, b, c) => ([a], pair term (option (list typ)) (b, c)), |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
328 |
fn OfClass (a, b) => ([b], typ a), |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
329 |
fn Oracle (a, b, c) => ([a], pair term (option (list typ)) (b, c)), |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
330 |
fn Promise (a, b, c) => ([int_atom a], pair term (list typ) (b, c)), |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
331 |
fn PThm (a, ((b, c, d), body)) => |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
332 |
([int_atom a, b], triple term (option (list typ)) proof_body (c, d, Future.join body))] |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
333 |
and proof_body (PBody {oracles, thms, proof = prf}) = |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
334 |
triple (list (pair string term)) (list pthm) proof (oracles, thms, prf) |
64574
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
335 |
and pthm (a, thm_node) = |
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
336 |
pair int (triple string term proof_body) |
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
337 |
(a, (thm_node_name thm_node, thm_node_prop thm_node, Future.join (thm_node_body thm_node))); |
52424
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
338 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
339 |
in |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
340 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
341 |
val encode = proof; |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
342 |
val encode_body = proof_body; |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
343 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
344 |
end; |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
345 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
346 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
347 |
(* decode *) |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
348 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
349 |
local |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
350 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
351 |
open XML.Decode Term_XML.Decode; |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
352 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
353 |
fun proof prf = prf |> variant |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
354 |
[fn ([], []) => MinProof, |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
355 |
fn ([a], []) => PBound (int_atom a), |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
356 |
fn ([a], b) => let val (c, d) = pair (option typ) proof b in Abst (a, c, d) end, |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
357 |
fn ([a], b) => let val (c, d) = pair (option term) proof b in AbsP (a, c, d) end, |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
358 |
fn ([], a) => op % (pair proof (option term) a), |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
359 |
fn ([], a) => op %% (pair proof proof a), |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
360 |
fn ([], a) => Hyp (term a), |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
361 |
fn ([a], b) => let val (c, d) = pair term (option (list typ)) b in PAxm (a, c, d) end, |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
362 |
fn ([b], a) => OfClass (typ a, b), |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
363 |
fn ([a], b) => let val (c, d) = pair term (option (list typ)) b in Oracle (a, c, d) end, |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
364 |
fn ([a], b) => let val (c, d) = pair term (list typ) b in Promise (int_atom a, c, d) end, |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
365 |
fn ([a, b], c) => |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
366 |
let val (d, e, f) = triple term (option (list typ)) proof_body c |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
367 |
in PThm (int_atom a, ((b, d, e), Future.value f)) end] |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
368 |
and proof_body x = |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
369 |
let val (a, b, c) = triple (list (pair string term)) (list pthm) proof x |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
370 |
in PBody {oracles = a, thms = b, proof = c} end |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
371 |
and pthm x = |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
372 |
let val (a, (b, c, d)) = pair int (triple string term proof_body) x |
64574
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
373 |
in (a, make_thm_node b c (Future.value d)) end; |
52424
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
374 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
375 |
in |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
376 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
377 |
val decode = proof; |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
378 |
val decode_body = proof_body; |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
379 |
|
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
380 |
end; |
77075c576d4c
support for XML data representation of proof terms;
wenzelm
parents:
51700
diff
changeset
|
381 |
|
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
382 |
|
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
383 |
(***** proof objects with different levels of detail *****) |
11519 | 384 |
|
64568
a504a3dec35a
more careful derivation_closed / close_derivation;
wenzelm
parents:
64566
diff
changeset
|
385 |
fun atomic_proof prf = |
a504a3dec35a
more careful derivation_closed / close_derivation;
wenzelm
parents:
64566
diff
changeset
|
386 |
(case prf of |
a504a3dec35a
more careful derivation_closed / close_derivation;
wenzelm
parents:
64566
diff
changeset
|
387 |
Abst _ => false |
a504a3dec35a
more careful derivation_closed / close_derivation;
wenzelm
parents:
64566
diff
changeset
|
388 |
| AbsP _ => false |
a504a3dec35a
more careful derivation_closed / close_derivation;
wenzelm
parents:
64566
diff
changeset
|
389 |
| op % _ => false |
a504a3dec35a
more careful derivation_closed / close_derivation;
wenzelm
parents:
64566
diff
changeset
|
390 |
| op %% _ => false |
a504a3dec35a
more careful derivation_closed / close_derivation;
wenzelm
parents:
64566
diff
changeset
|
391 |
| Promise _ => false |
a504a3dec35a
more careful derivation_closed / close_derivation;
wenzelm
parents:
64566
diff
changeset
|
392 |
| _ => true); |
a504a3dec35a
more careful derivation_closed / close_derivation;
wenzelm
parents:
64566
diff
changeset
|
393 |
|
a504a3dec35a
more careful derivation_closed / close_derivation;
wenzelm
parents:
64566
diff
changeset
|
394 |
fun compact_proof (prf % _) = compact_proof prf |
a504a3dec35a
more careful derivation_closed / close_derivation;
wenzelm
parents:
64566
diff
changeset
|
395 |
| compact_proof (prf1 %% prf2) = atomic_proof prf2 andalso compact_proof prf1 |
a504a3dec35a
more careful derivation_closed / close_derivation;
wenzelm
parents:
64566
diff
changeset
|
396 |
| compact_proof prf = atomic_proof prf; |
a504a3dec35a
more careful derivation_closed / close_derivation;
wenzelm
parents:
64566
diff
changeset
|
397 |
|
15531 | 398 |
fun (prf %> t) = prf % SOME t; |
11519 | 399 |
|
15570 | 400 |
val proof_combt = Library.foldl (op %>); |
401 |
val proof_combt' = Library.foldl (op %); |
|
402 |
val proof_combP = Library.foldl (op %%); |
|
11519 | 403 |
|
21646
c07b5b0e8492
thm/prf: separate official name vs. additional tags;
wenzelm
parents:
20853
diff
changeset
|
404 |
fun strip_combt prf = |
11615 | 405 |
let fun stripc (prf % t, ts) = stripc (prf, t::ts) |
21646
c07b5b0e8492
thm/prf: separate official name vs. additional tags;
wenzelm
parents:
20853
diff
changeset
|
406 |
| stripc x = x |
11519 | 407 |
in stripc (prf, []) end; |
408 |
||
21646
c07b5b0e8492
thm/prf: separate official name vs. additional tags;
wenzelm
parents:
20853
diff
changeset
|
409 |
fun strip_combP prf = |
11615 | 410 |
let fun stripc (prf %% prf', prfs) = stripc (prf, prf'::prfs) |
11519 | 411 |
| stripc x = x |
412 |
in stripc (prf, []) end; |
|
413 |
||
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
414 |
fun strip_thm (body as PBody {proof, ...}) = |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
415 |
(case strip_combt (fst (strip_combP proof)) of |
29635
31d14e9fa0da
proof_body: turned lazy into future -- ensures that body is fulfilled eventually, without explicit force;
wenzelm
parents:
29270
diff
changeset
|
416 |
(PThm (_, (_, body')), _) => Future.join body' |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
417 |
| _ => body); |
11519 | 418 |
|
63857 | 419 |
val mk_Abst = fold_rev (fn (s, _: typ) => fn prf => Abst (s, NONE, prf)); |
15531 | 420 |
fun mk_AbsP (i, prf) = funpow i (fn prf => AbsP ("H", NONE, prf)) prf; |
11519 | 421 |
|
36620
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
422 |
fun map_proof_same term typ ofclass = |
20000 | 423 |
let |
32024 | 424 |
val typs = Same.map typ; |
20000 | 425 |
|
32024 | 426 |
fun proof (Abst (s, T, prf)) = |
427 |
(Abst (s, Same.map_option typ T, Same.commit proof prf) |
|
428 |
handle Same.SAME => Abst (s, T, proof prf)) |
|
429 |
| proof (AbsP (s, t, prf)) = |
|
430 |
(AbsP (s, Same.map_option term t, Same.commit proof prf) |
|
431 |
handle Same.SAME => AbsP (s, t, proof prf)) |
|
432 |
| proof (prf % t) = |
|
433 |
(proof prf % Same.commit (Same.map_option term) t |
|
434 |
handle Same.SAME => prf % Same.map_option term t) |
|
435 |
| proof (prf1 %% prf2) = |
|
436 |
(proof prf1 %% Same.commit proof prf2 |
|
437 |
handle Same.SAME => prf1 %% proof prf2) |
|
438 |
| proof (PAxm (a, prop, SOME Ts)) = PAxm (a, prop, SOME (typs Ts)) |
|
36620
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
439 |
| proof (OfClass T_c) = ofclass T_c |
32024 | 440 |
| proof (Oracle (a, prop, SOME Ts)) = Oracle (a, prop, SOME (typs Ts)) |
441 |
| proof (Promise (i, prop, Ts)) = Promise (i, prop, typs Ts) |
|
32057 | 442 |
| proof (PThm (i, ((a, prop, SOME Ts), body))) = |
443 |
PThm (i, ((a, prop, SOME (typs Ts)), body)) |
|
32024 | 444 |
| proof _ = raise Same.SAME; |
36620
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
445 |
in proof end; |
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
446 |
|
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
447 |
fun map_proof_terms_same term typ = map_proof_same term typ (fn (T, c) => OfClass (typ T, c)); |
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
448 |
fun map_proof_types_same typ = map_proof_terms_same (Term_Subst.map_types_same typ) typ; |
20000 | 449 |
|
22662 | 450 |
fun same eq f x = |
11715
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
451 |
let val x' = f x |
32019 | 452 |
in if eq (x, x') then raise Same.SAME else x' end; |
11715
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
453 |
|
36620
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
454 |
fun map_proof_terms f g = Same.commit (map_proof_terms_same (same (op =) f) (same (op =) g)); |
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
455 |
fun map_proof_types f = Same.commit (map_proof_types_same (same (op =) f)); |
11519 | 456 |
|
20147 | 457 |
fun fold_proof_terms f g (Abst (_, SOME T, prf)) = g T #> fold_proof_terms f g prf |
458 |
| fold_proof_terms f g (Abst (_, NONE, prf)) = fold_proof_terms f g prf |
|
459 |
| fold_proof_terms f g (AbsP (_, SOME t, prf)) = f t #> fold_proof_terms f g prf |
|
460 |
| fold_proof_terms f g (AbsP (_, NONE, prf)) = fold_proof_terms f g prf |
|
461 |
| fold_proof_terms f g (prf % SOME t) = fold_proof_terms f g prf #> f t |
|
462 |
| fold_proof_terms f g (prf % NONE) = fold_proof_terms f g prf |
|
463 |
| fold_proof_terms f g (prf1 %% prf2) = |
|
464 |
fold_proof_terms f g prf1 #> fold_proof_terms f g prf2 |
|
20159 | 465 |
| fold_proof_terms _ g (PAxm (_, _, SOME Ts)) = fold g Ts |
31943
5e960a0780a2
renamed inclass/Inclass to of_class/OfClass, in accordance to of_sort;
wenzelm
parents:
31903
diff
changeset
|
466 |
| fold_proof_terms _ g (OfClass (T, _)) = g T |
28828
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
467 |
| fold_proof_terms _ g (Oracle (_, _, SOME Ts)) = fold g Ts |
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
468 |
| fold_proof_terms _ g (Promise (_, _, Ts)) = fold g Ts |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
469 |
| fold_proof_terms _ g (PThm (_, ((_, _, SOME Ts), _))) = fold g Ts |
20147 | 470 |
| fold_proof_terms _ _ _ = I; |
11519 | 471 |
|
20300 | 472 |
fun maxidx_proof prf = fold_proof_terms Term.maxidx_term Term.maxidx_typ prf; |
12868 | 473 |
|
13744 | 474 |
fun size_of_proof (Abst (_, _, prf)) = 1 + size_of_proof prf |
63857 | 475 |
| size_of_proof (AbsP (_, _, prf)) = 1 + size_of_proof prf |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
476 |
| size_of_proof (prf % _) = 1 + size_of_proof prf |
13744 | 477 |
| size_of_proof (prf1 %% prf2) = size_of_proof prf1 + size_of_proof prf2 |
478 |
| size_of_proof _ = 1; |
|
479 |
||
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
480 |
fun change_type opTs (PAxm (name, prop, _)) = PAxm (name, prop, opTs) |
31943
5e960a0780a2
renamed inclass/Inclass to of_class/OfClass, in accordance to of_sort;
wenzelm
parents:
31903
diff
changeset
|
481 |
| change_type (SOME [T]) (OfClass (_, c)) = OfClass (T, c) |
12907
27e6d344d724
New function change_type for changing type assignments of theorems,
berghofe
parents:
12890
diff
changeset
|
482 |
| change_type opTs (Oracle (name, prop, _)) = Oracle (name, prop, opTs) |
63857 | 483 |
| change_type _ (Promise _) = raise Fail "change_type: unexpected promise" |
32057 | 484 |
| change_type opTs (PThm (i, ((name, prop, _), body))) = |
485 |
PThm (i, ((name, prop, opTs), body)) |
|
12907
27e6d344d724
New function change_type for changing type assignments of theorems,
berghofe
parents:
12890
diff
changeset
|
486 |
| change_type _ prf = prf; |
27e6d344d724
New function change_type for changing type assignments of theorems,
berghofe
parents:
12890
diff
changeset
|
487 |
|
11519 | 488 |
|
489 |
(***** utilities *****) |
|
490 |
||
491 |
fun strip_abs (_::Ts) (Abs (_, _, t)) = strip_abs Ts t |
|
492 |
| strip_abs _ t = t; |
|
493 |
||
15570 | 494 |
fun mk_abs Ts t = Library.foldl (fn (t', T) => Abs ("", T, t')) (t, Ts); |
11519 | 495 |
|
496 |
||
21646
c07b5b0e8492
thm/prf: separate official name vs. additional tags;
wenzelm
parents:
20853
diff
changeset
|
497 |
(*Abstraction of a proof term over its occurrences of v, |
11519 | 498 |
which must contain no loose bound variables. |
499 |
The resulting proof term is ready to become the body of an Abst.*) |
|
500 |
||
501 |
fun prf_abstract_over v = |
|
502 |
let |
|
11715
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
503 |
fun abst' lev u = if v aconv u then Bound lev else |
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
504 |
(case u of |
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
505 |
Abs (a, T, t) => Abs (a, T, abst' (lev + 1) t) |
32019 | 506 |
| f $ t => (abst' lev f $ absth' lev t handle Same.SAME => f $ abst' lev t) |
507 |
| _ => raise Same.SAME) |
|
508 |
and absth' lev t = (abst' lev t handle Same.SAME => t); |
|
11519 | 509 |
|
11715
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
510 |
fun abst lev (AbsP (a, t, prf)) = |
32024 | 511 |
(AbsP (a, Same.map_option (abst' lev) t, absth lev prf) |
32019 | 512 |
handle Same.SAME => AbsP (a, t, abst lev prf)) |
11715
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
513 |
| abst lev (Abst (a, T, prf)) = Abst (a, T, abst (lev + 1) prf) |
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
514 |
| abst lev (prf1 %% prf2) = (abst lev prf1 %% absth lev prf2 |
32019 | 515 |
handle Same.SAME => prf1 %% abst lev prf2) |
15570 | 516 |
| abst lev (prf % t) = (abst lev prf % Option.map (absth' lev) t |
32024 | 517 |
handle Same.SAME => prf % Same.map_option (abst' lev) t) |
32019 | 518 |
| abst _ _ = raise Same.SAME |
32024 | 519 |
and absth lev prf = (abst lev prf handle Same.SAME => prf); |
11519 | 520 |
|
11715
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
521 |
in absth 0 end; |
11519 | 522 |
|
523 |
||
524 |
(*increments a proof term's non-local bound variables |
|
525 |
required when moving a proof term within abstractions |
|
526 |
inc is increment for bound variables |
|
527 |
lev is level at which a bound variable is considered 'loose'*) |
|
528 |
||
529 |
fun incr_bv' inct tlev t = incr_bv (inct, tlev, t); |
|
530 |
||
63857 | 531 |
fun prf_incr_bv' incP _ Plev _ (PBound i) = |
32019 | 532 |
if i >= Plev then PBound (i+incP) else raise Same.SAME |
11715
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
533 |
| prf_incr_bv' incP inct Plev tlev (AbsP (a, t, body)) = |
32024 | 534 |
(AbsP (a, Same.map_option (same (op =) (incr_bv' inct tlev)) t, |
32019 | 535 |
prf_incr_bv incP inct (Plev+1) tlev body) handle Same.SAME => |
11715
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
536 |
AbsP (a, t, prf_incr_bv' incP inct (Plev+1) tlev body)) |
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
537 |
| prf_incr_bv' incP inct Plev tlev (Abst (a, T, body)) = |
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
538 |
Abst (a, T, prf_incr_bv' incP inct Plev (tlev+1) body) |
21646
c07b5b0e8492
thm/prf: separate official name vs. additional tags;
wenzelm
parents:
20853
diff
changeset
|
539 |
| prf_incr_bv' incP inct Plev tlev (prf %% prf') = |
11715
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
540 |
(prf_incr_bv' incP inct Plev tlev prf %% prf_incr_bv incP inct Plev tlev prf' |
32019 | 541 |
handle Same.SAME => prf %% prf_incr_bv' incP inct Plev tlev prf') |
21646
c07b5b0e8492
thm/prf: separate official name vs. additional tags;
wenzelm
parents:
20853
diff
changeset
|
542 |
| prf_incr_bv' incP inct Plev tlev (prf % t) = |
15570 | 543 |
(prf_incr_bv' incP inct Plev tlev prf % Option.map (incr_bv' inct tlev) t |
32024 | 544 |
handle Same.SAME => prf % Same.map_option (same (op =) (incr_bv' inct tlev)) t) |
32019 | 545 |
| prf_incr_bv' _ _ _ _ _ = raise Same.SAME |
11715
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
546 |
and prf_incr_bv incP inct Plev tlev prf = |
32019 | 547 |
(prf_incr_bv' incP inct Plev tlev prf handle Same.SAME => prf); |
11519 | 548 |
|
549 |
fun incr_pboundvars 0 0 prf = prf |
|
550 |
| incr_pboundvars incP inct prf = prf_incr_bv incP inct 0 0 prf; |
|
551 |
||
552 |
||
11615 | 553 |
fun prf_loose_bvar1 (prf1 %% prf2) k = prf_loose_bvar1 prf1 k orelse prf_loose_bvar1 prf2 k |
15531 | 554 |
| prf_loose_bvar1 (prf % SOME t) k = prf_loose_bvar1 prf k orelse loose_bvar1 (t, k) |
555 |
| prf_loose_bvar1 (_ % NONE) _ = true |
|
556 |
| prf_loose_bvar1 (AbsP (_, SOME t, prf)) k = loose_bvar1 (t, k) orelse prf_loose_bvar1 prf k |
|
63857 | 557 |
| prf_loose_bvar1 (AbsP (_, NONE, _)) _ = true |
11519 | 558 |
| prf_loose_bvar1 (Abst (_, _, prf)) k = prf_loose_bvar1 prf (k+1) |
559 |
| prf_loose_bvar1 _ _ = false; |
|
560 |
||
561 |
fun prf_loose_Pbvar1 (PBound i) k = i = k |
|
11615 | 562 |
| prf_loose_Pbvar1 (prf1 %% prf2) k = prf_loose_Pbvar1 prf1 k orelse prf_loose_Pbvar1 prf2 k |
563 |
| prf_loose_Pbvar1 (prf % _) k = prf_loose_Pbvar1 prf k |
|
11519 | 564 |
| prf_loose_Pbvar1 (AbsP (_, _, prf)) k = prf_loose_Pbvar1 prf (k+1) |
565 |
| prf_loose_Pbvar1 (Abst (_, _, prf)) k = prf_loose_Pbvar1 prf k |
|
566 |
| prf_loose_Pbvar1 _ _ = false; |
|
567 |
||
63857 | 568 |
fun prf_add_loose_bnos plev _ (PBound i) (is, js) = |
17492 | 569 |
if i < plev then (is, js) else (insert (op =) (i-plev) is, js) |
12279 | 570 |
| prf_add_loose_bnos plev tlev (prf1 %% prf2) p = |
571 |
prf_add_loose_bnos plev tlev prf2 |
|
572 |
(prf_add_loose_bnos plev tlev prf1 p) |
|
573 |
| prf_add_loose_bnos plev tlev (prf % opt) (is, js) = |
|
64566 | 574 |
prf_add_loose_bnos plev tlev prf |
575 |
(case opt of |
|
17492 | 576 |
NONE => (is, insert (op =) ~1 js) |
15531 | 577 |
| SOME t => (is, add_loose_bnos (t, tlev, js))) |
12279 | 578 |
| prf_add_loose_bnos plev tlev (AbsP (_, opt, prf)) (is, js) = |
64566 | 579 |
prf_add_loose_bnos (plev+1) tlev prf |
580 |
(case opt of |
|
17492 | 581 |
NONE => (is, insert (op =) ~1 js) |
15531 | 582 |
| SOME t => (is, add_loose_bnos (t, tlev, js))) |
12279 | 583 |
| prf_add_loose_bnos plev tlev (Abst (_, _, prf)) p = |
584 |
prf_add_loose_bnos plev (tlev+1) prf p |
|
585 |
| prf_add_loose_bnos _ _ _ _ = ([], []); |
|
586 |
||
11519 | 587 |
|
588 |
(**** substitutions ****) |
|
589 |
||
31977 | 590 |
fun del_conflicting_tvars envT T = Term_Subst.instantiateT |
19482
9f11af8f7ef9
tuned basic list operators (flat, maps, map_filter);
wenzelm
parents:
19357
diff
changeset
|
591 |
(map_filter (fn ixnS as (_, S) => |
26328 | 592 |
(Type.lookup envT ixnS; NONE) handle TYPE _ => |
44118
69e29cf993c0
avoid OldTerm operations -- with subtle changes of semantics;
wenzelm
parents:
44116
diff
changeset
|
593 |
SOME (ixnS, TFree ("'dummy", S))) (Term.add_tvarsT T [])) T; |
18316
4b62e0cb3aa8
Improved norm_proof to handle proofs containing term (type) variables
berghofe
parents:
18030
diff
changeset
|
594 |
|
31977 | 595 |
fun del_conflicting_vars env t = Term_Subst.instantiate |
19482
9f11af8f7ef9
tuned basic list operators (flat, maps, map_filter);
wenzelm
parents:
19357
diff
changeset
|
596 |
(map_filter (fn ixnS as (_, S) => |
32019 | 597 |
(Type.lookup (Envir.type_env env) ixnS; NONE) handle TYPE _ => |
44118
69e29cf993c0
avoid OldTerm operations -- with subtle changes of semantics;
wenzelm
parents:
44116
diff
changeset
|
598 |
SOME (ixnS, TFree ("'dummy", S))) (Term.add_tvars t []), |
69e29cf993c0
avoid OldTerm operations -- with subtle changes of semantics;
wenzelm
parents:
44116
diff
changeset
|
599 |
map_filter (fn (ixnT as (_, T)) => |
51700 | 600 |
(Envir.lookup env ixnT; NONE) handle TYPE _ => |
44118
69e29cf993c0
avoid OldTerm operations -- with subtle changes of semantics;
wenzelm
parents:
44116
diff
changeset
|
601 |
SOME (ixnT, Free ("dummy", T))) (Term.add_vars t [])) t; |
18316
4b62e0cb3aa8
Improved norm_proof to handle proofs containing term (type) variables
berghofe
parents:
18030
diff
changeset
|
602 |
|
11519 | 603 |
fun norm_proof env = |
604 |
let |
|
32019 | 605 |
val envT = Envir.type_env env; |
18316
4b62e0cb3aa8
Improved norm_proof to handle proofs containing term (type) variables
berghofe
parents:
18030
diff
changeset
|
606 |
fun msg s = warning ("type conflict in norm_proof:\n" ^ s); |
4b62e0cb3aa8
Improved norm_proof to handle proofs containing term (type) variables
berghofe
parents:
18030
diff
changeset
|
607 |
fun htype f t = f env t handle TYPE (s, _, _) => |
4b62e0cb3aa8
Improved norm_proof to handle proofs containing term (type) variables
berghofe
parents:
18030
diff
changeset
|
608 |
(msg s; f env (del_conflicting_vars env t)); |
4b62e0cb3aa8
Improved norm_proof to handle proofs containing term (type) variables
berghofe
parents:
18030
diff
changeset
|
609 |
fun htypeT f T = f envT T handle TYPE (s, _, _) => |
4b62e0cb3aa8
Improved norm_proof to handle proofs containing term (type) variables
berghofe
parents:
18030
diff
changeset
|
610 |
(msg s; f envT (del_conflicting_tvars envT T)); |
4b62e0cb3aa8
Improved norm_proof to handle proofs containing term (type) variables
berghofe
parents:
18030
diff
changeset
|
611 |
fun htypeTs f Ts = f envT Ts handle TYPE (s, _, _) => |
4b62e0cb3aa8
Improved norm_proof to handle proofs containing term (type) variables
berghofe
parents:
18030
diff
changeset
|
612 |
(msg s; f envT (map (del_conflicting_tvars envT) Ts)); |
32024 | 613 |
|
32019 | 614 |
fun norm (Abst (s, T, prf)) = |
32024 | 615 |
(Abst (s, Same.map_option (htypeT Envir.norm_type_same) T, Same.commit norm prf) |
32019 | 616 |
handle Same.SAME => Abst (s, T, norm prf)) |
617 |
| norm (AbsP (s, t, prf)) = |
|
32024 | 618 |
(AbsP (s, Same.map_option (htype Envir.norm_term_same) t, Same.commit norm prf) |
32019 | 619 |
handle Same.SAME => AbsP (s, t, norm prf)) |
620 |
| norm (prf % t) = |
|
621 |
(norm prf % Option.map (htype Envir.norm_term) t |
|
32024 | 622 |
handle Same.SAME => prf % Same.map_option (htype Envir.norm_term_same) t) |
32019 | 623 |
| norm (prf1 %% prf2) = |
624 |
(norm prf1 %% Same.commit norm prf2 |
|
625 |
handle Same.SAME => prf1 %% norm prf2) |
|
626 |
| norm (PAxm (s, prop, Ts)) = |
|
32024 | 627 |
PAxm (s, prop, Same.map_option (htypeTs Envir.norm_types_same) Ts) |
32019 | 628 |
| norm (OfClass (T, c)) = |
629 |
OfClass (htypeT Envir.norm_type_same T, c) |
|
630 |
| norm (Oracle (s, prop, Ts)) = |
|
32024 | 631 |
Oracle (s, prop, Same.map_option (htypeTs Envir.norm_types_same) Ts) |
32019 | 632 |
| norm (Promise (i, prop, Ts)) = |
633 |
Promise (i, prop, htypeTs Envir.norm_types_same Ts) |
|
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
634 |
| norm (PThm (i, ((s, t, Ts), body))) = |
32024 | 635 |
PThm (i, ((s, t, Same.map_option (htypeTs Envir.norm_types_same) Ts), body)) |
32019 | 636 |
| norm _ = raise Same.SAME; |
637 |
in Same.commit norm end; |
|
11519 | 638 |
|
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
639 |
|
11519 | 640 |
(***** Remove some types in proof term (to save space) *****) |
641 |
||
642 |
fun remove_types (Abs (s, _, t)) = Abs (s, dummyT, remove_types t) |
|
643 |
| remove_types (t $ u) = remove_types t $ remove_types u |
|
644 |
| remove_types (Const (s, _)) = Const (s, dummyT) |
|
645 |
| remove_types t = t; |
|
646 |
||
32032 | 647 |
fun remove_types_env (Envir.Envir {maxidx, tenv, tyenv}) = |
39020 | 648 |
Envir.Envir {maxidx = maxidx, tenv = Vartab.map (K (apsnd remove_types)) tenv, tyenv = tyenv}; |
11519 | 649 |
|
650 |
fun norm_proof' env prf = norm_proof (remove_types_env env) prf; |
|
651 |
||
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
652 |
|
11519 | 653 |
(**** substitution of bound variables ****) |
654 |
||
655 |
fun prf_subst_bounds args prf = |
|
656 |
let |
|
657 |
val n = length args; |
|
658 |
fun subst' lev (Bound i) = |
|
32019 | 659 |
(if i<lev then raise Same.SAME (*var is locally bound*) |
30146 | 660 |
else incr_boundvars lev (nth args (i-lev)) |
43278 | 661 |
handle General.Subscript => Bound (i-n)) (*loose: change it*) |
11519 | 662 |
| subst' lev (Abs (a, T, body)) = Abs (a, T, subst' (lev+1) body) |
663 |
| subst' lev (f $ t) = (subst' lev f $ substh' lev t |
|
32019 | 664 |
handle Same.SAME => f $ subst' lev t) |
665 |
| subst' _ _ = raise Same.SAME |
|
666 |
and substh' lev t = (subst' lev t handle Same.SAME => t); |
|
11519 | 667 |
|
32057 | 668 |
fun subst lev (AbsP (a, t, body)) = |
669 |
(AbsP (a, Same.map_option (subst' lev) t, substh lev body) |
|
32019 | 670 |
handle Same.SAME => AbsP (a, t, subst lev body)) |
11519 | 671 |
| subst lev (Abst (a, T, body)) = Abst (a, T, subst (lev+1) body) |
11615 | 672 |
| subst lev (prf %% prf') = (subst lev prf %% substh lev prf' |
32019 | 673 |
handle Same.SAME => prf %% subst lev prf') |
15570 | 674 |
| subst lev (prf % t) = (subst lev prf % Option.map (substh' lev) t |
32024 | 675 |
handle Same.SAME => prf % Same.map_option (subst' lev) t) |
32019 | 676 |
| subst _ _ = raise Same.SAME |
32024 | 677 |
and substh lev prf = (subst lev prf handle Same.SAME => prf); |
64566 | 678 |
in (case args of [] => prf | _ => substh 0 prf) end; |
11519 | 679 |
|
680 |
fun prf_subst_pbounds args prf = |
|
681 |
let |
|
682 |
val n = length args; |
|
683 |
fun subst (PBound i) Plev tlev = |
|
32019 | 684 |
(if i < Plev then raise Same.SAME (*var is locally bound*) |
30146 | 685 |
else incr_pboundvars Plev tlev (nth args (i-Plev)) |
43278 | 686 |
handle General.Subscript => PBound (i-n) (*loose: change it*)) |
11519 | 687 |
| subst (AbsP (a, t, body)) Plev tlev = AbsP (a, t, subst body (Plev+1) tlev) |
688 |
| subst (Abst (a, T, body)) Plev tlev = Abst (a, T, subst body Plev (tlev+1)) |
|
11615 | 689 |
| subst (prf %% prf') Plev tlev = (subst prf Plev tlev %% substh prf' Plev tlev |
32019 | 690 |
handle Same.SAME => prf %% subst prf' Plev tlev) |
11615 | 691 |
| subst (prf % t) Plev tlev = subst prf Plev tlev % t |
63857 | 692 |
| subst _ _ _ = raise Same.SAME |
32019 | 693 |
and substh prf Plev tlev = (subst prf Plev tlev handle Same.SAME => prf) |
64566 | 694 |
in (case args of [] => prf | _ => substh prf 0 0) end; |
11519 | 695 |
|
696 |
||
697 |
(**** Freezing and thawing of variables in proof terms ****) |
|
698 |
||
44101 | 699 |
local |
700 |
||
11519 | 701 |
fun frzT names = |
44101 | 702 |
map_type_tvar (fn (ixn, S) => TFree (the (AList.lookup (op =) names ixn), S)); |
11519 | 703 |
|
704 |
fun thawT names = |
|
44101 | 705 |
map_type_tfree (fn (a, S) => |
706 |
(case AList.lookup (op =) names a of |
|
707 |
NONE => TFree (a, S) |
|
708 |
| SOME ixn => TVar (ixn, S))); |
|
11519 | 709 |
|
710 |
fun freeze names names' (t $ u) = |
|
711 |
freeze names names' t $ freeze names names' u |
|
712 |
| freeze names names' (Abs (s, T, t)) = |
|
713 |
Abs (s, frzT names' T, freeze names names' t) |
|
63857 | 714 |
| freeze _ names' (Const (s, T)) = Const (s, frzT names' T) |
715 |
| freeze _ names' (Free (s, T)) = Free (s, frzT names' T) |
|
11519 | 716 |
| freeze names names' (Var (ixn, T)) = |
44101 | 717 |
Free (the (AList.lookup (op =) names ixn), frzT names' T) |
63857 | 718 |
| freeze _ _ t = t; |
11519 | 719 |
|
720 |
fun thaw names names' (t $ u) = |
|
721 |
thaw names names' t $ thaw names names' u |
|
722 |
| thaw names names' (Abs (s, T, t)) = |
|
723 |
Abs (s, thawT names' T, thaw names names' t) |
|
63857 | 724 |
| thaw _ names' (Const (s, T)) = Const (s, thawT names' T) |
21646
c07b5b0e8492
thm/prf: separate official name vs. additional tags;
wenzelm
parents:
20853
diff
changeset
|
725 |
| thaw names names' (Free (s, T)) = |
44101 | 726 |
let val T' = thawT names' T in |
727 |
(case AList.lookup (op =) names s of |
|
15531 | 728 |
NONE => Free (s, T') |
44101 | 729 |
| SOME ixn => Var (ixn, T')) |
11519 | 730 |
end |
63857 | 731 |
| thaw _ names' (Var (ixn, T)) = Var (ixn, thawT names' T) |
732 |
| thaw _ _ t = t; |
|
11519 | 733 |
|
44101 | 734 |
in |
735 |
||
11519 | 736 |
fun freeze_thaw_prf prf = |
737 |
let |
|
738 |
val (fs, Tfs, vs, Tvs) = fold_proof_terms |
|
20147 | 739 |
(fn t => fn (fs, Tfs, vs, Tvs) => |
29261 | 740 |
(Term.add_free_names t fs, Term.add_tfree_names t Tfs, |
741 |
Term.add_var_names t vs, Term.add_tvar_names t Tvs)) |
|
20147 | 742 |
(fn T => fn (fs, Tfs, vs, Tvs) => |
29261 | 743 |
(fs, Term.add_tfree_namesT T Tfs, |
744 |
vs, Term.add_tvar_namesT T Tvs)) |
|
20147 | 745 |
prf ([], [], [], []); |
29261 | 746 |
val names = vs ~~ Name.variant_list fs (map fst vs); |
20071
8f3e1ddb50e6
replaced Term.variant(list) by Name.variant(_list);
wenzelm
parents:
20000
diff
changeset
|
747 |
val names' = Tvs ~~ Name.variant_list Tfs (map fst Tvs); |
11519 | 748 |
val rnames = map swap names; |
749 |
val rnames' = map swap names'; |
|
750 |
in |
|
751 |
(map_proof_terms (freeze names names') (frzT names') prf, |
|
752 |
map_proof_terms (thaw rnames rnames') (thawT rnames')) |
|
753 |
end; |
|
754 |
||
44101 | 755 |
end; |
756 |
||
11519 | 757 |
|
758 |
(***** implication introduction *****) |
|
759 |
||
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
760 |
fun gen_implies_intr_proof f h prf = |
11519 | 761 |
let |
32019 | 762 |
fun abshyp i (Hyp t) = if h aconv t then PBound i else raise Same.SAME |
11519 | 763 |
| abshyp i (Abst (s, T, prf)) = Abst (s, T, abshyp i prf) |
32024 | 764 |
| abshyp i (AbsP (s, t, prf)) = AbsP (s, t, abshyp (i + 1) prf) |
11615 | 765 |
| abshyp i (prf % t) = abshyp i prf % t |
32024 | 766 |
| abshyp i (prf1 %% prf2) = |
767 |
(abshyp i prf1 %% abshyph i prf2 |
|
768 |
handle Same.SAME => prf1 %% abshyp i prf2) |
|
32019 | 769 |
| abshyp _ _ = raise Same.SAME |
32024 | 770 |
and abshyph i prf = (abshyp i prf handle Same.SAME => prf); |
11519 | 771 |
in |
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
772 |
AbsP ("H", f h, abshyph 0 prf) |
11519 | 773 |
end; |
774 |
||
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
775 |
val implies_intr_proof = gen_implies_intr_proof (K NONE); |
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
776 |
val implies_intr_proof' = gen_implies_intr_proof SOME; |
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
777 |
|
11519 | 778 |
|
779 |
(***** forall introduction *****) |
|
780 |
||
15531 | 781 |
fun forall_intr_proof x a prf = Abst (a, NONE, prf_abstract_over x prf); |
11519 | 782 |
|
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
783 |
fun forall_intr_proof' t prf = |
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
784 |
let val (a, T) = (case t of Var ((a, _), T) => (a, T) | Free p => p) |
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
785 |
in Abst (a, SOME T, prf_abstract_over t prf) end; |
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
786 |
|
11519 | 787 |
|
788 |
(***** varify *****) |
|
789 |
||
790 |
fun varify_proof t fixed prf = |
|
791 |
let |
|
19304 | 792 |
val fs = Term.fold_types (Term.fold_atyps |
793 |
(fn TFree v => if member (op =) fixed v then I else insert (op =) v | _ => I)) t []; |
|
29261 | 794 |
val used = Name.context |
795 |
|> fold_types (fold_atyps (fn TVar ((a, _), _) => Name.declare a | _ => I)) t; |
|
43326
47cf4bc789aa
simplified Name.variant -- discontinued builtin fold_map;
wenzelm
parents:
43324
diff
changeset
|
796 |
val fmap = fs ~~ #1 (fold_map Name.variant (map fst fs) used); |
63857 | 797 |
fun thaw (a, S) = |
798 |
(case AList.lookup (op =) fmap (a, S) of |
|
799 |
NONE => TFree (a, S) |
|
15531 | 800 |
| SOME b => TVar ((b, 0), S)); |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
801 |
in map_proof_terms (map_types (map_type_tfree thaw)) (map_type_tfree thaw) prf end; |
11519 | 802 |
|
803 |
||
804 |
local |
|
805 |
||
44116
c70257b4cb7e
avoid OldTerm operations -- with subtle changes of semantics;
wenzelm
parents:
44113
diff
changeset
|
806 |
fun new_name ix (pairs, used) = |
43324
2b47822868e4
discontinued Name.variant to emphasize that this is old-style / indirect;
wenzelm
parents:
43278
diff
changeset
|
807 |
let val v = singleton (Name.variant_list used) (string_of_indexname ix) |
44116
c70257b4cb7e
avoid OldTerm operations -- with subtle changes of semantics;
wenzelm
parents:
44113
diff
changeset
|
808 |
in ((ix, v) :: pairs, v :: used) end; |
11519 | 809 |
|
44116
c70257b4cb7e
avoid OldTerm operations -- with subtle changes of semantics;
wenzelm
parents:
44113
diff
changeset
|
810 |
fun freeze_one alist (ix, sort) = |
c70257b4cb7e
avoid OldTerm operations -- with subtle changes of semantics;
wenzelm
parents:
44113
diff
changeset
|
811 |
(case AList.lookup (op =) alist ix of |
15531 | 812 |
NONE => TVar (ix, sort) |
813 |
| SOME name => TFree (name, sort)); |
|
11519 | 814 |
|
815 |
in |
|
816 |
||
36619
deadcd0ec431
renamed Proofterm.freezeT to Proofterm.legacy_freezeT (cf. 88756a5a92fc);
wenzelm
parents:
35851
diff
changeset
|
817 |
fun legacy_freezeT t prf = |
11519 | 818 |
let |
44116
c70257b4cb7e
avoid OldTerm operations -- with subtle changes of semantics;
wenzelm
parents:
44113
diff
changeset
|
819 |
val used = Term.add_tfree_names t []; |
c70257b4cb7e
avoid OldTerm operations -- with subtle changes of semantics;
wenzelm
parents:
44113
diff
changeset
|
820 |
val (alist, _) = fold_rev new_name (map #1 (Term.add_tvars t [])) ([], used); |
11519 | 821 |
in |
822 |
(case alist of |
|
823 |
[] => prf (*nothing to do!*) |
|
824 |
| _ => |
|
44116
c70257b4cb7e
avoid OldTerm operations -- with subtle changes of semantics;
wenzelm
parents:
44113
diff
changeset
|
825 |
let val frzT = map_type_tvar (freeze_one alist) |
c70257b4cb7e
avoid OldTerm operations -- with subtle changes of semantics;
wenzelm
parents:
44113
diff
changeset
|
826 |
in map_proof_terms (map_types frzT) frzT prf end) |
11519 | 827 |
end; |
828 |
||
829 |
end; |
|
830 |
||
831 |
||
832 |
(***** rotate assumptions *****) |
|
833 |
||
834 |
fun rotate_proof Bs Bi m prf = |
|
835 |
let |
|
836 |
val params = Term.strip_all_vars Bi; |
|
837 |
val asms = Logic.strip_imp_prems (Term.strip_all_body Bi); |
|
838 |
val i = length asms; |
|
839 |
val j = length Bs; |
|
840 |
in |
|
841 |
mk_AbsP (j+1, proof_combP (prf, map PBound |
|
23178 | 842 |
(j downto 1) @ [mk_Abst params (mk_AbsP (i, |
11519 | 843 |
proof_combP (proof_combt (PBound i, map Bound ((length params - 1) downto 0)), |
23178 | 844 |
map PBound (((i-m-1) downto 0) @ ((i-1) downto (i-m))))))])) |
11519 | 845 |
end; |
846 |
||
847 |
||
848 |
(***** permute premises *****) |
|
849 |
||
36742 | 850 |
fun permute_prems_proof prems j k prf = |
11519 | 851 |
let val n = length prems |
852 |
in mk_AbsP (n, proof_combP (prf, |
|
853 |
map PBound ((n-1 downto n-j) @ (k-1 downto 0) @ (n-j-1 downto k)))) |
|
854 |
end; |
|
855 |
||
856 |
||
19908 | 857 |
(***** generalization *****) |
858 |
||
20000 | 859 |
fun generalize (tfrees, frees) idx = |
36620
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
860 |
Same.commit (map_proof_terms_same |
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
861 |
(Term_Subst.generalize_same (tfrees, frees) idx) |
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
862 |
(Term_Subst.generalizeT_same tfrees idx)); |
19908 | 863 |
|
864 |
||
11519 | 865 |
(***** instantiation *****) |
866 |
||
20000 | 867 |
fun instantiate (instT, inst) = |
36620
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
868 |
Same.commit (map_proof_terms_same |
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
869 |
(Term_Subst.instantiate_same (instT, map (apsnd remove_types) inst)) |
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
870 |
(Term_Subst.instantiateT_same instT)); |
11519 | 871 |
|
872 |
||
873 |
(***** lifting *****) |
|
874 |
||
875 |
fun lift_proof Bi inc prop prf = |
|
876 |
let |
|
32024 | 877 |
fun lift'' Us Ts t = |
59787 | 878 |
strip_abs Ts (Logic.incr_indexes ([], Us, inc) (mk_abs Ts t)); |
11519 | 879 |
|
11715
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
880 |
fun lift' Us Ts (Abst (s, T, prf)) = |
32024 | 881 |
(Abst (s, Same.map_option (Logic.incr_tvar_same inc) T, lifth' Us (dummyT::Ts) prf) |
32019 | 882 |
handle Same.SAME => Abst (s, T, lift' Us (dummyT::Ts) prf)) |
11715
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
883 |
| lift' Us Ts (AbsP (s, t, prf)) = |
32024 | 884 |
(AbsP (s, Same.map_option (same (op =) (lift'' Us Ts)) t, lifth' Us Ts prf) |
32019 | 885 |
handle Same.SAME => AbsP (s, t, lift' Us Ts prf)) |
15570 | 886 |
| lift' Us Ts (prf % t) = (lift' Us Ts prf % Option.map (lift'' Us Ts) t |
32024 | 887 |
handle Same.SAME => prf % Same.map_option (same (op =) (lift'' Us Ts)) t) |
11715
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
888 |
| lift' Us Ts (prf1 %% prf2) = (lift' Us Ts prf1 %% lifth' Us Ts prf2 |
32019 | 889 |
handle Same.SAME => prf1 %% lift' Us Ts prf2) |
11715
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
890 |
| lift' _ _ (PAxm (s, prop, Ts)) = |
32024 | 891 |
PAxm (s, prop, (Same.map_option o Same.map) (Logic.incr_tvar_same inc) Ts) |
31943
5e960a0780a2
renamed inclass/Inclass to of_class/OfClass, in accordance to of_sort;
wenzelm
parents:
31903
diff
changeset
|
892 |
| lift' _ _ (OfClass (T, c)) = |
32024 | 893 |
OfClass (Logic.incr_tvar_same inc T, c) |
28828
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
894 |
| lift' _ _ (Oracle (s, prop, Ts)) = |
32024 | 895 |
Oracle (s, prop, (Same.map_option o Same.map) (Logic.incr_tvar_same inc) Ts) |
28828
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
896 |
| lift' _ _ (Promise (i, prop, Ts)) = |
32024 | 897 |
Promise (i, prop, Same.map (Logic.incr_tvar_same inc) Ts) |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
898 |
| lift' _ _ (PThm (i, ((s, prop, Ts), body))) = |
32024 | 899 |
PThm (i, ((s, prop, (Same.map_option o Same.map) (Logic.incr_tvar inc) Ts), body)) |
32019 | 900 |
| lift' _ _ _ = raise Same.SAME |
901 |
and lifth' Us Ts prf = (lift' Us Ts prf handle Same.SAME => prf); |
|
11519 | 902 |
|
18030 | 903 |
val ps = map (Logic.lift_all inc Bi) (Logic.strip_imp_prems prop); |
11519 | 904 |
val k = length ps; |
905 |
||
23178 | 906 |
fun mk_app b (i, j, prf) = |
11615 | 907 |
if b then (i-1, j, prf %% PBound i) else (i, j-1, prf %> Bound j); |
11519 | 908 |
|
56245 | 909 |
fun lift Us bs i j (Const ("Pure.imp", _) $ A $ B) = |
20147 | 910 |
AbsP ("H", NONE (*A*), lift Us (true::bs) (i+1) j B) |
56245 | 911 |
| lift Us bs i j (Const ("Pure.all", _) $ Abs (a, T, t)) = |
20147 | 912 |
Abst (a, NONE (*T*), lift (T::Us) (false::bs) i (j+1) t) |
11715
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
913 |
| lift Us bs i j _ = proof_combP (lifth' (rev Us) [] prf, |
23178 | 914 |
map (fn k => (#3 (fold_rev mk_app bs (i-1, j-1, PBound k)))) |
11519 | 915 |
(i + k - 1 downto i)); |
916 |
in |
|
917 |
mk_AbsP (k, lift [] [] 0 0 Bi) |
|
918 |
end; |
|
919 |
||
32027 | 920 |
fun incr_indexes i = |
36620
e6bb250402b5
simplified/unified fundamental operations on types/terms/proofterms -- prefer Same.operation over "option" variant;
wenzelm
parents:
36619
diff
changeset
|
921 |
Same.commit (map_proof_terms_same |
59787 | 922 |
(Logic.incr_indexes_same ([], [], i)) (Logic.incr_tvar_same i)); |
32027 | 923 |
|
11519 | 924 |
|
925 |
(***** proof by assumption *****) |
|
926 |
||
23296
25f28f9c28a3
Adapted Proofterm.bicompose_proof to Larry's changes in
berghofe
parents:
23178
diff
changeset
|
927 |
fun mk_asm_prf t i m = |
25f28f9c28a3
Adapted Proofterm.bicompose_proof to Larry's changes in
berghofe
parents:
23178
diff
changeset
|
928 |
let |
25f28f9c28a3
Adapted Proofterm.bicompose_proof to Larry's changes in
berghofe
parents:
23178
diff
changeset
|
929 |
fun imp_prf _ i 0 = PBound i |
56245 | 930 |
| imp_prf (Const ("Pure.imp", _) $ A $ B) i m = AbsP ("H", NONE (*A*), imp_prf B (i+1) (m-1)) |
23296
25f28f9c28a3
Adapted Proofterm.bicompose_proof to Larry's changes in
berghofe
parents:
23178
diff
changeset
|
931 |
| imp_prf _ i _ = PBound i; |
56245 | 932 |
fun all_prf (Const ("Pure.all", _) $ Abs (a, T, t)) = Abst (a, NONE (*T*), all_prf t) |
23296
25f28f9c28a3
Adapted Proofterm.bicompose_proof to Larry's changes in
berghofe
parents:
23178
diff
changeset
|
933 |
| all_prf t = imp_prf t (~i) m |
25f28f9c28a3
Adapted Proofterm.bicompose_proof to Larry's changes in
berghofe
parents:
23178
diff
changeset
|
934 |
in all_prf t end; |
11519 | 935 |
|
936 |
fun assumption_proof Bs Bi n prf = |
|
937 |
mk_AbsP (length Bs, proof_combP (prf, |
|
23296
25f28f9c28a3
Adapted Proofterm.bicompose_proof to Larry's changes in
berghofe
parents:
23178
diff
changeset
|
938 |
map PBound (length Bs - 1 downto 0) @ [mk_asm_prf Bi n ~1])); |
11519 | 939 |
|
940 |
||
941 |
(***** Composition of object rule with proof state *****) |
|
942 |
||
56245 | 943 |
fun flatten_params_proof i j n (Const ("Pure.imp", _) $ A $ B, k) = |
15531 | 944 |
AbsP ("H", NONE (*A*), flatten_params_proof (i+1) j n (B, k)) |
56245 | 945 |
| flatten_params_proof i j n (Const ("Pure.all", _) $ Abs (a, T, t), k) = |
15531 | 946 |
Abst (a, NONE (*T*), flatten_params_proof i (j+1) n (t, k)) |
11519 | 947 |
| flatten_params_proof i j n (_, k) = proof_combP (proof_combt (PBound (k+i), |
19304 | 948 |
map Bound (j-1 downto 0)), map PBound (remove (op =) (i-n) (i-1 downto 0))); |
11519 | 949 |
|
23296
25f28f9c28a3
Adapted Proofterm.bicompose_proof to Larry's changes in
berghofe
parents:
23178
diff
changeset
|
950 |
fun bicompose_proof flatten Bs oldAs newAs A n m rprf sprf = |
11519 | 951 |
let |
952 |
val la = length newAs; |
|
953 |
val lb = length Bs; |
|
954 |
in |
|
955 |
mk_AbsP (lb+la, proof_combP (sprf, |
|
11615 | 956 |
map PBound (lb + la - 1 downto la)) %% |
23296
25f28f9c28a3
Adapted Proofterm.bicompose_proof to Larry's changes in
berghofe
parents:
23178
diff
changeset
|
957 |
proof_combP (rprf, (if n>0 then [mk_asm_prf (the A) n m] else []) @ |
18485 | 958 |
map (if flatten then flatten_params_proof 0 0 n else PBound o snd) |
959 |
(oldAs ~~ (la - 1 downto 0)))) |
|
11519 | 960 |
end; |
961 |
||
962 |
||
963 |
(***** axioms for equality *****) |
|
964 |
||
14854 | 965 |
val aT = TFree ("'a", []); |
966 |
val bT = TFree ("'b", []); |
|
11519 | 967 |
val x = Free ("x", aT); |
968 |
val y = Free ("y", aT); |
|
969 |
val z = Free ("z", aT); |
|
970 |
val A = Free ("A", propT); |
|
971 |
val B = Free ("B", propT); |
|
972 |
val f = Free ("f", aT --> bT); |
|
973 |
val g = Free ("g", aT --> bT); |
|
974 |
||
975 |
val equality_axms = |
|
35851 | 976 |
[("reflexive", Logic.mk_equals (x, x)), |
977 |
("symmetric", Logic.mk_implies (Logic.mk_equals (x, y), Logic.mk_equals (y, x))), |
|
978 |
("transitive", |
|
979 |
Logic.list_implies ([Logic.mk_equals (x, y), Logic.mk_equals (y, z)], Logic.mk_equals (x, z))), |
|
980 |
("equal_intr", |
|
981 |
Logic.list_implies ([Logic.mk_implies (A, B), Logic.mk_implies (B, A)], Logic.mk_equals (A, B))), |
|
982 |
("equal_elim", Logic.list_implies ([Logic.mk_equals (A, B), A], B)), |
|
983 |
("abstract_rule", |
|
984 |
Logic.mk_implies |
|
985 |
(Logic.all x |
|
986 |
(Logic.mk_equals (f $ x, g $ x)), Logic.mk_equals (lambda x (f $ x), lambda x (g $ x)))), |
|
987 |
("combination", Logic.list_implies |
|
988 |
([Logic.mk_equals (f, g), Logic.mk_equals (x, y)], Logic.mk_equals (f $ x, g $ y)))]; |
|
11519 | 989 |
|
990 |
val [reflexive_axm, symmetric_axm, transitive_axm, equal_intr_axm, |
|
991 |
equal_elim_axm, abstract_rule_axm, combination_axm] = |
|
35851 | 992 |
map (fn (s, t) => PAxm ("Pure." ^ s, Logic.varify_global t, NONE)) equality_axms; |
11519 | 993 |
|
15531 | 994 |
val reflexive = reflexive_axm % NONE; |
11519 | 995 |
|
26424 | 996 |
fun symmetric (prf as PAxm ("Pure.reflexive", _, _) % _) = prf |
15531 | 997 |
| symmetric prf = symmetric_axm % NONE % NONE %% prf; |
11519 | 998 |
|
26424 | 999 |
fun transitive _ _ (PAxm ("Pure.reflexive", _, _) % _) prf2 = prf2 |
1000 |
| transitive _ _ prf1 (PAxm ("Pure.reflexive", _, _) % _) = prf1 |
|
11519 | 1001 |
| transitive u (Type ("prop", [])) prf1 prf2 = |
15531 | 1002 |
transitive_axm % NONE % SOME (remove_types u) % NONE %% prf1 %% prf2 |
63857 | 1003 |
| transitive _ _ prf1 prf2 = transitive_axm % NONE % NONE % NONE %% prf1 %% prf2; |
11519 | 1004 |
|
1005 |
fun abstract_rule x a prf = |
|
15531 | 1006 |
abstract_rule_axm % NONE % NONE %% forall_intr_proof x a prf; |
11519 | 1007 |
|
63857 | 1008 |
fun check_comb (PAxm ("Pure.combination", _, _) % f % _ % _ % _ %% prf %% _) = |
19502 | 1009 |
is_some f orelse check_comb prf |
26424 | 1010 |
| check_comb (PAxm ("Pure.transitive", _, _) % _ % _ % _ %% prf1 %% prf2) = |
11519 | 1011 |
check_comb prf1 andalso check_comb prf2 |
26424 | 1012 |
| check_comb (PAxm ("Pure.symmetric", _, _) % _ % _ %% prf) = check_comb prf |
11519 | 1013 |
| check_comb _ = false; |
1014 |
||
1015 |
fun combination f g t u (Type (_, [T, U])) prf1 prf2 = |
|
1016 |
let |
|
1017 |
val f = Envir.beta_norm f; |
|
1018 |
val g = Envir.beta_norm g; |
|
44100 | 1019 |
val prf = |
1020 |
if check_comb prf1 then |
|
15531 | 1021 |
combination_axm % NONE % NONE |
44100 | 1022 |
else |
1023 |
(case prf1 of |
|
26424 | 1024 |
PAxm ("Pure.reflexive", _, _) % _ => |
15531 | 1025 |
combination_axm %> remove_types f % NONE |
11615 | 1026 |
| _ => combination_axm %> remove_types f %> remove_types g) |
11519 | 1027 |
in |
1028 |
(case T of |
|
44100 | 1029 |
Type ("fun", _) => prf % |
1030 |
(case head_of f of |
|
1031 |
Abs _ => SOME (remove_types t) |
|
1032 |
| Var _ => SOME (remove_types t) |
|
1033 |
| _ => NONE) % |
|
1034 |
(case head_of g of |
|
64566 | 1035 |
Abs _ => SOME (remove_types u) |
44100 | 1036 |
| Var _ => SOME (remove_types u) |
1037 |
| _ => NONE) %% prf1 %% prf2 |
|
15531 | 1038 |
| _ => prf % NONE % NONE %% prf1 %% prf2) |
11519 | 1039 |
end; |
1040 |
||
1041 |
fun equal_intr A B prf1 prf2 = |
|
11615 | 1042 |
equal_intr_axm %> remove_types A %> remove_types B %% prf1 %% prf2; |
11519 | 1043 |
|
1044 |
fun equal_elim A B prf1 prf2 = |
|
11615 | 1045 |
equal_elim_axm %> remove_types A %> remove_types B %% prf1 %% prf2; |
11519 | 1046 |
|
1047 |
||
36740 | 1048 |
(**** type classes ****) |
36621
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
wenzelm
parents:
36620
diff
changeset
|
1049 |
|
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
wenzelm
parents:
36620
diff
changeset
|
1050 |
fun strip_shyps_proof algebra present witnessed extra_sorts prf = |
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
wenzelm
parents:
36620
diff
changeset
|
1051 |
let |
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
wenzelm
parents:
36620
diff
changeset
|
1052 |
fun get S2 (T, S1) = if Sorts.sort_le algebra (S1, S2) then SOME T else NONE; |
36732
9c2ee10809b2
strip_shyps_proof: dummy TFrees are called "'dummy" as in del_conflicting_tvars below;
wenzelm
parents:
36621
diff
changeset
|
1053 |
val extra = map (fn S => (TFree ("'dummy", S), S)) extra_sorts; |
36621
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
wenzelm
parents:
36620
diff
changeset
|
1054 |
val replacements = present @ extra @ witnessed; |
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
wenzelm
parents:
36620
diff
changeset
|
1055 |
fun replace T = |
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
wenzelm
parents:
36620
diff
changeset
|
1056 |
if exists (fn (T', _) => T' = T) present then raise Same.SAME |
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
wenzelm
parents:
36620
diff
changeset
|
1057 |
else |
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
wenzelm
parents:
36620
diff
changeset
|
1058 |
(case get_first (get (Type.sort_of_atyp T)) replacements of |
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
wenzelm
parents:
36620
diff
changeset
|
1059 |
SOME T' => T' |
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
wenzelm
parents:
36620
diff
changeset
|
1060 |
| NONE => raise Fail "strip_shyps_proof: bad type variable in proof term"); |
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
wenzelm
parents:
36620
diff
changeset
|
1061 |
in Same.commit (map_proof_types_same (Term_Subst.map_atypsT_same replace)) prf end; |
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
wenzelm
parents:
36620
diff
changeset
|
1062 |
|
2fd4e2c76636
proof terms for strip_shyps, based on the version by krauss/schropp with some notable differences:
wenzelm
parents:
36620
diff
changeset
|
1063 |
|
36740 | 1064 |
local |
1065 |
||
1066 |
type axclass_proofs = |
|
1067 |
{classrel_proof: theory -> class * class -> proof, |
|
1068 |
arity_proof: theory -> string * sort list * class -> proof}; |
|
1069 |
||
62897
8093203f0b89
prefer regular context update, to allow continuous editing of Pure;
wenzelm
parents:
62538
diff
changeset
|
1070 |
structure Axclass_Proofs = Theory_Data |
8093203f0b89
prefer regular context update, to allow continuous editing of Pure;
wenzelm
parents:
62538
diff
changeset
|
1071 |
( |
8093203f0b89
prefer regular context update, to allow continuous editing of Pure;
wenzelm
parents:
62538
diff
changeset
|
1072 |
type T = axclass_proofs option; |
8093203f0b89
prefer regular context update, to allow continuous editing of Pure;
wenzelm
parents:
62538
diff
changeset
|
1073 |
val empty = NONE; |
8093203f0b89
prefer regular context update, to allow continuous editing of Pure;
wenzelm
parents:
62538
diff
changeset
|
1074 |
val extend = I; |
8093203f0b89
prefer regular context update, to allow continuous editing of Pure;
wenzelm
parents:
62538
diff
changeset
|
1075 |
val merge = merge_options; |
8093203f0b89
prefer regular context update, to allow continuous editing of Pure;
wenzelm
parents:
62538
diff
changeset
|
1076 |
); |
36740 | 1077 |
|
62897
8093203f0b89
prefer regular context update, to allow continuous editing of Pure;
wenzelm
parents:
62538
diff
changeset
|
1078 |
fun the_axclass_proofs which thy x = |
8093203f0b89
prefer regular context update, to allow continuous editing of Pure;
wenzelm
parents:
62538
diff
changeset
|
1079 |
(case Axclass_Proofs.get thy of |
36740 | 1080 |
NONE => raise Fail "Axclass proof operations not installed" |
62897
8093203f0b89
prefer regular context update, to allow continuous editing of Pure;
wenzelm
parents:
62538
diff
changeset
|
1081 |
| SOME proofs => which proofs thy x); |
36740 | 1082 |
|
1083 |
in |
|
1084 |
||
62897
8093203f0b89
prefer regular context update, to allow continuous editing of Pure;
wenzelm
parents:
62538
diff
changeset
|
1085 |
val classrel_proof = the_axclass_proofs #classrel_proof; |
8093203f0b89
prefer regular context update, to allow continuous editing of Pure;
wenzelm
parents:
62538
diff
changeset
|
1086 |
val arity_proof = the_axclass_proofs #arity_proof; |
36740 | 1087 |
|
62897
8093203f0b89
prefer regular context update, to allow continuous editing of Pure;
wenzelm
parents:
62538
diff
changeset
|
1088 |
fun install_axclass_proofs proofs = |
8093203f0b89
prefer regular context update, to allow continuous editing of Pure;
wenzelm
parents:
62538
diff
changeset
|
1089 |
Axclass_Proofs.map |
8093203f0b89
prefer regular context update, to allow continuous editing of Pure;
wenzelm
parents:
62538
diff
changeset
|
1090 |
(fn NONE => SOME proofs |
8093203f0b89
prefer regular context update, to allow continuous editing of Pure;
wenzelm
parents:
62538
diff
changeset
|
1091 |
| SOME _ => raise Fail "Axclass proof operations already installed"); |
36740 | 1092 |
|
1093 |
end; |
|
1094 |
||
1095 |
||
36741
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1096 |
local |
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1097 |
|
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1098 |
fun canonical_instance typs = |
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1099 |
let |
43329
84472e198515
tuned signature: Name.invent and Name.invent_names;
wenzelm
parents:
43326
diff
changeset
|
1100 |
val names = Name.invent Name.context Name.aT (length typs); |
36741
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1101 |
val instT = map2 (fn a => fn T => (((a, 0), []), Type.strip_sorts T)) names typs; |
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1102 |
in instantiate (instT, []) end; |
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1103 |
|
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1104 |
in |
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1105 |
|
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1106 |
fun of_sort_proof thy hyps = |
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1107 |
Sorts.of_sort_derivation (Sign.classes_of thy) |
62538
85ebb645b1a3
provide explicit hint concering uniqueness of derivation
haftmann
parents:
59787
diff
changeset
|
1108 |
{class_relation = fn typ => fn _ => fn (prf, c1) => fn c2 => |
36741
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1109 |
if c1 = c2 then prf |
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1110 |
else canonical_instance [typ] (classrel_proof thy (c1, c2)) %% prf, |
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1111 |
type_constructor = fn (a, typs) => fn dom => fn c => |
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1112 |
let val Ss = map (map snd) dom and prfs = maps (map fst) dom |
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1113 |
in proof_combP (canonical_instance typs (arity_proof thy (a, Ss, c)), prfs) end, |
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1114 |
type_variable = fn typ => map (fn c => (hyps (typ, c), c)) (Type.sort_of_atyp typ)}; |
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1115 |
|
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1116 |
end; |
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1117 |
|
d65ed9d7275e
added of_sort_proof according to krauss/schropp, with slightly more direct canonical_instance;
wenzelm
parents:
36740
diff
changeset
|
1118 |
|
11519 | 1119 |
(***** axioms and theorems *****) |
1120 |
||
52487
48bc24467008
backout dedd7952a62c: static "proofs" value within theory prevents later inferencing with different configuration;
wenzelm
parents:
52470
diff
changeset
|
1121 |
val proofs = Unsynchronized.ref 2; |
48bc24467008
backout dedd7952a62c: static "proofs" value within theory prevents later inferencing with different configuration;
wenzelm
parents:
52470
diff
changeset
|
1122 |
fun proofs_enabled () = ! proofs >= 2; |
48bc24467008
backout dedd7952a62c: static "proofs" value within theory prevents later inferencing with different configuration;
wenzelm
parents:
52470
diff
changeset
|
1123 |
|
28812
413695e07bd4
Frees in PThms are now quantified in the order of their appearance in the
berghofe
parents:
28803
diff
changeset
|
1124 |
fun vars_of t = map Var (rev (Term.add_vars t [])); |
413695e07bd4
Frees in PThms are now quantified in the order of their appearance in the
berghofe
parents:
28803
diff
changeset
|
1125 |
fun frees_of t = map Free (rev (Term.add_frees t [])); |
11519 | 1126 |
|
1127 |
fun test_args _ [] = true |
|
1128 |
| test_args is (Bound i :: ts) = |
|
17492 | 1129 |
not (member (op =) is i) andalso test_args (i :: is) ts |
11519 | 1130 |
| test_args _ _ = false; |
1131 |
||
1132 |
fun is_fun (Type ("fun", _)) = true |
|
1133 |
| is_fun (TVar _) = true |
|
1134 |
| is_fun _ = false; |
|
1135 |
||
1136 |
fun add_funvars Ts (vs, t) = |
|
1137 |
if is_fun (fastype_of1 (Ts, t)) then |
|
33042 | 1138 |
union (op =) vs (map_filter (fn Var (ixn, T) => |
33037
b22e44496dc2
replaced old_style infixes eq_set, subset, union, inter and variants by generic versions
haftmann
parents:
32810
diff
changeset
|
1139 |
if is_fun T then SOME ixn else NONE | _ => NONE) (vars_of t)) |
11519 | 1140 |
else vs; |
1141 |
||
56245 | 1142 |
fun add_npvars q p Ts (vs, Const ("Pure.imp", _) $ t $ u) = |
11519 | 1143 |
add_npvars q p Ts (add_npvars q (not p) Ts (vs, t), u) |
56245 | 1144 |
| add_npvars q p Ts (vs, Const ("Pure.all", Type (_, [Type (_, [T, _]), _])) $ t) = |
11519 | 1145 |
add_npvars q p Ts (vs, if p andalso q then betapply (t, Var (("",0), T)) else t) |
12041 | 1146 |
| add_npvars q p Ts (vs, Abs (_, T, t)) = add_npvars q p (T::Ts) (vs, t) |
1147 |
| add_npvars _ _ Ts (vs, t) = add_npvars' Ts (vs, t) |
|
64566 | 1148 |
and add_npvars' Ts (vs, t) = |
1149 |
(case strip_comb t of |
|
11519 | 1150 |
(Var (ixn, _), ts) => if test_args [] ts then vs |
17314 | 1151 |
else Library.foldl (add_npvars' Ts) |
1152 |
(AList.update (op =) (ixn, |
|
1153 |
Library.foldl (add_funvars Ts) ((these ooo AList.lookup) (op =) vs ixn, ts)) vs, ts) |
|
15570 | 1154 |
| (Abs (_, T, u), ts) => Library.foldl (add_npvars' (T::Ts)) (vs, u :: ts) |
1155 |
| (_, ts) => Library.foldl (add_npvars' Ts) (vs, ts)); |
|
11519 | 1156 |
|
56245 | 1157 |
fun prop_vars (Const ("Pure.imp", _) $ P $ Q) = union (op =) (prop_vars P) (prop_vars Q) |
1158 |
| prop_vars (Const ("Pure.all", _) $ Abs (_, _, t)) = prop_vars t |
|
64566 | 1159 |
| prop_vars t = (case strip_comb t of (Var (ixn, _), _) => [ixn] | _ => []); |
11519 | 1160 |
|
1161 |
fun is_proj t = |
|
1162 |
let |
|
64566 | 1163 |
fun is_p i t = |
1164 |
(case strip_comb t of |
|
63857 | 1165 |
(Bound _, []) => false |
11519 | 1166 |
| (Bound j, ts) => j >= i orelse exists (is_p i) ts |
1167 |
| (Abs (_, _, u), _) => is_p (i+1) u |
|
1168 |
| (_, ts) => exists (is_p i) ts) |
|
64566 | 1169 |
in |
1170 |
(case strip_abs_body t of |
|
1171 |
Bound _ => true |
|
1172 |
| t' => is_p 0 t') |
|
11519 | 1173 |
end; |
1174 |
||
21646
c07b5b0e8492
thm/prf: separate official name vs. additional tags;
wenzelm
parents:
20853
diff
changeset
|
1175 |
fun needed_vars prop = |
33042 | 1176 |
union (op =) (Library.foldl (uncurry (union (op =))) |
1177 |
([], map (uncurry (insert (op =))) (add_npvars true true [] ([], prop)))) |
|
1178 |
(prop_vars prop); |
|
11519 | 1179 |
|
1180 |
fun gen_axm_proof c name prop = |
|
1181 |
let |
|
1182 |
val nvs = needed_vars prop; |
|
1183 |
val args = map (fn (v as Var (ixn, _)) => |
|
17492 | 1184 |
if member (op =) nvs ixn then SOME v else NONE) (vars_of prop) @ |
28812
413695e07bd4
Frees in PThms are now quantified in the order of their appearance in the
berghofe
parents:
28803
diff
changeset
|
1185 |
map SOME (frees_of prop); |
11519 | 1186 |
in |
15531 | 1187 |
proof_combt' (c (name, prop, NONE), args) |
11519 | 1188 |
end; |
1189 |
||
1190 |
val axm_proof = gen_axm_proof PAxm; |
|
17017 | 1191 |
|
52487
48bc24467008
backout dedd7952a62c: static "proofs" value within theory prevents later inferencing with different configuration;
wenzelm
parents:
52470
diff
changeset
|
1192 |
fun oracle_proof name prop = |
48bc24467008
backout dedd7952a62c: static "proofs" value within theory prevents later inferencing with different configuration;
wenzelm
parents:
52470
diff
changeset
|
1193 |
if ! proofs = 0 then ((name, Term.dummy), Oracle (name, Term.dummy, NONE)) |
30716
2ee706293eb5
removed misleading make_proof_body, make_oracles, make_thms, which essentially assume a *full* proof;
wenzelm
parents:
30712
diff
changeset
|
1194 |
else ((name, prop), gen_axm_proof Oracle name prop); |
11519 | 1195 |
|
63623 | 1196 |
val shrink_proof = |
17492 | 1197 |
let |
1198 |
fun shrink ls lev (prf as Abst (a, T, body)) = |
|
1199 |
let val (b, is, ch, body') = shrink ls (lev+1) body |
|
51100
18daa3380ff7
discontinued home-made sharing for proof terms -- leave memory management to the Poly/ML RTS;
wenzelm
parents:
51047
diff
changeset
|
1200 |
in (b, is, ch, if ch then Abst (a, T, body') else prf) end |
17492 | 1201 |
| shrink ls lev (prf as AbsP (a, t, body)) = |
1202 |
let val (b, is, ch, body') = shrink (lev::ls) lev body |
|
19482
9f11af8f7ef9
tuned basic list operators (flat, maps, map_filter);
wenzelm
parents:
19357
diff
changeset
|
1203 |
in (b orelse member (op =) is 0, map_filter (fn 0 => NONE | i => SOME (i-1)) is, |
51100
18daa3380ff7
discontinued home-made sharing for proof terms -- leave memory management to the Poly/ML RTS;
wenzelm
parents:
51047
diff
changeset
|
1204 |
ch, if ch then AbsP (a, t, body') else prf) |
17492 | 1205 |
end |
1206 |
| shrink ls lev prf = |
|
1207 |
let val (is, ch, _, prf') = shrink' ls lev [] [] prf |
|
1208 |
in (false, is, ch, prf') end |
|
1209 |
and shrink' ls lev ts prfs (prf as prf1 %% prf2) = |
|
1210 |
let |
|
1211 |
val p as (_, is', ch', prf') = shrink ls lev prf2; |
|
1212 |
val (is, ch, ts', prf'') = shrink' ls lev ts (p::prfs) prf1 |
|
33042 | 1213 |
in (union (op =) is is', ch orelse ch', ts', |
17492 | 1214 |
if ch orelse ch' then prf'' %% prf' else prf) |
1215 |
end |
|
1216 |
| shrink' ls lev ts prfs (prf as prf1 % t) = |
|
1217 |
let val (is, ch, (ch', t')::ts', prf') = shrink' ls lev (t::ts) prfs prf1 |
|
1218 |
in (is, ch orelse ch', ts', |
|
51100
18daa3380ff7
discontinued home-made sharing for proof terms -- leave memory management to the Poly/ML RTS;
wenzelm
parents:
51047
diff
changeset
|
1219 |
if ch orelse ch' then prf' % t' else prf) end |
17492 | 1220 |
| shrink' ls lev ts prfs (prf as PBound i) = |
30146 | 1221 |
(if exists (fn SOME (Bound j) => lev-j <= nth ls i | _ => true) ts |
18928
042608ffa2ec
subsituted gen_duplicates / has_duplicates for duplicates whenever appropriate
haftmann
parents:
18485
diff
changeset
|
1222 |
orelse has_duplicates (op =) |
042608ffa2ec
subsituted gen_duplicates / has_duplicates for duplicates whenever appropriate
haftmann
parents:
18485
diff
changeset
|
1223 |
(Library.foldl (fn (js, SOME (Bound j)) => j :: js | (js, _) => js) ([], ts)) |
17492 | 1224 |
orelse exists #1 prfs then [i] else [], false, map (pair false) ts, prf) |
63857 | 1225 |
| shrink' _ _ ts _ (Hyp t) = ([], false, map (pair false) ts, Hyp t) |
1226 |
| shrink' _ _ ts _ (prf as MinProof) = ([], false, map (pair false) ts, prf) |
|
1227 |
| shrink' _ _ ts _ (prf as OfClass _) = ([], false, map (pair false) ts, prf) |
|
1228 |
| shrink' _ _ ts prfs prf = |
|
17492 | 1229 |
let |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1230 |
val prop = |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1231 |
(case prf of |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1232 |
PAxm (_, prop, _) => prop |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1233 |
| Oracle (_, prop, _) => prop |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1234 |
| Promise (_, prop, _) => prop |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1235 |
| PThm (_, ((_, prop, _), _)) => prop |
36879
201a4afd8533
raise Fail uniformly for proofterm errors, which appear to be rather low-level;
wenzelm
parents:
36878
diff
changeset
|
1236 |
| _ => raise Fail "shrink: proof not in normal form"); |
17492 | 1237 |
val vs = vars_of prop; |
19012 | 1238 |
val (ts', ts'') = chop (length vs) ts; |
33957 | 1239 |
val insts = take (length ts') (map (fst o dest_Var) vs) ~~ ts'; |
17492 | 1240 |
val nvs = Library.foldl (fn (ixns', (ixn, ixns)) => |
64566 | 1241 |
insert (op =) ixn |
1242 |
(case AList.lookup (op =) insts ixn of |
|
33042 | 1243 |
SOME (SOME t) => if is_proj t then union (op =) ixns ixns' else ixns' |
1244 |
| _ => union (op =) ixns ixns')) |
|
17492 | 1245 |
(needed prop ts'' prfs, add_npvars false true [] ([], prop)); |
1246 |
val insts' = map |
|
1247 |
(fn (ixn, x as SOME _) => if member (op =) nvs ixn then (false, x) else (true, NONE) |
|
1248 |
| (_, x) => (false, x)) insts |
|
1249 |
in ([], false, insts' @ map (pair false) ts'', prf) end |
|
56245 | 1250 |
and needed (Const ("Pure.imp", _) $ t $ u) ts ((b, _, _, _)::prfs) = |
33042 | 1251 |
union (op =) (if b then map (fst o dest_Var) (vars_of t) else []) (needed u ts prfs) |
17492 | 1252 |
| needed (Var (ixn, _)) (_::_) _ = [ixn] |
1253 |
| needed _ _ _ = []; |
|
63623 | 1254 |
in fn prf => #4 (shrink [] 0 prf) end; |
11519 | 1255 |
|
1256 |
||
1257 |
(**** Simple first order matching functions for terms and proofs ****) |
|
1258 |
||
1259 |
exception PMatch; |
|
1260 |
||
1261 |
(** see pattern.ML **) |
|
1262 |
||
33317 | 1263 |
fun flt (i: int) = filter (fn n => n < i); |
12279 | 1264 |
|
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1265 |
fun fomatch Ts tymatch j instsp p = |
11519 | 1266 |
let |
1267 |
fun mtch (instsp as (tyinsts, insts)) = fn |
|
1268 |
(Var (ixn, T), t) => |
|
12279 | 1269 |
if j>0 andalso not (null (flt j (loose_bnos t))) |
1270 |
then raise PMatch |
|
1271 |
else (tymatch (tyinsts, fn () => (T, fastype_of1 (Ts, t))), |
|
1272 |
(ixn, t) :: insts) |
|
11519 | 1273 |
| (Free (a, T), Free (b, U)) => |
20147 | 1274 |
if a=b then (tymatch (tyinsts, K (T, U)), insts) else raise PMatch |
11519 | 1275 |
| (Const (a, T), Const (b, U)) => |
20147 | 1276 |
if a=b then (tymatch (tyinsts, K (T, U)), insts) else raise PMatch |
11519 | 1277 |
| (f $ t, g $ u) => mtch (mtch instsp (f, g)) (t, u) |
12279 | 1278 |
| (Bound i, Bound j) => if i=j then instsp else raise PMatch |
11519 | 1279 |
| _ => raise PMatch |
59058
a78612c67ec0
renamed "pairself" to "apply2", in accordance to @{apply 2};
wenzelm
parents:
56245
diff
changeset
|
1280 |
in mtch instsp (apply2 Envir.beta_eta_contract p) end; |
11519 | 1281 |
|
12279 | 1282 |
fun match_proof Ts tymatch = |
11519 | 1283 |
let |
15531 | 1284 |
fun optmatch _ inst (NONE, _) = inst |
1285 |
| optmatch _ _ (SOME _, NONE) = raise PMatch |
|
1286 |
| optmatch mtch inst (SOME x, SOME y) = mtch inst (x, y) |
|
12279 | 1287 |
|
1288 |
fun matcht Ts j (pinst, tinst) (t, u) = |
|
1289 |
(pinst, fomatch Ts tymatch j tinst (t, Envir.beta_norm u)); |
|
1290 |
fun matchT (pinst, (tyinsts, insts)) p = |
|
1291 |
(pinst, (tymatch (tyinsts, K p), insts)); |
|
15570 | 1292 |
fun matchTs inst (Ts, Us) = Library.foldl (uncurry matchT) (inst, Ts ~~ Us); |
12279 | 1293 |
|
1294 |
fun mtch Ts i j (pinst, tinst) (Hyp (Var (ixn, _)), prf) = |
|
1295 |
if i = 0 andalso j = 0 then ((ixn, prf) :: pinst, tinst) |
|
64566 | 1296 |
else |
1297 |
(case apfst (flt i) (apsnd (flt j) (prf_add_loose_bnos 0 0 prf ([], []))) of |
|
12279 | 1298 |
([], []) => ((ixn, incr_pboundvars (~i) (~j) prf) :: pinst, tinst) |
64566 | 1299 |
| ([], _) => |
1300 |
if j = 0 then ((ixn, incr_pboundvars (~i) (~j) prf) :: pinst, tinst) |
|
1301 |
else raise PMatch |
|
12279 | 1302 |
| _ => raise PMatch) |
1303 |
| mtch Ts i j inst (prf1 % opt1, prf2 % opt2) = |
|
1304 |
optmatch (matcht Ts j) (mtch Ts i j inst (prf1, prf2)) (opt1, opt2) |
|
1305 |
| mtch Ts i j inst (prf1 %% prf2, prf1' %% prf2') = |
|
1306 |
mtch Ts i j (mtch Ts i j inst (prf1, prf1')) (prf2, prf2') |
|
1307 |
| mtch Ts i j inst (Abst (_, opT, prf1), Abst (_, opU, prf2)) = |
|
18485 | 1308 |
mtch (the_default dummyT opU :: Ts) i (j+1) |
12279 | 1309 |
(optmatch matchT inst (opT, opU)) (prf1, prf2) |
1310 |
| mtch Ts i j inst (prf1, Abst (_, opU, prf2)) = |
|
18485 | 1311 |
mtch (the_default dummyT opU :: Ts) i (j+1) inst |
12279 | 1312 |
(incr_pboundvars 0 1 prf1 %> Bound 0, prf2) |
1313 |
| mtch Ts i j inst (AbsP (_, opt, prf1), AbsP (_, opu, prf2)) = |
|
1314 |
mtch Ts (i+1) j (optmatch (matcht Ts j) inst (opt, opu)) (prf1, prf2) |
|
1315 |
| mtch Ts i j inst (prf1, AbsP (_, _, prf2)) = |
|
1316 |
mtch Ts (i+1) j inst (incr_pboundvars 1 0 prf1 %% PBound 0, prf2) |
|
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1317 |
| mtch Ts i j inst (PAxm (s1, _, opTs), PAxm (s2, _, opUs)) = |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1318 |
if s1 = s2 then optmatch matchTs inst (opTs, opUs) |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1319 |
else raise PMatch |
31943
5e960a0780a2
renamed inclass/Inclass to of_class/OfClass, in accordance to of_sort;
wenzelm
parents:
31903
diff
changeset
|
1320 |
| mtch Ts i j inst (OfClass (T1, c1), OfClass (T2, c2)) = |
31903 | 1321 |
if c1 = c2 then matchT inst (T1, T2) |
1322 |
else raise PMatch |
|
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1323 |
| mtch Ts i j inst (PThm (_, ((name1, prop1, opTs), _)), PThm (_, ((name2, prop2, opUs), _))) = |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1324 |
if name1 = name2 andalso prop1 = prop2 then |
12279 | 1325 |
optmatch matchTs inst (opTs, opUs) |
11519 | 1326 |
else raise PMatch |
12279 | 1327 |
| mtch _ _ _ inst (PBound i, PBound j) = if i = j then inst else raise PMatch |
1328 |
| mtch _ _ _ _ _ = raise PMatch |
|
1329 |
in mtch Ts 0 0 end; |
|
11519 | 1330 |
|
1331 |
fun prf_subst (pinst, (tyinsts, insts)) = |
|
1332 |
let |
|
32049 | 1333 |
val substT = Envir.subst_type_same tyinsts; |
1334 |
val substTs = Same.map substT; |
|
11519 | 1335 |
|
32049 | 1336 |
fun subst' lev (Var (xi, _)) = |
1337 |
(case AList.lookup (op =) insts xi of |
|
1338 |
NONE => raise Same.SAME |
|
15531 | 1339 |
| SOME u => incr_boundvars lev u) |
32049 | 1340 |
| subst' _ (Const (s, T)) = Const (s, substT T) |
1341 |
| subst' _ (Free (s, T)) = Free (s, substT T) |
|
1342 |
| subst' lev (Abs (a, T, body)) = |
|
1343 |
(Abs (a, substT T, Same.commit (subst' (lev + 1)) body) |
|
1344 |
handle Same.SAME => Abs (a, T, subst' (lev + 1) body)) |
|
1345 |
| subst' lev (f $ t) = |
|
1346 |
(subst' lev f $ Same.commit (subst' lev) t |
|
1347 |
handle Same.SAME => f $ subst' lev t) |
|
1348 |
| subst' _ _ = raise Same.SAME; |
|
11519 | 1349 |
|
1350 |
fun subst plev tlev (AbsP (a, t, body)) = |
|
32049 | 1351 |
(AbsP (a, Same.map_option (subst' tlev) t, Same.commit (subst (plev + 1) tlev) body) |
1352 |
handle Same.SAME => AbsP (a, t, subst (plev + 1) tlev body)) |
|
11519 | 1353 |
| subst plev tlev (Abst (a, T, body)) = |
32049 | 1354 |
(Abst (a, Same.map_option substT T, Same.commit (subst plev (tlev + 1)) body) |
1355 |
handle Same.SAME => Abst (a, T, subst plev (tlev + 1) body)) |
|
1356 |
| subst plev tlev (prf %% prf') = |
|
1357 |
(subst plev tlev prf %% Same.commit (subst plev tlev) prf' |
|
1358 |
handle Same.SAME => prf %% subst plev tlev prf') |
|
1359 |
| subst plev tlev (prf % t) = |
|
1360 |
(subst plev tlev prf % Same.commit (Same.map_option (subst' tlev)) t |
|
1361 |
handle Same.SAME => prf % Same.map_option (subst' tlev) t) |
|
1362 |
| subst plev tlev (Hyp (Var (xi, _))) = |
|
1363 |
(case AList.lookup (op =) pinst xi of |
|
1364 |
NONE => raise Same.SAME |
|
1365 |
| SOME prf' => incr_pboundvars plev tlev prf') |
|
1366 |
| subst _ _ (PAxm (id, prop, Ts)) = PAxm (id, prop, Same.map_option substTs Ts) |
|
31943
5e960a0780a2
renamed inclass/Inclass to of_class/OfClass, in accordance to of_sort;
wenzelm
parents:
31903
diff
changeset
|
1367 |
| subst _ _ (OfClass (T, c)) = OfClass (substT T, c) |
32049 | 1368 |
| subst _ _ (Oracle (id, prop, Ts)) = Oracle (id, prop, Same.map_option substTs Ts) |
1369 |
| subst _ _ (Promise (i, prop, Ts)) = Promise (i, prop, substTs Ts) |
|
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1370 |
| subst _ _ (PThm (i, ((id, prop, Ts), body))) = |
32049 | 1371 |
PThm (i, ((id, prop, Same.map_option substTs Ts), body)) |
1372 |
| subst _ _ _ = raise Same.SAME; |
|
1373 |
in fn t => subst 0 0 t handle Same.SAME => t end; |
|
11519 | 1374 |
|
21646
c07b5b0e8492
thm/prf: separate official name vs. additional tags;
wenzelm
parents:
20853
diff
changeset
|
1375 |
(*A fast unification filter: true unless the two terms cannot be unified. |
12871
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1376 |
Terms must be NORMAL. Treats all Vars as distinct. *) |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1377 |
fun could_unify prf1 prf2 = |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1378 |
let |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1379 |
fun matchrands (prf1 %% prf2) (prf1' %% prf2') = |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1380 |
could_unify prf2 prf2' andalso matchrands prf1 prf1' |
15531 | 1381 |
| matchrands (prf % SOME t) (prf' % SOME t') = |
12871
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1382 |
Term.could_unify (t, t') andalso matchrands prf prf' |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1383 |
| matchrands (prf % _) (prf' % _) = matchrands prf prf' |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1384 |
| matchrands _ _ = true |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1385 |
|
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1386 |
fun head_of (prf %% _) = head_of prf |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1387 |
| head_of (prf % _) = head_of prf |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1388 |
| head_of prf = prf |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1389 |
|
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1390 |
in case (head_of prf1, head_of prf2) of |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1391 |
(_, Hyp (Var _)) => true |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1392 |
| (Hyp (Var _), _) => true |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1393 |
| (PAxm (a, _, _), PAxm (b, _, _)) => a = b andalso matchrands prf1 prf2 |
31943
5e960a0780a2
renamed inclass/Inclass to of_class/OfClass, in accordance to of_sort;
wenzelm
parents:
31903
diff
changeset
|
1394 |
| (OfClass (_, c), OfClass (_, d)) => c = d andalso matchrands prf1 prf2 |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1395 |
| (PThm (_, ((a, propa, _), _)), PThm (_, ((b, propb, _), _))) => |
12871
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1396 |
a = b andalso propa = propb andalso matchrands prf1 prf2 |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1397 |
| (PBound i, PBound j) => i = j andalso matchrands prf1 prf2 |
12871
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1398 |
| (AbsP _, _) => true (*because of possible eta equality*) |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1399 |
| (Abst _, _) => true |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1400 |
| (_, AbsP _) => true |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1401 |
| (_, Abst _) => true |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1402 |
| _ => false |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1403 |
end; |
21486a0557d1
Added function could_unify to speed up rewriting of proof terms.
berghofe
parents:
12868
diff
changeset
|
1404 |
|
28329
e6a5fa9f1e41
added conditional add_oracles, keep oracles_of_proof private;
wenzelm
parents:
28319
diff
changeset
|
1405 |
|
11519 | 1406 |
(**** rewriting on proof terms ****) |
1407 |
||
33722
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1408 |
val no_skel = PBound 0; |
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1409 |
val normal_skel = Hyp (Var ((Name.uu, 0), propT)); |
13102
b6f8aae5f152
Added skeletons to speed up rewriting on proof terms.
berghofe
parents:
12923
diff
changeset
|
1410 |
|
12279 | 1411 |
fun rewrite_prf tymatch (rules, procs) prf = |
11519 | 1412 |
let |
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1413 |
fun rew _ _ (Abst (_, _, body) % SOME t) = SOME (prf_subst_bounds [t] body, no_skel) |
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1414 |
| rew _ _ (AbsP (_, _, body) %% prf) = SOME (prf_subst_pbounds [prf] body, no_skel) |
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1415 |
| rew Ts hs prf = |
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1416 |
(case get_first (fn r => r Ts hs prf) procs of |
33722
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1417 |
NONE => get_first (fn (prf1, prf2) => SOME (prf_subst |
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1418 |
(match_proof Ts tymatch ([], (Vartab.empty, [])) (prf1, prf)) prf2, prf2) |
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1419 |
handle PMatch => NONE) (filter (could_unify prf o fst) rules) |
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1420 |
| some => some); |
11519 | 1421 |
|
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1422 |
fun rew0 Ts hs (prf as AbsP (_, _, prf' %% PBound 0)) = |
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1423 |
if prf_loose_Pbvar1 prf' 0 then rew Ts hs prf |
11519 | 1424 |
else |
1425 |
let val prf'' = incr_pboundvars (~1) 0 prf' |
|
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1426 |
in SOME (the_default (prf'', no_skel) (rew Ts hs prf'')) end |
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1427 |
| rew0 Ts hs (prf as Abst (_, _, prf' % SOME (Bound 0))) = |
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1428 |
if prf_loose_bvar1 prf' 0 then rew Ts hs prf |
11519 | 1429 |
else |
1430 |
let val prf'' = incr_pboundvars 0 (~1) prf' |
|
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1431 |
in SOME (the_default (prf'', no_skel) (rew Ts hs prf'')) end |
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1432 |
| rew0 Ts hs prf = rew Ts hs prf; |
11519 | 1433 |
|
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1434 |
fun rew1 _ _ (Hyp (Var _)) _ = NONE |
64566 | 1435 |
| rew1 Ts hs skel prf = |
1436 |
(case rew2 Ts hs skel prf of |
|
1437 |
SOME prf1 => |
|
1438 |
(case rew0 Ts hs prf1 of |
|
1439 |
SOME (prf2, skel') => SOME (the_default prf2 (rew1 Ts hs skel' prf2)) |
|
1440 |
| NONE => SOME prf1) |
|
1441 |
| NONE => |
|
1442 |
(case rew0 Ts hs prf of |
|
1443 |
SOME (prf1, skel') => SOME (the_default prf1 (rew1 Ts hs skel' prf1)) |
|
1444 |
| NONE => NONE)) |
|
11519 | 1445 |
|
64566 | 1446 |
and rew2 Ts hs skel (prf % SOME t) = |
1447 |
(case prf of |
|
11519 | 1448 |
Abst (_, _, body) => |
1449 |
let val prf' = prf_subst_bounds [t] body |
|
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1450 |
in SOME (the_default prf' (rew2 Ts hs no_skel prf')) end |
64566 | 1451 |
| _ => |
1452 |
(case rew1 Ts hs (case skel of skel' % _ => skel' | _ => no_skel) prf of |
|
1453 |
SOME prf' => SOME (prf' % SOME t) |
|
1454 |
| NONE => NONE)) |
|
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1455 |
| rew2 Ts hs skel (prf % NONE) = Option.map (fn prf' => prf' % NONE) |
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1456 |
(rew1 Ts hs (case skel of skel' % _ => skel' | _ => no_skel) prf) |
64566 | 1457 |
| rew2 Ts hs skel (prf1 %% prf2) = |
1458 |
(case prf1 of |
|
11519 | 1459 |
AbsP (_, _, body) => |
1460 |
let val prf' = prf_subst_pbounds [prf2] body |
|
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1461 |
in SOME (the_default prf' (rew2 Ts hs no_skel prf')) end |
13102
b6f8aae5f152
Added skeletons to speed up rewriting on proof terms.
berghofe
parents:
12923
diff
changeset
|
1462 |
| _ => |
64566 | 1463 |
let |
1464 |
val (skel1, skel2) = |
|
1465 |
(case skel of |
|
1466 |
skel1 %% skel2 => (skel1, skel2) |
|
1467 |
| _ => (no_skel, no_skel)) |
|
1468 |
in |
|
1469 |
(case rew1 Ts hs skel1 prf1 of |
|
1470 |
SOME prf1' => |
|
1471 |
(case rew1 Ts hs skel2 prf2 of |
|
15531 | 1472 |
SOME prf2' => SOME (prf1' %% prf2') |
1473 |
| NONE => SOME (prf1' %% prf2)) |
|
64566 | 1474 |
| NONE => |
1475 |
(case rew1 Ts hs skel2 prf2 of |
|
15531 | 1476 |
SOME prf2' => SOME (prf1 %% prf2') |
64566 | 1477 |
| NONE => NONE)) |
13102
b6f8aae5f152
Added skeletons to speed up rewriting on proof terms.
berghofe
parents:
12923
diff
changeset
|
1478 |
end) |
64566 | 1479 |
| rew2 Ts hs skel (Abst (s, T, prf)) = |
1480 |
(case rew1 (the_default dummyT T :: Ts) hs |
|
33722
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1481 |
(case skel of Abst (_, _, skel') => skel' | _ => no_skel) prf of |
15531 | 1482 |
SOME prf' => SOME (Abst (s, T, prf')) |
1483 |
| NONE => NONE) |
|
64566 | 1484 |
| rew2 Ts hs skel (AbsP (s, t, prf)) = |
1485 |
(case rew1 Ts (t :: hs) (case skel of AbsP (_, _, skel') => skel' | _ => no_skel) prf of |
|
15531 | 1486 |
SOME prf' => SOME (AbsP (s, t, prf')) |
1487 |
| NONE => NONE) |
|
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1488 |
| rew2 _ _ _ _ = NONE; |
11519 | 1489 |
|
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1490 |
in the_default prf (rew1 [] [] no_skel prf) end; |
11519 | 1491 |
|
17203 | 1492 |
fun rewrite_proof thy = rewrite_prf (fn (tyenv, f) => |
1493 |
Sign.typ_match thy (f ()) tyenv handle Type.TYPE_MATCH => raise PMatch); |
|
11519 | 1494 |
|
11715
592923615f77
Tuned several functions to improve sharing of unchanged subproofs.
berghofe
parents:
11652
diff
changeset
|
1495 |
fun rewrite_proof_notypes rews = rewrite_prf fst rews; |
11615 | 1496 |
|
16940 | 1497 |
|
11519 | 1498 |
(**** theory data ****) |
1499 |
||
37216
3165bc303f66
modernized some structure names, keeping a few legacy aliases;
wenzelm
parents:
36883
diff
changeset
|
1500 |
structure Data = Theory_Data |
22846 | 1501 |
( |
33722
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1502 |
type T = |
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1503 |
(stamp * (proof * proof)) list * |
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1504 |
(stamp * (typ list -> term option list -> proof -> (proof * proof) option)) list; |
11519 | 1505 |
|
12233 | 1506 |
val empty = ([], []); |
16458 | 1507 |
val extend = I; |
33522 | 1508 |
fun merge ((rules1, procs1), (rules2, procs2)) : T = |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1509 |
(AList.merge (op =) (K true) (rules1, rules2), |
22662 | 1510 |
AList.merge (op =) (K true) (procs1, procs2)); |
22846 | 1511 |
); |
11519 | 1512 |
|
37216
3165bc303f66
modernized some structure names, keeping a few legacy aliases;
wenzelm
parents:
36883
diff
changeset
|
1513 |
fun get_data thy = let val (rules, procs) = Data.get thy in (map #2 rules, map #2 procs) end; |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1514 |
fun rew_proof thy = rewrite_prf fst (get_data thy); |
23780
a0e7305dd0cb
Added function rew_proof (for pre-normalizing proofs).
berghofe
parents:
23296
diff
changeset
|
1515 |
|
37216
3165bc303f66
modernized some structure names, keeping a few legacy aliases;
wenzelm
parents:
36883
diff
changeset
|
1516 |
fun add_prf_rrule r = (Data.map o apfst) (cons (stamp (), r)); |
3165bc303f66
modernized some structure names, keeping a few legacy aliases;
wenzelm
parents:
36883
diff
changeset
|
1517 |
fun add_prf_rproc p = (Data.map o apsnd) (cons (stamp (), p)); |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1518 |
|
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1519 |
|
28828
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
1520 |
(***** promises *****) |
11519 | 1521 |
|
28828
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
1522 |
fun promise_proof thy i prop = |
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
1523 |
let |
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
1524 |
val _ = prop |> Term.exists_subterm (fn t => |
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
1525 |
(Term.is_Free t orelse Term.is_Var t) andalso |
36879
201a4afd8533
raise Fail uniformly for proofterm errors, which appear to be rather low-level;
wenzelm
parents:
36878
diff
changeset
|
1526 |
raise Fail ("promise_proof: illegal variable " ^ Syntax.string_of_term_global thy t)); |
28828
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
1527 |
val _ = prop |> Term.exists_type (Term.exists_subtype |
36879
201a4afd8533
raise Fail uniformly for proofterm errors, which appear to be rather low-level;
wenzelm
parents:
36878
diff
changeset
|
1528 |
(fn TFree (a, _) => raise Fail ("promise_proof: illegal type variable " ^ quote a) |
28828
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
1529 |
| _ => false)); |
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
1530 |
in Promise (i, prop, map TVar (Term.add_tvars prop [])) end; |
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
1531 |
|
33722
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1532 |
fun fulfill_norm_proof thy ps body0 = |
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1533 |
let |
66168 | 1534 |
val _ = consolidate (map #2 ps @ [body0]); |
33722
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1535 |
val PBody {oracles = oracles0, thms = thms0, proof = proof0} = body0; |
44334 | 1536 |
val oracles = |
1537 |
unions_oracles |
|
1538 |
(fold (fn (_, PBody {oracles, ...}) => not (null oracles) ? cons oracles) ps [oracles0]); |
|
1539 |
val thms = |
|
1540 |
unions_thms (fold (fn (_, PBody {thms, ...}) => not (null thms) ? cons thms) ps [thms0]); |
|
33722
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1541 |
val proofs = fold (fn (i, PBody {proof, ...}) => Inttab.update (i, proof)) ps Inttab.empty; |
28875
c1c0e23ed063
eliminated finish_proof, keep pre/post normalization of results separate;
wenzelm
parents:
28846
diff
changeset
|
1542 |
|
33722
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1543 |
fun fill (Promise (i, prop, Ts)) = |
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1544 |
(case Inttab.lookup proofs i of |
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1545 |
NONE => NONE |
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1546 |
| SOME prf => SOME (instantiate (Term.add_tvars prop [] ~~ Ts, []) prf, normal_skel)) |
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1547 |
| fill _ = NONE; |
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1548 |
val (rules, procs) = get_data thy; |
37231
e5419ecf92b7
- outer_constraints with original variable names, to ensure that argsP is consistent with args
berghofe
parents:
36883
diff
changeset
|
1549 |
val proof = rewrite_prf fst (rules, K (K fill) :: procs) proof0; |
33722
e588744f14da
generalized procs for rewrite_proof: allow skeleton;
wenzelm
parents:
33522
diff
changeset
|
1550 |
in PBody {oracles = oracles, thms = thms, proof = proof} end; |
28828
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
1551 |
|
51047
2ad5c46bcd04
avoid extra fork for fulfill_proof_future whenever possible -- without proof terms it merely doubles the number of proof tasks redundantly, by piggy-backing another 10 microseconds task;
wenzelm
parents:
50763
diff
changeset
|
1552 |
fun fulfill_proof_future thy promises postproc body = |
2ad5c46bcd04
avoid extra fork for fulfill_proof_future whenever possible -- without proof terms it merely doubles the number of proof tasks redundantly, by piggy-backing another 10 microseconds task;
wenzelm
parents:
50763
diff
changeset
|
1553 |
let |
2ad5c46bcd04
avoid extra fork for fulfill_proof_future whenever possible -- without proof terms it merely doubles the number of proof tasks redundantly, by piggy-backing another 10 microseconds task;
wenzelm
parents:
50763
diff
changeset
|
1554 |
fun fulfill () = |
2ad5c46bcd04
avoid extra fork for fulfill_proof_future whenever possible -- without proof terms it merely doubles the number of proof tasks redundantly, by piggy-backing another 10 microseconds task;
wenzelm
parents:
50763
diff
changeset
|
1555 |
postproc (fulfill_norm_proof thy (map (apsnd Future.join) promises) (Future.join body)); |
2ad5c46bcd04
avoid extra fork for fulfill_proof_future whenever possible -- without proof terms it merely doubles the number of proof tasks redundantly, by piggy-backing another 10 microseconds task;
wenzelm
parents:
50763
diff
changeset
|
1556 |
in |
2ad5c46bcd04
avoid extra fork for fulfill_proof_future whenever possible -- without proof terms it merely doubles the number of proof tasks redundantly, by piggy-backing another 10 microseconds task;
wenzelm
parents:
50763
diff
changeset
|
1557 |
if null promises then Future.map postproc body |
2ad5c46bcd04
avoid extra fork for fulfill_proof_future whenever possible -- without proof terms it merely doubles the number of proof tasks redundantly, by piggy-backing another 10 microseconds task;
wenzelm
parents:
50763
diff
changeset
|
1558 |
else if Future.is_finished body andalso length promises = 1 then |
2ad5c46bcd04
avoid extra fork for fulfill_proof_future whenever possible -- without proof terms it merely doubles the number of proof tasks redundantly, by piggy-backing another 10 microseconds task;
wenzelm
parents:
50763
diff
changeset
|
1559 |
Future.map (fn _ => fulfill ()) (snd (hd promises)) |
2ad5c46bcd04
avoid extra fork for fulfill_proof_future whenever possible -- without proof terms it merely doubles the number of proof tasks redundantly, by piggy-backing another 10 microseconds task;
wenzelm
parents:
50763
diff
changeset
|
1560 |
else |
2ad5c46bcd04
avoid extra fork for fulfill_proof_future whenever possible -- without proof terms it merely doubles the number of proof tasks redundantly, by piggy-backing another 10 microseconds task;
wenzelm
parents:
50763
diff
changeset
|
1561 |
(singleton o Future.forks) |
2ad5c46bcd04
avoid extra fork for fulfill_proof_future whenever possible -- without proof terms it merely doubles the number of proof tasks redundantly, by piggy-backing another 10 microseconds task;
wenzelm
parents:
50763
diff
changeset
|
1562 |
{name = "Proofterm.fulfill_proof_future", group = NONE, |
2ad5c46bcd04
avoid extra fork for fulfill_proof_future whenever possible -- without proof terms it merely doubles the number of proof tasks redundantly, by piggy-backing another 10 microseconds task;
wenzelm
parents:
50763
diff
changeset
|
1563 |
deps = Future.task_of body :: map (Future.task_of o snd) promises, pri = 0, |
2ad5c46bcd04
avoid extra fork for fulfill_proof_future whenever possible -- without proof terms it merely doubles the number of proof tasks redundantly, by piggy-backing another 10 microseconds task;
wenzelm
parents:
50763
diff
changeset
|
1564 |
interrupts = true} |
2ad5c46bcd04
avoid extra fork for fulfill_proof_future whenever possible -- without proof terms it merely doubles the number of proof tasks redundantly, by piggy-backing another 10 microseconds task;
wenzelm
parents:
50763
diff
changeset
|
1565 |
fulfill |
2ad5c46bcd04
avoid extra fork for fulfill_proof_future whenever possible -- without proof terms it merely doubles the number of proof tasks redundantly, by piggy-backing another 10 microseconds task;
wenzelm
parents:
50763
diff
changeset
|
1566 |
end; |
29642 | 1567 |
|
28828
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
1568 |
|
36878
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1569 |
(***** abstraction over sort constraints *****) |
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1570 |
|
36882
f33760bb8ca0
conditionally unconstrain thm proofs -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36880
diff
changeset
|
1571 |
fun unconstrainT_prf thy (atyp_map, constraints) = |
36878
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1572 |
let |
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1573 |
fun hyp_map hyp = |
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1574 |
(case AList.lookup (op =) constraints hyp of |
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1575 |
SOME t => Hyp t |
36882
f33760bb8ca0
conditionally unconstrain thm proofs -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36880
diff
changeset
|
1576 |
| NONE => raise Fail "unconstrainT_prf: missing constraint"); |
36878
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1577 |
|
36882
f33760bb8ca0
conditionally unconstrain thm proofs -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36880
diff
changeset
|
1578 |
val typ = Term_Subst.map_atypsT_same (Type.strip_sorts o atyp_map); |
36878
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1579 |
fun ofclass (ty, c) = |
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1580 |
let val ty' = Term.map_atyps atyp_map ty; |
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1581 |
in the_single (of_sort_proof thy hyp_map (ty', [c])) end; |
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1582 |
in |
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1583 |
Same.commit (map_proof_same (Term_Subst.map_types_same typ) typ ofclass) |
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1584 |
#> fold_rev (implies_intr_proof o snd) constraints |
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1585 |
end; |
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1586 |
|
36882
f33760bb8ca0
conditionally unconstrain thm proofs -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36880
diff
changeset
|
1587 |
fun unconstrainT_body thy constrs (PBody {oracles, thms, proof}) = |
36878
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1588 |
PBody |
36883
4ed0d72def50
added Proofterm.unconstrain_thm_proof for Thm.unconstrainT -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36882
diff
changeset
|
1589 |
{oracles = oracles, (* FIXME merge (!), unconstrain (!?!) *) |
4ed0d72def50
added Proofterm.unconstrain_thm_proof for Thm.unconstrainT -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36882
diff
changeset
|
1590 |
thms = thms, (* FIXME merge (!) *) |
36882
f33760bb8ca0
conditionally unconstrain thm proofs -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36880
diff
changeset
|
1591 |
proof = unconstrainT_prf thy constrs proof}; |
36878
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1592 |
|
5caff17a28cd
unconstrainT operations on proofs, according to krauss/schropp;
wenzelm
parents:
36877
diff
changeset
|
1593 |
|
28828
c25dd83a6f9f
unified treatment of PAxm/Oracle/Promise in basic proof term operations;
wenzelm
parents:
28815
diff
changeset
|
1594 |
(***** theorems *****) |
11519 | 1595 |
|
37297 | 1596 |
fun prepare_thm_proof thy name shyps hyps concl promises body = |
11519 | 1597 |
let |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1598 |
val PBody {oracles = oracles0, thms = thms0, proof = prf} = body; |
32810
f3466a5645fa
back to simple fold_body_thms and fulfill_proof/thm_proof (reverting a900d3cd47cc) -- the cycle check is implicit in the future computation of join_proofs;
wenzelm
parents:
32785
diff
changeset
|
1599 |
val prop = Logic.list_implies (hyps, concl); |
11519 | 1600 |
val nvs = needed_vars prop; |
1601 |
val args = map (fn (v as Var (ixn, _)) => |
|
17492 | 1602 |
if member (op =) nvs ixn then SOME v else NONE) (vars_of prop) @ |
28812
413695e07bd4
Frees in PThms are now quantified in the order of their appearance in the
berghofe
parents:
28803
diff
changeset
|
1603 |
map SOME (frees_of prop); |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1604 |
|
37297 | 1605 |
val ((atyp_map, constraints, outer_constraints), prop1) = Logic.unconstrainT shyps prop; |
1606 |
val postproc = unconstrainT_body thy (atyp_map, constraints); |
|
1607 |
val args1 = |
|
1608 |
(map o Option.map o Term.map_types o Term.map_atyps) |
|
1609 |
(Type.strip_sorts o atyp_map) args; |
|
1610 |
val argsP = map OfClass outer_constraints @ map Hyp hyps; |
|
36882
f33760bb8ca0
conditionally unconstrain thm proofs -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36880
diff
changeset
|
1611 |
|
37251
72c7e636067b
normalize and postprocess proof body in a separate future, taking care of platforms without multithreading (greately improves parallelization in general without the overhead of promised proofs, cf. usedir -q 0);
wenzelm
parents:
37236
diff
changeset
|
1612 |
fun make_body0 proof0 = PBody {oracles = oracles0, thms = thms0, proof = proof0}; |
72c7e636067b
normalize and postprocess proof body in a separate future, taking care of platforms without multithreading (greately improves parallelization in general without the overhead of promised proofs, cf. usedir -q 0);
wenzelm
parents:
37236
diff
changeset
|
1613 |
val body0 = |
52487
48bc24467008
backout dedd7952a62c: static "proofs" value within theory prevents later inferencing with different configuration;
wenzelm
parents:
52470
diff
changeset
|
1614 |
if not (proofs_enabled ()) then Future.value (make_body0 MinProof) |
41673 | 1615 |
else |
68068 | 1616 |
let |
1617 |
val rew = rew_proof thy; |
|
1618 |
val prf' = fold_rev implies_intr_proof hyps prf; |
|
1619 |
in |
|
1620 |
(singleton o Future.cond_forks) |
|
1621 |
{name = "Proofterm.prepare_thm_proof", group = NONE, |
|
1622 |
deps = [], pri = 1, interrupts = true} |
|
1623 |
(fn () => make_body0 (shrink_proof (rew prf'))) |
|
1624 |
end; |
|
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1625 |
|
44333
cc53ce50f738
reverted to join_bodies/join_proofs based on fold_body_thms to regain performance (escpecially of HOL-Proofs) -- see also aa9c1e9ef2ce and 4e2abb045eac;
wenzelm
parents:
44332
diff
changeset
|
1626 |
fun new_prf () = (serial (), fulfill_proof_future thy promises postproc body0); |
36880
49d3cc859a12
avoid redundant rebinding of name/prop -- probably introduced accidentally in 80bb72a0f577;
wenzelm
parents:
36879
diff
changeset
|
1627 |
val (i, body') = |
41699 | 1628 |
(*non-deterministic, depends on unknown promises*) |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1629 |
(case strip_combt (fst (strip_combP prf)) of |
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1630 |
(PThm (i, ((old_name, prop', NONE), body')), args') => |
36882
f33760bb8ca0
conditionally unconstrain thm proofs -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36880
diff
changeset
|
1631 |
if (old_name = "" orelse old_name = name) andalso prop1 = prop' andalso args = args' |
36880
49d3cc859a12
avoid redundant rebinding of name/prop -- probably introduced accidentally in 80bb72a0f577;
wenzelm
parents:
36879
diff
changeset
|
1632 |
then (i, body') |
28803
d90258bbb18f
reworked type proof: MinProof is vacous, added Promise, refined PThm (with serial);
wenzelm
parents:
28329
diff
changeset
|
1633 |
else new_prf () |
28815 | 1634 |
| _ => new_prf ()); |
36882
f33760bb8ca0
conditionally unconstrain thm proofs -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36880
diff
changeset
|
1635 |
val head = PThm (i, ((name, prop1, NONE), body')); |
64574
1134e4d5e5b7
consolidate nested thms with persistent result, for improved performance;
wenzelm
parents:
64573
diff
changeset
|
1636 |
in ((i, make_thm_node name prop1 body'), head, args, argsP, args1) end; |
36883
4ed0d72def50
added Proofterm.unconstrain_thm_proof for Thm.unconstrainT -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36882
diff
changeset
|
1637 |
|
4ed0d72def50
added Proofterm.unconstrain_thm_proof for Thm.unconstrainT -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36882
diff
changeset
|
1638 |
fun thm_proof thy name shyps hyps concl promises body = |
37297 | 1639 |
let val (pthm, head, args, argsP, _) = prepare_thm_proof thy name shyps hyps concl promises body |
36883
4ed0d72def50
added Proofterm.unconstrain_thm_proof for Thm.unconstrainT -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36882
diff
changeset
|
1640 |
in (pthm, proof_combP (proof_combt' (head, args), argsP)) end; |
4ed0d72def50
added Proofterm.unconstrain_thm_proof for Thm.unconstrainT -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36882
diff
changeset
|
1641 |
|
4ed0d72def50
added Proofterm.unconstrain_thm_proof for Thm.unconstrainT -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36882
diff
changeset
|
1642 |
fun unconstrain_thm_proof thy shyps concl promises body = |
64566 | 1643 |
let val (pthm, head, _, _, args) = prepare_thm_proof thy "" shyps [] concl promises body |
36883
4ed0d72def50
added Proofterm.unconstrain_thm_proof for Thm.unconstrainT -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36882
diff
changeset
|
1644 |
in (pthm, proof_combt' (head, args)) end; |
4ed0d72def50
added Proofterm.unconstrain_thm_proof for Thm.unconstrainT -- loosely based on the version by krauss/schropp;
wenzelm
parents:
36882
diff
changeset
|
1645 |
|
11519 | 1646 |
|
37297 | 1647 |
fun get_name shyps hyps prop prf = |
36877
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
1648 |
let val (_, prop) = Logic.unconstrainT shyps (Logic.list_implies (hyps, prop)) in |
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
1649 |
(case strip_combt (fst (strip_combP prf)) of |
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
1650 |
(PThm (_, ((name, prop', _), _)), _) => if prop = prop' then name else "" |
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
1651 |
| _ => "") |
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
1652 |
end; |
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
1653 |
|
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
1654 |
fun guess_name (PThm (_, ((name, _, _), _))) = name |
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
1655 |
| guess_name (prf %% Hyp _) = guess_name prf |
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
1656 |
| guess_name (prf %% OfClass _) = guess_name prf |
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
1657 |
| guess_name (prf % NONE) = guess_name prf |
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
1658 |
| guess_name (prf % SOME (Var _)) = guess_name prf |
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
1659 |
| guess_name _ = ""; |
7699f7fafde7
added Proofterm.get_name variants according to krauss/schropp;
wenzelm
parents:
36742
diff
changeset
|
1660 |
|
11519 | 1661 |
end; |
1662 |
||
32094
89b9210c7506
prefer simultaneous join -- for improved scheduling;
wenzelm
parents:
32057
diff
changeset
|
1663 |
structure Basic_Proofterm : BASIC_PROOFTERM = Proofterm; |
89b9210c7506
prefer simultaneous join -- for improved scheduling;
wenzelm
parents:
32057
diff
changeset
|
1664 |
open Basic_Proofterm; |