author | wenzelm |
Thu, 20 Aug 2015 19:15:17 +0200 | |
changeset 60988 | 1d7a7e33fd67 |
parent 60948 | b710a5087116 |
child 61044 | b7af255dd200 |
permissions | -rw-r--r-- |
6185 | 1 |
(* Title: Pure/context.ML |
2 |
Author: Markus Wenzel, TU Muenchen |
|
3 |
||
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
4 |
Generic theory contexts with unique identity, arbitrarily typed data, |
24141
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
wenzelm
parents:
23944
diff
changeset
|
5 |
monotonic development graph and history support. Generic proof |
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
wenzelm
parents:
23944
diff
changeset
|
6 |
contexts with arbitrarily typed data. |
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
7 |
|
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
8 |
Firm naming conventions: |
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
9 |
thy, thy', thy1, thy2: theory |
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
10 |
ctxt, ctxt', ctxt1, ctxt2: Proof.context |
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
11 |
context: Context.generic |
6185 | 12 |
*) |
13 |
||
14 |
signature BASIC_CONTEXT = |
|
15 |
sig |
|
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
16 |
type theory |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
17 |
exception THEORY of string * theory list |
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
18 |
structure Proof: sig type context end |
42360 | 19 |
structure Proof_Context: |
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
20 |
sig |
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
21 |
val theory_of: Proof.context -> theory |
36610
bafd82950e24
renamed ProofContext.init to ProofContext.init_global to emphasize that this is not the real thing;
wenzelm
parents:
34259
diff
changeset
|
22 |
val init_global: theory -> Proof.context |
51686 | 23 |
val get_global: theory -> string -> Proof.context |
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
24 |
end |
6185 | 25 |
end; |
26 |
||
27 |
signature CONTEXT = |
|
28 |
sig |
|
29 |
include BASIC_CONTEXT |
|
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
30 |
(*theory context*) |
60947 | 31 |
type theory_id |
32 |
val theory_id: theory -> theory_id |
|
42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
33 |
val timing: bool Unsynchronized.ref |
42383
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset
|
34 |
type pretty |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
35 |
val parents_of: theory -> theory list |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
36 |
val ancestors_of: theory -> theory list |
60948 | 37 |
val theory_id_name: theory_id -> string |
29069
c7ba485581ae
unified ids for ancestors and checkpoints, removed obsolete history of checkpoints;
wenzelm
parents:
29001
diff
changeset
|
38 |
val theory_name: theory -> string |
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
39 |
val PureN: string |
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
40 |
val display_names: theory -> string list |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
41 |
val pretty_thy: theory -> Pretty.T |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
42 |
val string_of_thy: theory -> string |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
43 |
val pretty_abbrev_thy: theory -> Pretty.T |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
44 |
val str_of_thy: theory -> string |
37867
b9783e9e96e1
added Context.get_theory -- avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset
|
45 |
val get_theory: theory -> string -> theory |
37871
c7ce7685e087
replaced Thy_Info.the_theory by Context.this_theory -- avoid referring to accidental theory loader state;
wenzelm
parents:
37867
diff
changeset
|
46 |
val this_theory: theory -> string -> theory |
60947 | 47 |
val eq_thy_id: theory_id * theory_id -> bool |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
48 |
val eq_thy: theory * theory -> bool |
60947 | 49 |
val proper_subthy_id: theory_id * theory_id -> bool |
50 |
val proper_subthy: theory * theory -> bool |
|
51 |
val subthy_id: theory_id * theory_id -> bool |
|
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
52 |
val subthy: theory * theory -> bool |
23355
d2c033fd4514
merge/merge_refs: plain error instead of exception TERM;
wenzelm
parents:
22847
diff
changeset
|
53 |
val merge: theory * theory -> theory |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
54 |
val finish_thy: theory -> theory |
42383
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset
|
55 |
val begin_thy: (theory -> pretty) -> string -> theory list -> theory |
16533 | 56 |
(*proof context*) |
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
57 |
val raw_transfer: theory -> Proof.context -> Proof.context |
16533 | 58 |
(*generic context*) |
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
59 |
datatype generic = Theory of theory | Proof of Proof.context |
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
60 |
val cases: (theory -> 'a) -> (Proof.context -> 'a) -> generic -> 'a |
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
61 |
val mapping: (theory -> theory) -> (Proof.context -> Proof.context) -> generic -> generic |
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
62 |
val mapping_result: (theory -> 'a * theory) -> (Proof.context -> 'a * Proof.context) -> |
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
63 |
generic -> 'a * generic |
18632 | 64 |
val the_theory: generic -> theory |
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
65 |
val the_proof: generic -> Proof.context |
18731 | 66 |
val map_theory: (theory -> theory) -> generic -> generic |
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
67 |
val map_proof: (Proof.context -> Proof.context) -> generic -> generic |
26486 | 68 |
val map_theory_result: (theory -> 'a * theory) -> generic -> 'a * generic |
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
69 |
val map_proof_result: (Proof.context -> 'a * Proof.context) -> generic -> 'a * generic |
18731 | 70 |
val theory_map: (generic -> generic) -> theory -> theory |
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
71 |
val proof_map: (generic -> generic) -> Proof.context -> Proof.context |
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
72 |
val theory_of: generic -> theory (*total*) |
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
73 |
val proof_of: generic -> Proof.context (*total*) |
42383
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset
|
74 |
(*pretty printing context*) |
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset
|
75 |
val pretty: Proof.context -> pretty |
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset
|
76 |
val pretty_global: theory -> pretty |
47005
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
wenzelm
parents:
43684
diff
changeset
|
77 |
val pretty_generic: generic -> pretty |
42383
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset
|
78 |
val pretty_context: (theory -> Proof.context) -> pretty -> Proof.context |
26413
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
79 |
(*thread data*) |
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
80 |
val thread_data: unit -> generic option |
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
81 |
val the_thread_data: unit -> generic |
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
82 |
val set_thread_data: generic option -> unit |
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
83 |
val setmp_thread_data: generic option -> ('a -> 'b) -> 'a -> 'b |
26463 | 84 |
val >> : (generic -> generic) -> unit |
85 |
val >>> : (generic -> 'a * generic) -> 'a |
|
6185 | 86 |
end; |
87 |
||
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
88 |
signature PRIVATE_CONTEXT = |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
89 |
sig |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
90 |
include CONTEXT |
33033 | 91 |
structure Theory_Data: |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
92 |
sig |
51368
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset
|
93 |
val declare: Position.T -> Any.T -> (Any.T -> Any.T) -> |
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset
|
94 |
(pretty -> Any.T * Any.T -> Any.T) -> serial |
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset
|
95 |
val get: serial -> (Any.T -> 'a) -> theory -> 'a |
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset
|
96 |
val put: serial -> ('a -> Any.T) -> 'a -> theory -> theory |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
97 |
end |
33033 | 98 |
structure Proof_Data: |
16533 | 99 |
sig |
51368
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset
|
100 |
val declare: (theory -> Any.T) -> serial |
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset
|
101 |
val get: serial -> (Any.T -> 'a) -> Proof.context -> 'a |
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset
|
102 |
val put: serial -> ('a -> Any.T) -> 'a -> Proof.context -> Proof.context |
16533 | 103 |
end |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
104 |
end; |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
105 |
|
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
106 |
structure Context: PRIVATE_CONTEXT = |
6185 | 107 |
struct |
108 |
||
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
109 |
(*** theory context ***) |
6185 | 110 |
|
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
111 |
(** theory data **) |
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
112 |
|
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
113 |
(* data kinds and access methods *) |
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
114 |
|
42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
115 |
val timing = Unsynchronized.ref false; |
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
116 |
|
19028
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
wenzelm
parents:
18931
diff
changeset
|
117 |
(*private copy avoids potential conflict of table exceptions*) |
31971
8c1b845ed105
renamed functor TableFun to Table, and GraphFun to Graph;
wenzelm
parents:
30628
diff
changeset
|
118 |
structure Datatab = Table(type key = int val ord = int_ord); |
19028
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
wenzelm
parents:
18931
diff
changeset
|
119 |
|
51368
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset
|
120 |
datatype pretty = Pretty of Any.T; |
42383
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset
|
121 |
|
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
122 |
local |
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
123 |
|
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
124 |
type kind = |
42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
125 |
{pos: Position.T, |
51368
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset
|
126 |
empty: Any.T, |
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset
|
127 |
extend: Any.T -> Any.T, |
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset
|
128 |
merge: pretty -> Any.T * Any.T -> Any.T}; |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
129 |
|
43684 | 130 |
val kinds = Synchronized.var "Theory_Data" (Datatab.empty: kind Datatab.table); |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
131 |
|
42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
132 |
fun invoke name f k x = |
43684 | 133 |
(case Datatab.lookup (Synchronized.value kinds) k of |
42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
134 |
SOME kind => |
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
135 |
if ! timing andalso name <> "" then |
48992 | 136 |
Timing.cond_timeit true ("Theory_Data." ^ name ^ Position.here (#pos kind)) |
42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
137 |
(fn () => f kind x) |
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
138 |
else f kind x |
37852
a902f158b4fc
eliminated old-style sys_error/SYS_ERROR in favour of exception Fail -- after careful checking that there is no overlap with existing handling of that;
wenzelm
parents:
37216
diff
changeset
|
139 |
| NONE => raise Fail "Invalid theory data identifier"); |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
140 |
|
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
141 |
in |
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
142 |
|
42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
143 |
fun invoke_empty k = invoke "" (K o #empty) k (); |
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
144 |
val invoke_extend = invoke "extend" #extend; |
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
145 |
fun invoke_merge pp = invoke "merge" (fn kind => #merge kind pp); |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
146 |
|
42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
147 |
fun declare_theory_data pos empty extend merge = |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
148 |
let |
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
149 |
val k = serial (); |
42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
150 |
val kind = {pos = pos, empty = empty, extend = extend, merge = merge}; |
43684 | 151 |
val _ = Synchronized.change kinds (Datatab.update (k, kind)); |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
152 |
in k end; |
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
153 |
|
39020 | 154 |
val extend_data = Datatab.map invoke_extend; |
59058
a78612c67ec0
renamed "pairself" to "apply2", in accordance to @{apply 2};
wenzelm
parents:
55547
diff
changeset
|
155 |
fun merge_data pp = Datatab.join (invoke_merge pp) o apply2 extend_data; |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
156 |
|
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
157 |
end; |
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
158 |
|
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
159 |
|
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
160 |
|
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
161 |
(** datatype theory **) |
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
162 |
|
60947 | 163 |
datatype theory_id = |
164 |
Theory_Id of |
|
16533 | 165 |
(*identity*) |
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
166 |
{id: serial, (*identifier*) |
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
167 |
ids: Inttab.set} * (*cumulative identifiers -- symbolic body content*) |
29095 | 168 |
(*history*) |
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
169 |
{name: string, (*official theory name*) |
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
170 |
stage: int}; (*counter for anonymous updates*) |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
171 |
|
60947 | 172 |
datatype theory = |
173 |
Theory of |
|
174 |
theory_id * |
|
175 |
(*ancestry*) |
|
176 |
{parents: theory list, (*immediate predecessors*) |
|
177 |
ancestors: theory list} * (*all predecessors -- canonical reverse order*) |
|
178 |
(*data*) |
|
179 |
Any.T Datatab.table; (*body content*) |
|
180 |
||
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
181 |
exception THEORY of string * theory list; |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
182 |
|
60947 | 183 |
fun rep_theory_id (Theory_Id args) = args; |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
184 |
fun rep_theory (Theory args) = args; |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
185 |
|
60947 | 186 |
val theory_id = #1 o rep_theory; |
187 |
||
188 |
val identity_of_id = #1 o rep_theory_id; |
|
189 |
val identity_of = identity_of_id o theory_id; |
|
190 |
val history_of_id = #2 o rep_theory_id; |
|
191 |
val history_of = history_of_id o theory_id; |
|
192 |
val ancestry_of = #2 o rep_theory; |
|
193 |
val data_of = #3 o rep_theory; |
|
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
194 |
|
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
195 |
fun make_identity id ids = {id = id, ids = ids}; |
60947 | 196 |
fun make_history name stage = {name = name, stage = stage}; |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
197 |
fun make_ancestry parents ancestors = {parents = parents, ancestors = ancestors}; |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
198 |
|
60948 | 199 |
val theory_id_name = #name o history_of_id; |
60947 | 200 |
val theory_name = #name o history_of; |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
201 |
val parents_of = #parents o ancestry_of; |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
202 |
val ancestors_of = #ancestors o ancestry_of; |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
203 |
|
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
204 |
|
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
205 |
(* names *) |
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
206 |
|
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
207 |
val PureN = "Pure"; |
29095 | 208 |
val finished = ~1; |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
209 |
|
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
210 |
fun display_names thy = |
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
211 |
let |
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
212 |
val {name, stage} = history_of thy; |
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
213 |
val name' = |
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
214 |
if stage = finished then name |
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
215 |
else name ^ ":" ^ string_of_int stage; |
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
216 |
val ancestor_names = map theory_name (ancestors_of thy); |
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
217 |
in rev (name' :: ancestor_names) end; |
29069
c7ba485581ae
unified ids for ancestors and checkpoints, removed obsolete history of checkpoints;
wenzelm
parents:
29001
diff
changeset
|
218 |
|
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
219 |
val pretty_thy = Pretty.str_list "{" "}" o display_names; |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
220 |
val string_of_thy = Pretty.string_of o pretty_thy; |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
221 |
|
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
222 |
fun pretty_abbrev_thy thy = |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
223 |
let |
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
224 |
val names = display_names thy; |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
225 |
val n = length names; |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
226 |
val abbrev = if n > 5 then "..." :: List.drop (names, n - 5) else names; |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
227 |
in Pretty.str_list "{" "}" abbrev end; |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
228 |
|
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
229 |
val str_of_thy = Pretty.str_of o pretty_abbrev_thy; |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
230 |
|
37867
b9783e9e96e1
added Context.get_theory -- avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset
|
231 |
fun get_theory thy name = |
b9783e9e96e1
added Context.get_theory -- avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset
|
232 |
if theory_name thy <> name then |
b9783e9e96e1
added Context.get_theory -- avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset
|
233 |
(case find_first (fn thy' => theory_name thy' = name) (ancestors_of thy) of |
b9783e9e96e1
added Context.get_theory -- avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset
|
234 |
SOME thy' => thy' |
b9783e9e96e1
added Context.get_theory -- avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset
|
235 |
| NONE => error ("Unknown ancestor theory " ^ quote name)) |
b9783e9e96e1
added Context.get_theory -- avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset
|
236 |
else if #stage (history_of thy) = finished then thy |
b9783e9e96e1
added Context.get_theory -- avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset
|
237 |
else error ("Unfinished theory " ^ quote name); |
b9783e9e96e1
added Context.get_theory -- avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset
|
238 |
|
37871
c7ce7685e087
replaced Thy_Info.the_theory by Context.this_theory -- avoid referring to accidental theory loader state;
wenzelm
parents:
37867
diff
changeset
|
239 |
fun this_theory thy name = |
c7ce7685e087
replaced Thy_Info.the_theory by Context.this_theory -- avoid referring to accidental theory loader state;
wenzelm
parents:
37867
diff
changeset
|
240 |
if theory_name thy = name then thy |
c7ce7685e087
replaced Thy_Info.the_theory by Context.this_theory -- avoid referring to accidental theory loader state;
wenzelm
parents:
37867
diff
changeset
|
241 |
else get_theory thy name; |
c7ce7685e087
replaced Thy_Info.the_theory by Context.this_theory -- avoid referring to accidental theory loader state;
wenzelm
parents:
37867
diff
changeset
|
242 |
|
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
243 |
|
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
244 |
(* build ids *) |
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
245 |
|
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
246 |
fun insert_id id ids = Inttab.update (id, ()) ids; |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
247 |
|
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
248 |
fun merge_ids |
60947 | 249 |
(Theory (Theory_Id ({id = id1, ids = ids1, ...}, _), _, _)) |
250 |
(Theory (Theory_Id ({id = id2, ids = ids2, ...}, _), _, _)) = |
|
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
251 |
Inttab.merge (K true) (ids1, ids2) |
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
252 |
|> insert_id id1 |
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
253 |
|> insert_id id2; |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
254 |
|
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
255 |
|
16533 | 256 |
(* equality and inclusion *) |
257 |
||
60947 | 258 |
val eq_thy_id = op = o apply2 (#id o identity_of_id); |
59058
a78612c67ec0
renamed "pairself" to "apply2", in accordance to @{apply 2};
wenzelm
parents:
55547
diff
changeset
|
259 |
val eq_thy = op = o apply2 (#id o identity_of); |
16533 | 260 |
|
60947 | 261 |
fun proper_subthy_id (Theory_Id ({id, ...}, _), Theory_Id ({ids, ...}, _)) = Inttab.defined ids id; |
262 |
val proper_subthy = proper_subthy_id o apply2 theory_id; |
|
16533 | 263 |
|
60947 | 264 |
fun subthy_id p = eq_thy_id p orelse proper_subthy_id p; |
265 |
val subthy = subthy_id o apply2 theory_id; |
|
16533 | 266 |
|
267 |
||
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
268 |
(* consistent ancestors *) |
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
269 |
|
50431
955c4aa44f60
check consistent theory names for direct imports as well -- as claimed in the comments (see also 1cc36c0ec9eb);
wenzelm
parents:
48992
diff
changeset
|
270 |
fun eq_thy_consistent (thy1, thy2) = |
955c4aa44f60
check consistent theory names for direct imports as well -- as claimed in the comments (see also 1cc36c0ec9eb);
wenzelm
parents:
48992
diff
changeset
|
271 |
eq_thy (thy1, thy2) orelse |
955c4aa44f60
check consistent theory names for direct imports as well -- as claimed in the comments (see also 1cc36c0ec9eb);
wenzelm
parents:
48992
diff
changeset
|
272 |
(theory_name thy1 = theory_name thy2 andalso |
955c4aa44f60
check consistent theory names for direct imports as well -- as claimed in the comments (see also 1cc36c0ec9eb);
wenzelm
parents:
48992
diff
changeset
|
273 |
raise THEORY ("Duplicate theory name", [thy1, thy2])); |
955c4aa44f60
check consistent theory names for direct imports as well -- as claimed in the comments (see also 1cc36c0ec9eb);
wenzelm
parents:
48992
diff
changeset
|
274 |
|
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
275 |
fun extend_ancestors thy thys = |
50431
955c4aa44f60
check consistent theory names for direct imports as well -- as claimed in the comments (see also 1cc36c0ec9eb);
wenzelm
parents:
48992
diff
changeset
|
276 |
if member eq_thy_consistent thys thy then |
33033 | 277 |
raise THEORY ("Duplicate theory node", thy :: thys) |
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
278 |
else thy :: thys; |
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
279 |
|
50431
955c4aa44f60
check consistent theory names for direct imports as well -- as claimed in the comments (see also 1cc36c0ec9eb);
wenzelm
parents:
48992
diff
changeset
|
280 |
val merge_ancestors = merge eq_thy_consistent; |
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
281 |
|
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
282 |
|
23355
d2c033fd4514
merge/merge_refs: plain error instead of exception TERM;
wenzelm
parents:
22847
diff
changeset
|
283 |
(* trivial merge *) |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
284 |
|
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
285 |
fun merge (thy1, thy2) = |
16719 | 286 |
if eq_thy (thy1, thy2) then thy1 |
287 |
else if proper_subthy (thy2, thy1) then thy1 |
|
288 |
else if proper_subthy (thy1, thy2) then thy2 |
|
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
289 |
else error (cat_lines ["Attempt to perform non-trivial merge of theories:", |
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
290 |
str_of_thy thy1, str_of_thy thy2]); |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
291 |
|
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
292 |
|
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
293 |
|
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
294 |
(** build theories **) |
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
295 |
|
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
296 |
(* primitives *) |
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
297 |
|
60947 | 298 |
fun create_thy ids history ancestry data = |
299 |
Theory (Theory_Id (make_identity (serial ()) ids, history), ancestry, data); |
|
33606
2b27020ffcb2
local mutex for theory content/identity operations;
wenzelm
parents:
33517
diff
changeset
|
300 |
|
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
301 |
val pre_pure_thy = |
60947 | 302 |
create_thy Inttab.empty (make_history PureN 0) (make_ancestry [] []) Datatab.empty; |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
303 |
|
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
304 |
local |
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
305 |
|
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
306 |
fun change_thy finish f thy = |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
307 |
let |
60947 | 308 |
val Theory (Theory_Id ({id, ids}, {name, stage}), ancestry, data) = thy; |
309 |
val (ancestry', data') = |
|
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
310 |
if stage = finished then |
60947 | 311 |
(make_ancestry [thy] (extend_ancestors thy (ancestors_of thy)), extend_data data) |
312 |
else (ancestry, data); |
|
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
313 |
val history' = {name = name, stage = if finish then finished else stage + 1}; |
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
314 |
val ids' = insert_id id ids; |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
315 |
val data'' = f data'; |
60947 | 316 |
in create_thy ids' history' ancestry' data'' end; |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
317 |
|
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
318 |
in |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
319 |
|
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
320 |
val update_thy = change_thy false; |
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
321 |
val extend_thy = update_thy I; |
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
322 |
val finish_thy = change_thy true I; |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
323 |
|
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
324 |
end; |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
325 |
|
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
326 |
|
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
327 |
(* named theory nodes *) |
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
328 |
|
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
329 |
fun merge_thys pp (thy1, thy2) = |
26957 | 330 |
let |
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
331 |
val ids = merge_ids thy1 thy2; |
60947 | 332 |
val history = make_history "" 0; |
26957 | 333 |
val ancestry = make_ancestry [] []; |
60947 | 334 |
val data = merge_data (pp thy1) (data_of thy1, data_of thy2); |
335 |
in create_thy ids history ancestry data end; |
|
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
336 |
|
16533 | 337 |
fun maximal_thys thys = |
28617 | 338 |
thys |> filter_out (fn thy => exists (fn thy' => proper_subthy (thy, thy')) thys); |
16533 | 339 |
|
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
340 |
fun begin_thy pp name imports = |
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
341 |
if name = "" then error ("Bad theory name: " ^ quote name) |
24369 | 342 |
else |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
343 |
let |
24141
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
wenzelm
parents:
23944
diff
changeset
|
344 |
val parents = maximal_thys (distinct eq_thy imports); |
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
345 |
val ancestors = |
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
346 |
Library.foldl merge_ancestors ([], map ancestors_of parents) |
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
347 |
|> fold extend_ancestors parents; |
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
348 |
|
60947 | 349 |
val Theory (Theory_Id ({ids, ...}, _), _, data) = |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
350 |
(case parents of |
48638 | 351 |
[] => error "Missing theory imports" |
16533 | 352 |
| [thy] => extend_thy thy |
353 |
| thy :: thys => Library.foldl (merge_thys pp) (thy, thys)); |
|
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset
|
354 |
|
60947 | 355 |
val history = make_history name 0; |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
356 |
val ancestry = make_ancestry parents ancestors; |
60947 | 357 |
in create_thy ids history ancestry data end; |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
358 |
|
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
359 |
|
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
360 |
(* theory data *) |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
361 |
|
33033 | 362 |
structure Theory_Data = |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
363 |
struct |
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
364 |
|
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
365 |
val declare = declare_theory_data; |
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
366 |
|
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
367 |
fun get k dest thy = |
34253
5930c6391126
removed further remains of mutable theory data (cf. 25bd3ed2ac9f);
wenzelm
parents:
34245
diff
changeset
|
368 |
(case Datatab.lookup (data_of thy) k of |
22847
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
wenzelm
parents:
22827
diff
changeset
|
369 |
SOME x => x |
34253
5930c6391126
removed further remains of mutable theory data (cf. 25bd3ed2ac9f);
wenzelm
parents:
34245
diff
changeset
|
370 |
| NONE => invoke_empty k) |> dest; |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
371 |
|
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 -> 100000, JinjaThreads: 65000 -> 300000) -- minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset
|
372 |
fun put k mk x = update_thy (Datatab.update (k, mk x)); |
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
373 |
|
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset
|
374 |
end; |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
375 |
|
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
376 |
|
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
377 |
|
16533 | 378 |
(*** proof context ***) |
379 |
||
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
380 |
(* datatype Proof.context *) |
17060
cca2f3938443
type proof: theory_ref instead of theory (make proof contexts independent entities);
wenzelm
parents:
16894
diff
changeset
|
381 |
|
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
382 |
structure Proof = |
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
383 |
struct |
52788 | 384 |
datatype context = Context of Any.T Datatab.table * theory; |
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
385 |
end; |
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
386 |
|
16533 | 387 |
|
388 |
(* proof data kinds *) |
|
389 |
||
390 |
local |
|
391 |
||
51368
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset
|
392 |
val kinds = Synchronized.var "Proof_Data" (Datatab.empty: (theory -> Any.T) Datatab.table); |
16533 | 393 |
|
59163 | 394 |
fun init_data thy = |
395 |
Synchronized.value kinds |> Datatab.map (fn _ => fn init => init thy); |
|
16533 | 396 |
|
59163 | 397 |
fun init_new_data thy = |
398 |
Synchronized.value kinds |> Datatab.fold (fn (k, init) => fn data => |
|
399 |
if Datatab.defined data k then data |
|
400 |
else Datatab.update (k, init thy) data); |
|
22847
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
wenzelm
parents:
22827
diff
changeset
|
401 |
|
59163 | 402 |
fun init_fallback k thy = |
403 |
(case Datatab.lookup (Synchronized.value kinds) k of |
|
404 |
SOME init => init thy |
|
405 |
| NONE => raise Fail "Invalid proof data identifier"); |
|
16533 | 406 |
|
407 |
in |
|
408 |
||
52788 | 409 |
fun raw_transfer thy' (Proof.Context (data, thy)) = |
24141
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
wenzelm
parents:
23944
diff
changeset
|
410 |
let |
52682 | 411 |
val _ = subthy (thy, thy') orelse error "Cannot transfer proof context: not a super theory"; |
59163 | 412 |
val data' = init_new_data thy' data; |
52788 | 413 |
in Proof.Context (data', thy') end; |
22847
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
wenzelm
parents:
22827
diff
changeset
|
414 |
|
42360 | 415 |
structure Proof_Context = |
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
416 |
struct |
59163 | 417 |
fun theory_of (Proof.Context (_, thy)) = thy; |
52788 | 418 |
fun init_global thy = Proof.Context (init_data thy, thy); |
51686 | 419 |
fun get_global thy name = init_global (get_theory thy name); |
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
420 |
end; |
16533 | 421 |
|
33033 | 422 |
structure Proof_Data = |
16533 | 423 |
struct |
424 |
||
22847
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
wenzelm
parents:
22827
diff
changeset
|
425 |
fun declare init = |
16533 | 426 |
let |
427 |
val k = serial (); |
|
43684 | 428 |
val _ = Synchronized.change kinds (Datatab.update (k, init)); |
16533 | 429 |
in k end; |
430 |
||
59163 | 431 |
fun get k dest (Proof.Context (data, thy)) = |
432 |
(case Datatab.lookup data k of |
|
22847
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
wenzelm
parents:
22827
diff
changeset
|
433 |
SOME x => x |
59163 | 434 |
| NONE => init_fallback k thy) |> dest; |
16533 | 435 |
|
59163 | 436 |
fun put k mk x (Proof.Context (data, thy)) = |
437 |
Proof.Context (Datatab.update (k, mk x) data, thy); |
|
16533 | 438 |
|
439 |
end; |
|
440 |
||
441 |
end; |
|
442 |
||
443 |
||
18632 | 444 |
|
16533 | 445 |
(*** generic context ***) |
446 |
||
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
447 |
datatype generic = Theory of theory | Proof of Proof.context; |
18632 | 448 |
|
449 |
fun cases f _ (Theory thy) = f thy |
|
450 |
| cases _ g (Proof prf) = g prf; |
|
16533 | 451 |
|
19678 | 452 |
fun mapping f g = cases (Theory o f) (Proof o g); |
21660 | 453 |
fun mapping_result f g = cases (apsnd Theory o f) (apsnd Proof o g); |
19678 | 454 |
|
23595
7ca68a2c8575
the_theory/proof: error instead of exception Fail;
wenzelm
parents:
23355
diff
changeset
|
455 |
val the_theory = cases I (fn _ => error "Ill-typed context: theory expected"); |
7ca68a2c8575
the_theory/proof: error instead of exception Fail;
wenzelm
parents:
23355
diff
changeset
|
456 |
val the_proof = cases (fn _ => error "Ill-typed context: proof expected") I; |
16533 | 457 |
|
18731 | 458 |
fun map_theory f = Theory o f o the_theory; |
459 |
fun map_proof f = Proof o f o the_proof; |
|
460 |
||
26486 | 461 |
fun map_theory_result f = apsnd Theory o f o the_theory; |
462 |
fun map_proof_result f = apsnd Proof o f o the_proof; |
|
463 |
||
18731 | 464 |
fun theory_map f = the_theory o f o Theory; |
465 |
fun proof_map f = the_proof o f o Proof; |
|
18665 | 466 |
|
42360 | 467 |
val theory_of = cases I Proof_Context.theory_of; |
468 |
val proof_of = cases Proof_Context.init_global I; |
|
16533 | 469 |
|
22085
c138cfd500f7
ML context: full generic context, tuned signature;
wenzelm
parents:
21962
diff
changeset
|
470 |
|
42383
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset
|
471 |
(* pretty printing context *) |
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset
|
472 |
|
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset
|
473 |
exception PRETTY of generic; |
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset
|
474 |
|
47005
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
wenzelm
parents:
43684
diff
changeset
|
475 |
val pretty_generic = Pretty o PRETTY; |
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
wenzelm
parents:
43684
diff
changeset
|
476 |
val pretty = pretty_generic o Proof; |
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
wenzelm
parents:
43684
diff
changeset
|
477 |
val pretty_global = pretty_generic o Theory; |
42383
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset
|
478 |
|
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset
|
479 |
fun pretty_context init (Pretty (PRETTY context)) = cases init I context; |
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset
|
480 |
|
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset
|
481 |
|
22085
c138cfd500f7
ML context: full generic context, tuned signature;
wenzelm
parents:
21962
diff
changeset
|
482 |
|
26413
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
483 |
(** thread data **) |
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
484 |
|
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
485 |
local val tag = Universal.tag () : generic option Universal.tag in |
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
486 |
|
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
487 |
fun thread_data () = |
28122 | 488 |
(case Thread.getLocal tag of |
26413
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
489 |
SOME (SOME context) => SOME context |
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
490 |
| _ => NONE); |
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
491 |
|
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
492 |
fun the_thread_data () = |
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
493 |
(case thread_data () of |
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
494 |
SOME context => context |
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
495 |
| _ => error "Unknown context"); |
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
496 |
|
28122 | 497 |
fun set_thread_data context = Thread.setLocal (tag, context); |
26413
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
498 |
fun setmp_thread_data context = Library.setmp_thread_data tag (thread_data ()) context; |
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
499 |
|
26428 | 500 |
end; |
501 |
||
502 |
fun >>> f = |
|
503 |
let |
|
26463 | 504 |
val (res, context') = f (the_thread_data ()); |
505 |
val _ = set_thread_data (SOME context'); |
|
26428 | 506 |
in res end; |
507 |
||
26421 | 508 |
nonfix >>; |
26463 | 509 |
fun >> f = >>> (fn context => ((), f context)); |
26413
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
510 |
|
26428 | 511 |
val _ = set_thread_data (SOME (Theory pre_pure_thy)); |
26413
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset
|
512 |
|
6185 | 513 |
end; |
514 |
||
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
515 |
structure Basic_Context: BASIC_CONTEXT = Context; |
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
516 |
open Basic_Context; |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
517 |
|
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
518 |
|
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
519 |
|
16533 | 520 |
(*** type-safe interfaces for data declarations ***) |
521 |
||
522 |
(** theory data **) |
|
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
523 |
|
34259
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations -- hard to get rid of);
wenzelm
parents:
34253
diff
changeset
|
524 |
signature THEORY_DATA_PP_ARGS = |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
525 |
sig |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
526 |
type T |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
527 |
val empty: T |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
528 |
val extend: T -> T |
42383
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset
|
529 |
val merge: Context.pretty -> T * T -> T |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
530 |
end; |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
531 |
|
34259
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations -- hard to get rid of);
wenzelm
parents:
34253
diff
changeset
|
532 |
signature THEORY_DATA_ARGS = |
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations -- hard to get rid of);
wenzelm
parents:
34253
diff
changeset
|
533 |
sig |
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations -- hard to get rid of);
wenzelm
parents:
34253
diff
changeset
|
534 |
type T |
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations -- hard to get rid of);
wenzelm
parents:
34253
diff
changeset
|
535 |
val empty: T |
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations -- hard to get rid of);
wenzelm
parents:
34253
diff
changeset
|
536 |
val extend: T -> T |
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations -- hard to get rid of);
wenzelm
parents:
34253
diff
changeset
|
537 |
val merge: T * T -> T |
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations -- hard to get rid of);
wenzelm
parents:
34253
diff
changeset
|
538 |
end; |
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations -- hard to get rid of);
wenzelm
parents:
34253
diff
changeset
|
539 |
|
34253
5930c6391126
removed further remains of mutable theory data (cf. 25bd3ed2ac9f);
wenzelm
parents:
34245
diff
changeset
|
540 |
signature THEORY_DATA = |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
541 |
sig |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
542 |
type T |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
543 |
val get: theory -> T |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
544 |
val put: T -> theory -> theory |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
545 |
val map: (T -> T) -> theory -> theory |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
546 |
end; |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
547 |
|
34259
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations -- hard to get rid of);
wenzelm
parents:
34253
diff
changeset
|
548 |
functor Theory_Data_PP(Data: THEORY_DATA_PP_ARGS): THEORY_DATA = |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
549 |
struct |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
550 |
|
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
551 |
type T = Data.T; |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
552 |
exception Data of T; |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
553 |
|
42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
554 |
val kind = |
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
555 |
Context.Theory_Data.declare |
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
556 |
(Position.thread_data ()) |
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
557 |
(Data Data.empty) |
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
558 |
(fn Data x => Data (Data.extend x)) |
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset
|
559 |
(fn pp => fn (Data x1, Data x2) => Data (Data.merge pp (x1, x2))); |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
560 |
|
33033 | 561 |
val get = Context.Theory_Data.get kind (fn Data x => x); |
562 |
val put = Context.Theory_Data.put kind Data; |
|
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
563 |
fun map f thy = put (f (get thy)) thy; |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
564 |
|
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
565 |
end; |
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
566 |
|
33517
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
wenzelm
parents:
33033
diff
changeset
|
567 |
functor Theory_Data(Data: THEORY_DATA_ARGS): THEORY_DATA = |
34259
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations -- hard to get rid of);
wenzelm
parents:
34253
diff
changeset
|
568 |
Theory_Data_PP |
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations -- hard to get rid of);
wenzelm
parents:
34253
diff
changeset
|
569 |
( |
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations -- hard to get rid of);
wenzelm
parents:
34253
diff
changeset
|
570 |
type T = Data.T; |
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations -- hard to get rid of);
wenzelm
parents:
34253
diff
changeset
|
571 |
val empty = Data.empty; |
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations -- hard to get rid of);
wenzelm
parents:
34253
diff
changeset
|
572 |
val extend = Data.extend; |
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations -- hard to get rid of);
wenzelm
parents:
34253
diff
changeset
|
573 |
fun merge _ = Data.merge; |
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations -- hard to get rid of);
wenzelm
parents:
34253
diff
changeset
|
574 |
); |
33517
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
wenzelm
parents:
33033
diff
changeset
|
575 |
|
16533 | 576 |
|
577 |
||
578 |
(** proof data **) |
|
579 |
||
580 |
signature PROOF_DATA_ARGS = |
|
581 |
sig |
|
582 |
type T |
|
583 |
val init: theory -> T |
|
584 |
end; |
|
585 |
||
586 |
signature PROOF_DATA = |
|
587 |
sig |
|
588 |
type T |
|
33031
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
589 |
val get: Proof.context -> T |
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
590 |
val put: T -> Proof.context -> Proof.context |
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
wenzelm
parents:
32784
diff
changeset
|
591 |
val map: (T -> T) -> Proof.context -> Proof.context |
16533 | 592 |
end; |
593 |
||
33517
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
wenzelm
parents:
33033
diff
changeset
|
594 |
functor Proof_Data(Data: PROOF_DATA_ARGS): PROOF_DATA = |
16533 | 595 |
struct |
596 |
||
597 |
type T = Data.T; |
|
598 |
exception Data of T; |
|
599 |
||
33033 | 600 |
val kind = Context.Proof_Data.declare (Data o Data.init); |
16533 | 601 |
|
33033 | 602 |
val get = Context.Proof_Data.get kind (fn Data x => x); |
603 |
val put = Context.Proof_Data.put kind Data; |
|
16533 | 604 |
fun map f prf = put (f (get prf)) prf; |
605 |
||
606 |
end; |
|
607 |
||
18632 | 608 |
|
609 |
||
610 |
(** generic data **) |
|
611 |
||
612 |
signature GENERIC_DATA_ARGS = |
|
613 |
sig |
|
614 |
type T |
|
615 |
val empty: T |
|
616 |
val extend: T -> T |
|
33517
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
wenzelm
parents:
33033
diff
changeset
|
617 |
val merge: T * T -> T |
18632 | 618 |
end; |
619 |
||
620 |
signature GENERIC_DATA = |
|
621 |
sig |
|
622 |
type T |
|
623 |
val get: Context.generic -> T |
|
624 |
val put: T -> Context.generic -> Context.generic |
|
625 |
val map: (T -> T) -> Context.generic -> Context.generic |
|
626 |
end; |
|
627 |
||
33517
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
wenzelm
parents:
33033
diff
changeset
|
628 |
functor Generic_Data(Data: GENERIC_DATA_ARGS): GENERIC_DATA = |
18632 | 629 |
struct |
630 |
||
33517
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
wenzelm
parents:
33033
diff
changeset
|
631 |
structure Thy_Data = Theory_Data(Data); |
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
wenzelm
parents:
33033
diff
changeset
|
632 |
structure Prf_Data = Proof_Data(type T = Data.T val init = Thy_Data.get); |
18632 | 633 |
|
634 |
type T = Data.T; |
|
635 |
||
33033 | 636 |
fun get (Context.Theory thy) = Thy_Data.get thy |
637 |
| get (Context.Proof prf) = Prf_Data.get prf; |
|
18632 | 638 |
|
33033 | 639 |
fun put x (Context.Theory thy) = Context.Theory (Thy_Data.put x thy) |
640 |
| put x (Context.Proof prf) = Context.Proof (Prf_Data.put x prf); |
|
18632 | 641 |
|
642 |
fun map f ctxt = put (f (get ctxt)) ctxt; |
|
643 |
||
644 |
end; |
|
645 |
||
16533 | 646 |
(*hide private interface*) |
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset
|
647 |
structure Context: CONTEXT = Context; |
20297 | 648 |