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