| author | immler | 
| Thu, 27 Dec 2018 21:00:50 +0100 | |
| changeset 69510 | 0f31dd2e540d | 
| parent 68482 | cb84beb84ca9 | 
| child 70360 | 03430649a7d2 | 
| 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  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
34  | 
val parents_of: theory -> theory list  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
35  | 
val ancestors_of: theory -> theory list  | 
| 
65459
 
da59e8e0a663
clarified theory_long_name (for qualified access to Thy_Info) vs. short theory_name (which is unique within any given theory context);
 
wenzelm 
parents: 
62889 
diff
changeset
 | 
36  | 
val theory_id_long_name: theory_id -> string  | 
| 60948 | 37  | 
val theory_id_name: theory_id -> string  | 
| 
65459
 
da59e8e0a663
clarified theory_long_name (for qualified access to Thy_Info) vs. short theory_name (which is unique within any given theory context);
 
wenzelm 
parents: 
62889 
diff
changeset
 | 
38  | 
val theory_long_name: theory -> string  | 
| 
29069
 
c7ba485581ae
unified ids for ancestors and checkpoints, removed obsolete history of checkpoints;
 
wenzelm 
parents: 
29001 
diff
changeset
 | 
39  | 
val theory_name: theory -> string  | 
| 68482 | 40  | 
  val theory_name': {long: bool} -> 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
 | 
41  | 
val PureN: string  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
42  | 
val pretty_thy: theory -> Pretty.T  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
43  | 
val pretty_abbrev_thy: theory -> Pretty.T  | 
| 68482 | 44  | 
  val get_theory: {long: bool} -> theory -> string -> theory
 | 
| 60947 | 45  | 
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
 | 
46  | 
val eq_thy: theory * theory -> bool  | 
| 60947 | 47  | 
val proper_subthy_id: theory_id * theory_id -> bool  | 
48  | 
val proper_subthy: theory * theory -> bool  | 
|
49  | 
val subthy_id: theory_id * theory_id -> bool  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
50  | 
val subthy: theory * theory -> bool  | 
| 67623 | 51  | 
val trace_theories: bool Unsynchronized.ref  | 
| 67640 | 52  | 
  val theories_trace: unit -> {active_positions: Position.T list, active: int, total: int}
 | 
| 67623 | 53  | 
val begin_thy: string -> theory list -> theory  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
54  | 
val finish_thy: theory -> theory  | 
| 67621 | 55  | 
val theory_data_size: theory -> (Position.T * int) list  | 
| 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  | 
| 
61044
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
58  | 
(*certificate*)  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
59  | 
datatype certificate = Certificate of theory | Certificate_Id of theory_id  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
60  | 
val certificate_theory: certificate -> theory  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
61  | 
val certificate_theory_id: certificate -> theory_id  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
62  | 
val eq_certificate: certificate * certificate -> bool  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
63  | 
val join_certificate: certificate * certificate -> certificate  | 
| 16533 | 64  | 
(*generic context*)  | 
| 
33031
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
65  | 
datatype generic = Theory of theory | Proof of Proof.context  | 
| 
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
66  | 
val cases: (theory -> 'a) -> (Proof.context -> 'a) -> generic -> 'a  | 
| 
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
67  | 
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
 | 
68  | 
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
 | 
69  | 
generic -> 'a * generic  | 
| 18632 | 70  | 
val the_theory: generic -> theory  | 
| 
33031
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
71  | 
val the_proof: generic -> Proof.context  | 
| 18731 | 72  | 
val map_theory: (theory -> theory) -> generic -> generic  | 
| 
33031
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
73  | 
val map_proof: (Proof.context -> Proof.context) -> generic -> generic  | 
| 26486 | 74  | 
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
 | 
75  | 
val map_proof_result: (Proof.context -> 'a * Proof.context) -> generic -> 'a * generic  | 
| 18731 | 76  | 
val theory_map: (generic -> generic) -> theory -> theory  | 
| 
33031
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
77  | 
val proof_map: (generic -> generic) -> Proof.context -> Proof.context  | 
| 
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
78  | 
val theory_of: generic -> theory (*total*)  | 
| 
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
79  | 
val proof_of: generic -> Proof.context (*total*)  | 
| 
26413
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
80  | 
(*thread data*)  | 
| 62889 | 81  | 
val get_generic_context: unit -> generic option  | 
82  | 
val put_generic_context: generic option -> unit  | 
|
83  | 
  val setmp_generic_context: generic option -> ('a -> 'b) -> 'a -> 'b
 | 
|
| 62876 | 84  | 
val the_generic_context: unit -> generic  | 
85  | 
val the_global_context: unit -> theory  | 
|
86  | 
val the_local_context: unit -> Proof.context  | 
|
| 26463 | 87  | 
val >> : (generic -> generic) -> unit  | 
88  | 
val >>> : (generic -> 'a * generic) -> 'a  | 
|
| 6185 | 89  | 
end;  | 
90  | 
||
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
91  | 
signature PRIVATE_CONTEXT =  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
92  | 
sig  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
93  | 
include CONTEXT  | 
| 33033 | 94  | 
structure Theory_Data:  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
95  | 
sig  | 
| 
51368
 
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
 
wenzelm 
parents: 
50431 
diff
changeset
 | 
96  | 
val declare: Position.T -> Any.T -> (Any.T -> Any.T) ->  | 
| 
61262
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
97  | 
(theory * theory -> Any.T * Any.T -> Any.T) -> serial  | 
| 
51368
 
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
 
wenzelm 
parents: 
50431 
diff
changeset
 | 
98  | 
val get: serial -> (Any.T -> 'a) -> theory -> 'a  | 
| 
 
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
 
wenzelm 
parents: 
50431 
diff
changeset
 | 
99  | 
    val put: serial -> ('a -> Any.T) -> 'a -> theory -> theory
 | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
100  | 
end  | 
| 33033 | 101  | 
structure Proof_Data:  | 
| 16533 | 102  | 
sig  | 
| 
51368
 
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
 
wenzelm 
parents: 
50431 
diff
changeset
 | 
103  | 
val declare: (theory -> Any.T) -> serial  | 
| 
 
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
 
wenzelm 
parents: 
50431 
diff
changeset
 | 
104  | 
val get: serial -> (Any.T -> 'a) -> Proof.context -> 'a  | 
| 
 
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
 
wenzelm 
parents: 
50431 
diff
changeset
 | 
105  | 
    val put: serial -> ('a -> Any.T) -> 'a -> Proof.context -> Proof.context
 | 
| 16533 | 106  | 
end  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
107  | 
end;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
108  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
109  | 
structure Context: PRIVATE_CONTEXT =  | 
| 6185 | 110  | 
struct  | 
111  | 
||
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
112  | 
(*** theory context ***)  | 
| 6185 | 113  | 
|
| 
19028
 
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
 
wenzelm 
parents: 
18931 
diff
changeset
 | 
114  | 
(*private copy avoids potential conflict of table exceptions*)  | 
| 
31971
 
8c1b845ed105
renamed functor TableFun to Table, and GraphFun to Graph;
 
wenzelm 
parents: 
30628 
diff
changeset
 | 
115  | 
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
 | 
116  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
117  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
118  | 
(** datatype theory **)  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
119  | 
|
| 60947 | 120  | 
datatype theory_id =  | 
121  | 
Theory_Id of  | 
|
| 16533 | 122  | 
(*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
 | 
123  | 
   {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
 | 
124  | 
ids: Inttab.set} * (*cumulative identifiers -- symbolic body content*)  | 
| 29095 | 125  | 
(*history*)  | 
| 
29093
 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 
wenzelm 
parents: 
29069 
diff
changeset
 | 
126  | 
   {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
 | 
127  | 
stage: int}; (*counter for anonymous updates*)  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
128  | 
|
| 60947 | 129  | 
datatype theory =  | 
130  | 
Theory of  | 
|
| 67623 | 131  | 
(*identity*)  | 
132  | 
   {theory_id: theory_id,
 | 
|
| 67640 | 133  | 
token: Position.T Unsynchronized.ref} *  | 
| 60947 | 134  | 
(*ancestry*)  | 
135  | 
   {parents: theory list,         (*immediate predecessors*)
 | 
|
136  | 
ancestors: theory list} * (*all predecessors -- canonical reverse order*)  | 
|
137  | 
(*data*)  | 
|
138  | 
Any.T Datatab.table; (*body content*)  | 
|
139  | 
||
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
140  | 
exception THEORY of string * theory list;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
141  | 
|
| 60947 | 142  | 
fun rep_theory_id (Theory_Id args) = args;  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
143  | 
fun rep_theory (Theory args) = args;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
144  | 
|
| 67623 | 145  | 
val theory_identity = #1 o rep_theory;  | 
146  | 
val theory_id = #theory_id o theory_identity;  | 
|
| 60947 | 147  | 
|
148  | 
val identity_of_id = #1 o rep_theory_id;  | 
|
149  | 
val identity_of = identity_of_id o theory_id;  | 
|
150  | 
val history_of_id = #2 o rep_theory_id;  | 
|
151  | 
val history_of = history_of_id o theory_id;  | 
|
152  | 
val ancestry_of = #2 o rep_theory;  | 
|
153  | 
val data_of = #3 o rep_theory;  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
154  | 
|
| 
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
 | 
155  | 
fun make_identity id ids = {id = id, ids = ids};
 | 
| 60947 | 156  | 
fun make_history name stage = {name = name, stage = stage};
 | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
157  | 
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
 | 
158  | 
|
| 
65459
 
da59e8e0a663
clarified theory_long_name (for qualified access to Thy_Info) vs. short theory_name (which is unique within any given theory context);
 
wenzelm 
parents: 
62889 
diff
changeset
 | 
159  | 
val theory_id_long_name = #name o history_of_id;  | 
| 
 
da59e8e0a663
clarified theory_long_name (for qualified access to Thy_Info) vs. short theory_name (which is unique within any given theory context);
 
wenzelm 
parents: 
62889 
diff
changeset
 | 
160  | 
val theory_id_name = Long_Name.base_name o theory_id_long_name;  | 
| 
 
da59e8e0a663
clarified theory_long_name (for qualified access to Thy_Info) vs. short theory_name (which is unique within any given theory context);
 
wenzelm 
parents: 
62889 
diff
changeset
 | 
161  | 
val theory_long_name = #name o history_of;  | 
| 
 
da59e8e0a663
clarified theory_long_name (for qualified access to Thy_Info) vs. short theory_name (which is unique within any given theory context);
 
wenzelm 
parents: 
62889 
diff
changeset
 | 
162  | 
val theory_name = Long_Name.base_name o theory_long_name;  | 
| 68482 | 163  | 
fun theory_name' {long} = if long then theory_long_name else theory_name;
 | 
| 
65459
 
da59e8e0a663
clarified theory_long_name (for qualified access to Thy_Info) vs. short theory_name (which is unique within any given theory context);
 
wenzelm 
parents: 
62889 
diff
changeset
 | 
164  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
165  | 
val parents_of = #parents o ancestry_of;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
166  | 
val ancestors_of = #ancestors o ancestry_of;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
167  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
168  | 
|
| 
29093
 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 
wenzelm 
parents: 
29069 
diff
changeset
 | 
169  | 
(* names *)  | 
| 
 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 
wenzelm 
parents: 
29069 
diff
changeset
 | 
170  | 
|
| 
 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 
wenzelm 
parents: 
29069 
diff
changeset
 | 
171  | 
val PureN = "Pure";  | 
| 29095 | 172  | 
val finished = ~1;  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
173  | 
|
| 
61044
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
174  | 
fun display_name thy_id =  | 
| 
66452
 
450cefec7c11
more informative error message, e.g. relevant for incoherent imports;
 
wenzelm 
parents: 
65460 
diff
changeset
 | 
175  | 
  let val {name, stage} = history_of_id thy_id;
 | 
| 
61044
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
176  | 
in if stage = finished then name else name ^ ":" ^ string_of_int stage end;  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
177  | 
|
| 
29093
 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 
wenzelm 
parents: 
29069 
diff
changeset
 | 
178  | 
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
 | 
179  | 
let  | 
| 
61044
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
180  | 
val name = display_name (theory_id thy);  | 
| 68192 | 181  | 
val ancestor_names = map theory_long_name (ancestors_of thy);  | 
| 
61044
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
182  | 
in rev (name :: ancestor_names) end;  | 
| 
29069
 
c7ba485581ae
unified ids for ancestors and checkpoints, removed obsolete history of checkpoints;
 
wenzelm 
parents: 
29001 
diff
changeset
 | 
183  | 
|
| 
29093
 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 
wenzelm 
parents: 
29069 
diff
changeset
 | 
184  | 
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
 | 
185  | 
|
| 
62819
 
d3ff367a16a0
careful export of type-dependent functions, without losing their special status;
 
wenzelm 
parents: 
62663 
diff
changeset
 | 
186  | 
val _ = ML_system_pp (fn _ => fn _ => Pretty.to_polyml o pretty_thy);  | 
| 62663 | 187  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
188  | 
fun pretty_abbrev_thy thy =  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
189  | 
let  | 
| 
29093
 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 
wenzelm 
parents: 
29069 
diff
changeset
 | 
190  | 
val names = display_names thy;  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
191  | 
val n = length names;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
192  | 
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
 | 
193  | 
  in Pretty.str_list "{" "}" abbrev end;
 | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
194  | 
|
| 68482 | 195  | 
fun get_theory long thy name =  | 
196  | 
if theory_name' long thy <> name then  | 
|
197  | 
(case find_first (fn thy' => theory_name' long thy' = name) (ancestors_of thy) of  | 
|
| 
37867
 
b9783e9e96e1
added Context.get_theory -- avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
 
wenzelm 
parents: 
37852 
diff
changeset
 | 
198  | 
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
 | 
199  | 
    | 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
 | 
200  | 
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
 | 
201  | 
  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
 | 
202  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
203  | 
|
| 
29093
 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 
wenzelm 
parents: 
29069 
diff
changeset
 | 
204  | 
(* build ids *)  | 
| 
 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 
wenzelm 
parents: 
29069 
diff
changeset
 | 
205  | 
|
| 
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
 | 
206  | 
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
 | 
207  | 
|
| 67623 | 208  | 
val merge_ids =  | 
209  | 
apply2 theory_id #>  | 
|
210  | 
  (fn (Theory_Id ({id = id1, ids = ids1, ...}, _), Theory_Id ({id = id2, ids = ids2, ...}, _)) =>
 | 
|
211  | 
Inttab.merge (K true) (ids1, ids2)  | 
|
212  | 
|> insert_id id1  | 
|
213  | 
|> insert_id id2);  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
214  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
215  | 
|
| 16533 | 216  | 
(* equality and inclusion *)  | 
217  | 
||
| 60947 | 218  | 
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
 | 
219  | 
val eq_thy = op = o apply2 (#id o identity_of);  | 
| 16533 | 220  | 
|
| 60947 | 221  | 
fun proper_subthy_id (Theory_Id ({id, ...}, _), Theory_Id ({ids, ...}, _)) = Inttab.defined ids id;
 | 
222  | 
val proper_subthy = proper_subthy_id o apply2 theory_id;  | 
|
| 16533 | 223  | 
|
| 60947 | 224  | 
fun subthy_id p = eq_thy_id p orelse proper_subthy_id p;  | 
225  | 
val subthy = subthy_id o apply2 theory_id;  | 
|
| 16533 | 226  | 
|
227  | 
||
| 
29093
 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 
wenzelm 
parents: 
29069 
diff
changeset
 | 
228  | 
(* consistent ancestors *)  | 
| 
 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 
wenzelm 
parents: 
29069 
diff
changeset
 | 
229  | 
|
| 
50431
 
955c4aa44f60
check consistent theory names for direct imports as well -- as claimed in the comments (see also 1cc36c0ec9eb);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
230  | 
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
 | 
231  | 
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
 | 
232  | 
(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
 | 
233  | 
      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
 | 
234  | 
|
| 
29093
 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 
wenzelm 
parents: 
29069 
diff
changeset
 | 
235  | 
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
 | 
236  | 
if member eq_thy_consistent thys thy then  | 
| 33033 | 237  | 
    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
 | 
238  | 
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
 | 
239  | 
|
| 
50431
 
955c4aa44f60
check consistent theory names for direct imports as well -- as claimed in the comments (see also 1cc36c0ec9eb);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
240  | 
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
 | 
241  | 
|
| 
 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 
wenzelm 
parents: 
29069 
diff
changeset
 | 
242  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
243  | 
|
| 
61262
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
244  | 
(** theory data **)  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
245  | 
|
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
246  | 
(* data kinds and access methods *)  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
247  | 
|
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
248  | 
val timing = Unsynchronized.ref false;  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
249  | 
|
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
250  | 
local  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
251  | 
|
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
252  | 
type kind =  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
253  | 
 {pos: Position.T,
 | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
254  | 
empty: Any.T,  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
255  | 
extend: Any.T -> Any.T,  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
256  | 
merge: theory * theory -> Any.T * Any.T -> Any.T};  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
257  | 
|
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
258  | 
val kinds = Synchronized.var "Theory_Data" (Datatab.empty: kind Datatab.table);  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
259  | 
|
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
260  | 
fun invoke name f k x =  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
261  | 
(case Datatab.lookup (Synchronized.value kinds) k of  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
262  | 
SOME kind =>  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
263  | 
if ! timing andalso name <> "" then  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
264  | 
        Timing.cond_timeit true ("Theory_Data." ^ name ^ Position.here (#pos kind))
 | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
265  | 
(fn () => f kind x)  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
266  | 
else f kind x  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
267  | 
| NONE => raise Fail "Invalid theory data identifier");  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
268  | 
|
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
269  | 
in  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
270  | 
|
| 67621 | 271  | 
fun invoke_pos k = invoke "" (K o #pos) k ();  | 
| 
61262
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
272  | 
fun invoke_empty k = invoke "" (K o #empty) k ();  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
273  | 
val invoke_extend = invoke "extend" #extend;  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
274  | 
fun invoke_merge thys = invoke "merge" (fn kind => #merge kind thys);  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
275  | 
|
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
276  | 
fun declare_theory_data pos empty extend merge =  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
277  | 
let  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
278  | 
val k = serial ();  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
279  | 
    val kind = {pos = pos, empty = empty, extend = extend, merge = merge};
 | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
280  | 
val _ = Synchronized.change kinds (Datatab.update (k, kind));  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
281  | 
in k end;  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
282  | 
|
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
283  | 
val extend_data = Datatab.map invoke_extend;  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
284  | 
fun merge_data thys = Datatab.join (invoke_merge thys) o apply2 extend_data;  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
285  | 
|
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
286  | 
end;  | 
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
287  | 
|
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
288  | 
|
| 
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
289  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
290  | 
(** build theories **)  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
291  | 
|
| 67623 | 292  | 
(* create theory *)  | 
293  | 
||
294  | 
val trace_theories = Unsynchronized.ref false;  | 
|
295  | 
||
296  | 
local  | 
|
297  | 
||
298  | 
val theories =  | 
|
| 67640 | 299  | 
Synchronized.var "theory_tokens"  | 
300  | 
([]: Position.T Unsynchronized.ref option Unsynchronized.ref list);  | 
|
| 67623 | 301  | 
|
| 67640 | 302  | 
val dummy_token = Unsynchronized.ref Position.none;  | 
| 67623 | 303  | 
|
304  | 
fun make_token () =  | 
|
305  | 
if ! trace_theories then  | 
|
306  | 
let  | 
|
| 67640 | 307  | 
val token = Unsynchronized.ref (Position.thread_data ());  | 
| 67623 | 308  | 
val _ = Synchronized.change theories (cons (Weak.weak (SOME token)));  | 
309  | 
in token end  | 
|
310  | 
else dummy_token;  | 
|
311  | 
||
312  | 
in  | 
|
313  | 
||
314  | 
fun theories_trace () =  | 
|
315  | 
let  | 
|
316  | 
val trace = Synchronized.value theories;  | 
|
317  | 
val _ = ML_Heap.full_gc ();  | 
|
| 67640 | 318  | 
val active_positions =  | 
319  | 
fold (fn Unsynchronized.ref (SOME pos) => cons (! pos) | _ => I) trace [];  | 
|
320  | 
in  | 
|
321  | 
    {active_positions = active_positions,
 | 
|
322  | 
active = length active_positions,  | 
|
323  | 
total = length trace}  | 
|
324  | 
end;  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
325  | 
|
| 60947 | 326  | 
fun create_thy ids history ancestry data =  | 
| 67623 | 327  | 
let  | 
328  | 
val theory_id = Theory_Id (make_identity (serial ()) ids, history);  | 
|
329  | 
val token = make_token ();  | 
|
330  | 
  in Theory ({theory_id = theory_id, token = token}, ancestry, data) end;
 | 
|
331  | 
||
332  | 
end;  | 
|
333  | 
||
334  | 
||
335  | 
(* primitives *)  | 
|
| 
33606
 
2b27020ffcb2
local mutex for theory content/identity operations;
 
wenzelm 
parents: 
33517 
diff
changeset
 | 
336  | 
|
| 
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
 | 
337  | 
val pre_pure_thy =  | 
| 60947 | 338  | 
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
 | 
339  | 
|
| 
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
 | 
340  | 
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
 | 
341  | 
|
| 
 
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
 | 
342  | 
fun change_thy finish f thy =  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
343  | 
let  | 
| 67623 | 344  | 
    val Theory_Id ({id, ids}, {name, stage}) = theory_id thy;
 | 
345  | 
val Theory (_, ancestry, data) = thy;  | 
|
| 60947 | 346  | 
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
 | 
347  | 
if stage = finished then  | 
| 60947 | 348  | 
(make_ancestry [thy] (extend_ancestors thy (ancestors_of thy)), extend_data data)  | 
349  | 
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
 | 
350  | 
    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
 | 
351  | 
val ids' = insert_id id ids;  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
352  | 
val data'' = f data';  | 
| 60947 | 353  | 
in create_thy ids' history' ancestry' data'' end;  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
354  | 
|
| 
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
 | 
355  | 
in  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
356  | 
|
| 
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
 | 
357  | 
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
 | 
358  | 
val extend_thy = update_thy I;  | 
| 
68193
 
14dd78f036ba
more thorough checks for theory name consistency (for extend, not just merge);
 
wenzelm 
parents: 
68192 
diff
changeset
 | 
359  | 
val finish_thy = change_thy true I #> tap extend_thy;  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
360  | 
|
| 
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
 | 
361  | 
end;  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
362  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
363  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
364  | 
(* named theory nodes *)  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
365  | 
|
| 
61044
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
366  | 
local  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
367  | 
|
| 67623 | 368  | 
fun merge_thys thys =  | 
| 26957 | 369  | 
let  | 
| 67623 | 370  | 
val ids = merge_ids thys;  | 
| 60947 | 371  | 
val history = make_history "" 0;  | 
| 26957 | 372  | 
val ancestry = make_ancestry [] [];  | 
| 67623 | 373  | 
val data = merge_data thys (apply2 data_of thys);  | 
| 60947 | 374  | 
in create_thy ids history ancestry data end;  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
375  | 
|
| 16533 | 376  | 
fun maximal_thys thys =  | 
| 28617 | 377  | 
thys |> filter_out (fn thy => exists (fn thy' => proper_subthy (thy, thy')) thys);  | 
| 16533 | 378  | 
|
| 
61044
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
379  | 
in  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
380  | 
|
| 
61262
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
381  | 
fun begin_thy 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
 | 
382  | 
  if name = "" then error ("Bad theory name: " ^ quote name)
 | 
| 24369 | 383  | 
else  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
384  | 
let  | 
| 
24141
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
385  | 
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
 | 
386  | 
val ancestors =  | 
| 
 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 
wenzelm 
parents: 
29069 
diff
changeset
 | 
387  | 
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
 | 
388  | 
|> 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
 | 
389  | 
|
| 67623 | 390  | 
val thy0 =  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
391  | 
(case parents of  | 
| 48638 | 392  | 
[] => error "Missing theory imports"  | 
| 16533 | 393  | 
| [thy] => extend_thy thy  | 
| 
61262
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
394  | 
| thy :: thys => Library.foldl merge_thys (thy, thys));  | 
| 67623 | 395  | 
      val Theory_Id ({ids, ...}, _) = theory_id thy0;
 | 
| 
29093
 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 
wenzelm 
parents: 
29069 
diff
changeset
 | 
396  | 
|
| 60947 | 397  | 
val history = make_history name 0;  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
398  | 
val ancestry = make_ancestry parents ancestors;  | 
| 
68193
 
14dd78f036ba
more thorough checks for theory name consistency (for extend, not just merge);
 
wenzelm 
parents: 
68192 
diff
changeset
 | 
399  | 
in create_thy ids history ancestry (data_of thy0) |> tap finish_thy end;  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
400  | 
|
| 
61044
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
401  | 
end;  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
402  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
403  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
404  | 
(* theory data *)  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
405  | 
|
| 33033 | 406  | 
structure Theory_Data =  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
407  | 
struct  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
408  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
409  | 
val declare = declare_theory_data;  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
410  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
411  | 
fun get k dest thy =  | 
| 
34253
 
5930c6391126
removed further remains of mutable theory data (cf. 25bd3ed2ac9f);
 
wenzelm 
parents: 
34245 
diff
changeset
 | 
412  | 
(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
 | 
413  | 
SOME x => x  | 
| 
34253
 
5930c6391126
removed further remains of mutable theory data (cf. 25bd3ed2ac9f);
 
wenzelm 
parents: 
34245 
diff
changeset
 | 
414  | 
| NONE => invoke_empty k) |> dest;  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
415  | 
|
| 
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
 | 
416  | 
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
 | 
417  | 
|
| 67621 | 418  | 
fun obj_size k thy =  | 
419  | 
Datatab.lookup (data_of thy) k |> Option.map ML_Heap.obj_size;  | 
|
420  | 
||
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
421  | 
end;  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
422  | 
|
| 67621 | 423  | 
fun theory_data_size thy =  | 
424  | 
(data_of thy, []) |-> Datatab.fold_rev (fn (k, _) =>  | 
|
425  | 
(case Theory_Data.obj_size k thy of  | 
|
426  | 
NONE => I  | 
|
427  | 
| SOME n => (cons (invoke_pos k, n))));  | 
|
428  | 
||
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
429  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
430  | 
|
| 16533 | 431  | 
(*** proof context ***)  | 
432  | 
||
| 
33031
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
433  | 
(* datatype Proof.context *)  | 
| 
17060
 
cca2f3938443
type proof: theory_ref instead of theory (make proof contexts independent entities);
 
wenzelm 
parents: 
16894 
diff
changeset
 | 
434  | 
|
| 
33031
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
435  | 
structure Proof =  | 
| 
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
436  | 
struct  | 
| 52788 | 437  | 
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
 | 
438  | 
end;  | 
| 
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
439  | 
|
| 16533 | 440  | 
|
441  | 
(* proof data kinds *)  | 
|
442  | 
||
443  | 
local  | 
|
444  | 
||
| 
51368
 
2ea5c7c2d825
tuned signature -- prefer terminology of Scala and Axiom;
 
wenzelm 
parents: 
50431 
diff
changeset
 | 
445  | 
val kinds = Synchronized.var "Proof_Data" (Datatab.empty: (theory -> Any.T) Datatab.table);  | 
| 16533 | 446  | 
|
| 59163 | 447  | 
fun init_data thy =  | 
448  | 
Synchronized.value kinds |> Datatab.map (fn _ => fn init => init thy);  | 
|
| 16533 | 449  | 
|
| 59163 | 450  | 
fun init_new_data thy =  | 
451  | 
Synchronized.value kinds |> Datatab.fold (fn (k, init) => fn data =>  | 
|
452  | 
if Datatab.defined data k then data  | 
|
453  | 
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
 | 
454  | 
|
| 59163 | 455  | 
fun init_fallback k thy =  | 
456  | 
(case Datatab.lookup (Synchronized.value kinds) k of  | 
|
457  | 
SOME init => init thy  | 
|
458  | 
| NONE => raise Fail "Invalid proof data identifier");  | 
|
| 16533 | 459  | 
|
460  | 
in  | 
|
461  | 
||
| 52788 | 462  | 
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
 | 
463  | 
let  | 
| 52682 | 464  | 
val _ = subthy (thy, thy') orelse error "Cannot transfer proof context: not a super theory";  | 
| 59163 | 465  | 
val data' = init_new_data thy' data;  | 
| 52788 | 466  | 
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
 | 
467  | 
|
| 42360 | 468  | 
structure Proof_Context =  | 
| 
33031
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
469  | 
struct  | 
| 59163 | 470  | 
fun theory_of (Proof.Context (_, thy)) = thy;  | 
| 52788 | 471  | 
fun init_global thy = Proof.Context (init_data thy, thy);  | 
| 68482 | 472  | 
  fun get_global thy name = init_global (get_theory {long = false} thy name);
 | 
| 
33031
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
473  | 
end;  | 
| 16533 | 474  | 
|
| 33033 | 475  | 
structure Proof_Data =  | 
| 16533 | 476  | 
struct  | 
477  | 
||
| 
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
 | 
478  | 
fun declare init =  | 
| 16533 | 479  | 
let  | 
480  | 
val k = serial ();  | 
|
| 43684 | 481  | 
val _ = Synchronized.change kinds (Datatab.update (k, init));  | 
| 16533 | 482  | 
in k end;  | 
483  | 
||
| 59163 | 484  | 
fun get k dest (Proof.Context (data, thy)) =  | 
485  | 
(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
 | 
486  | 
SOME x => x  | 
| 59163 | 487  | 
| NONE => init_fallback k thy) |> dest;  | 
| 16533 | 488  | 
|
| 59163 | 489  | 
fun put k mk x (Proof.Context (data, thy)) =  | 
490  | 
Proof.Context (Datatab.update (k, mk x) data, thy);  | 
|
| 16533 | 491  | 
|
492  | 
end;  | 
|
493  | 
||
494  | 
end;  | 
|
495  | 
||
496  | 
||
| 18632 | 497  | 
|
| 
61044
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
498  | 
(*** theory certificate ***)  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
499  | 
|
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
500  | 
datatype certificate = Certificate of theory | Certificate_Id of theory_id;  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
501  | 
|
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
502  | 
fun certificate_theory (Certificate thy) = thy  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
503  | 
| certificate_theory (Certificate_Id thy_id) =  | 
| 61062 | 504  | 
      error ("No content for theory certificate " ^ display_name thy_id);
 | 
| 
61044
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
505  | 
|
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
506  | 
fun certificate_theory_id (Certificate thy) = theory_id thy  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
507  | 
| certificate_theory_id (Certificate_Id thy_id) = thy_id;  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
508  | 
|
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
509  | 
fun eq_certificate (Certificate thy1, Certificate thy2) = eq_thy (thy1, thy2)  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
510  | 
| eq_certificate (Certificate_Id thy_id1, Certificate_Id thy_id2) = eq_thy_id (thy_id1, thy_id2)  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
511  | 
| eq_certificate _ = false;  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
512  | 
|
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
513  | 
fun join_certificate (cert1, cert2) =  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
514  | 
let val (thy_id1, thy_id2) = apply2 certificate_theory_id (cert1, cert2) in  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
515  | 
if eq_thy_id (thy_id1, thy_id2) then (case cert1 of Certificate _ => cert1 | _ => cert2)  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
516  | 
else if proper_subthy_id (thy_id2, thy_id1) then cert1  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
517  | 
else if proper_subthy_id (thy_id1, thy_id2) then cert2  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
518  | 
else  | 
| 
61045
 
c7a7f063704a
clarified exceptions: avoid interference of formal context failure with regular rule application failure (which is routinely handled in user-space);
 
wenzelm 
parents: 
61044 
diff
changeset
 | 
519  | 
      error ("Cannot join unrelated theory certificates " ^
 | 
| 61062 | 520  | 
display_name thy_id1 ^ " and " ^ display_name thy_id2)  | 
| 
61044
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
521  | 
end;  | 
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
522  | 
|
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
523  | 
|
| 
 
b7af255dd200
more abstract theory certificate, which is not necessarily the full theory;
 
wenzelm 
parents: 
60948 
diff
changeset
 | 
524  | 
|
| 16533 | 525  | 
(*** generic context ***)  | 
526  | 
||
| 
33031
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
527  | 
datatype generic = Theory of theory | Proof of Proof.context;  | 
| 18632 | 528  | 
|
529  | 
fun cases f _ (Theory thy) = f thy  | 
|
530  | 
| cases _ g (Proof prf) = g prf;  | 
|
| 16533 | 531  | 
|
| 19678 | 532  | 
fun mapping f g = cases (Theory o f) (Proof o g);  | 
| 21660 | 533  | 
fun mapping_result f g = cases (apsnd Theory o f) (apsnd Proof o g);  | 
| 19678 | 534  | 
|
| 
23595
 
7ca68a2c8575
the_theory/proof: error instead of exception Fail;
 
wenzelm 
parents: 
23355 
diff
changeset
 | 
535  | 
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
 | 
536  | 
val the_proof = cases (fn _ => error "Ill-typed context: proof expected") I;  | 
| 16533 | 537  | 
|
| 18731 | 538  | 
fun map_theory f = Theory o f o the_theory;  | 
539  | 
fun map_proof f = Proof o f o the_proof;  | 
|
540  | 
||
| 26486 | 541  | 
fun map_theory_result f = apsnd Theory o f o the_theory;  | 
542  | 
fun map_proof_result f = apsnd Proof o f o the_proof;  | 
|
543  | 
||
| 18731 | 544  | 
fun theory_map f = the_theory o f o Theory;  | 
545  | 
fun proof_map f = the_proof o f o Proof;  | 
|
| 18665 | 546  | 
|
| 42360 | 547  | 
val theory_of = cases I Proof_Context.theory_of;  | 
548  | 
val proof_of = cases Proof_Context.init_global I;  | 
|
| 16533 | 549  | 
|
| 
22085
 
c138cfd500f7
ML context: full generic context, tuned signature;
 
wenzelm 
parents: 
21962 
diff
changeset
 | 
550  | 
|
| 
 
c138cfd500f7
ML context: full generic context, tuned signature;
 
wenzelm 
parents: 
21962 
diff
changeset
 | 
551  | 
|
| 
26413
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
552  | 
(** thread data **)  | 
| 
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
553  | 
|
| 62889 | 554  | 
local val generic_context_var = Thread_Data.var () : generic Thread_Data.var in  | 
| 
26413
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
555  | 
|
| 62889 | 556  | 
fun get_generic_context () = Thread_Data.get generic_context_var;  | 
557  | 
val put_generic_context = Thread_Data.put generic_context_var;  | 
|
558  | 
fun setmp_generic_context opt_context = Thread_Data.setmp generic_context_var opt_context;  | 
|
| 62876 | 559  | 
|
560  | 
fun the_generic_context () =  | 
|
| 62889 | 561  | 
(case get_generic_context () of  | 
| 
26413
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
562  | 
SOME context => context  | 
| 
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
563  | 
| _ => error "Unknown context");  | 
| 
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
564  | 
|
| 62876 | 565  | 
val the_global_context = theory_of o the_generic_context;  | 
566  | 
val the_local_context = proof_of o the_generic_context;  | 
|
| 
26413
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
567  | 
|
| 26428 | 568  | 
end;  | 
569  | 
||
570  | 
fun >>> f =  | 
|
571  | 
let  | 
|
| 62876 | 572  | 
val (res, context') = f (the_generic_context ());  | 
| 62889 | 573  | 
val _ = put_generic_context (SOME context');  | 
| 26428 | 574  | 
in res end;  | 
575  | 
||
| 26421 | 576  | 
nonfix >>;  | 
| 26463 | 577  | 
fun >> f = >>> (fn context => ((), f context));  | 
| 
26413
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
578  | 
|
| 62889 | 579  | 
val _ = put_generic_context (SOME (Theory pre_pure_thy));  | 
| 
26413
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
580  | 
|
| 6185 | 581  | 
end;  | 
582  | 
||
| 
33031
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
583  | 
structure Basic_Context: BASIC_CONTEXT = Context;  | 
| 
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
584  | 
open Basic_Context;  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
585  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
586  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
587  | 
|
| 16533 | 588  | 
(*** type-safe interfaces for data declarations ***)  | 
589  | 
||
590  | 
(** theory data **)  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
591  | 
|
| 
61262
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
592  | 
signature THEORY_DATA'_ARGS =  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
593  | 
sig  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
594  | 
type T  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
595  | 
val empty: T  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
596  | 
val extend: T -> T  | 
| 
61262
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
597  | 
val merge: theory * theory -> T * T -> T  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
598  | 
end;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
599  | 
|
| 
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
 | 
600  | 
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
 | 
601  | 
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
 | 
602  | 
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
 | 
603  | 
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
 | 
604  | 
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
 | 
605  | 
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
 | 
606  | 
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
 | 
607  | 
|
| 
34253
 
5930c6391126
removed further remains of mutable theory data (cf. 25bd3ed2ac9f);
 
wenzelm 
parents: 
34245 
diff
changeset
 | 
608  | 
signature THEORY_DATA =  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
609  | 
sig  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
610  | 
type T  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
611  | 
val get: theory -> T  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
612  | 
val put: T -> theory -> theory  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
613  | 
val map: (T -> T) -> theory -> theory  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
614  | 
end;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
615  | 
|
| 
61262
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
616  | 
functor Theory_Data'(Data: THEORY_DATA'_ARGS): THEORY_DATA =  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
617  | 
struct  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
618  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
619  | 
type T = Data.T;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
620  | 
exception Data of T;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
621  | 
|
| 
42818
 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 
wenzelm 
parents: 
42383 
diff
changeset
 | 
622  | 
val kind =  | 
| 
 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 
wenzelm 
parents: 
42383 
diff
changeset
 | 
623  | 
Context.Theory_Data.declare  | 
| 
 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 
wenzelm 
parents: 
42383 
diff
changeset
 | 
624  | 
(Position.thread_data ())  | 
| 
 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 
wenzelm 
parents: 
42383 
diff
changeset
 | 
625  | 
(Data Data.empty)  | 
| 
 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 
wenzelm 
parents: 
42383 
diff
changeset
 | 
626  | 
(fn Data x => Data (Data.extend x))  | 
| 
61262
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
627  | 
(fn thys => fn (Data x1, Data x2) => Data (Data.merge thys (x1, x2)));  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
628  | 
|
| 33033 | 629  | 
val get = Context.Theory_Data.get kind (fn Data x => x);  | 
630  | 
val put = Context.Theory_Data.put kind Data;  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
631  | 
fun map f thy = put (f (get thy)) thy;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
632  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
633  | 
end;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
634  | 
|
| 
33517
 
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
 
wenzelm 
parents: 
33033 
diff
changeset
 | 
635  | 
functor Theory_Data(Data: THEORY_DATA_ARGS): THEORY_DATA =  | 
| 
61262
 
7bd1eb4b056e
tuned signature: eliminated pointless type Context.pretty;
 
wenzelm 
parents: 
61062 
diff
changeset
 | 
636  | 
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
 | 
637  | 
(  | 
| 
 
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
 | 
638  | 
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
 | 
639  | 
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
 | 
640  | 
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
 | 
641  | 
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
 | 
642  | 
);  | 
| 
33517
 
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
 
wenzelm 
parents: 
33033 
diff
changeset
 | 
643  | 
|
| 16533 | 644  | 
|
645  | 
||
646  | 
(** proof data **)  | 
|
647  | 
||
648  | 
signature PROOF_DATA_ARGS =  | 
|
649  | 
sig  | 
|
650  | 
type T  | 
|
651  | 
val init: theory -> T  | 
|
652  | 
end;  | 
|
653  | 
||
654  | 
signature PROOF_DATA =  | 
|
655  | 
sig  | 
|
656  | 
type T  | 
|
| 
33031
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
657  | 
val get: Proof.context -> T  | 
| 
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
658  | 
val put: T -> Proof.context -> Proof.context  | 
| 
 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 
wenzelm 
parents: 
32784 
diff
changeset
 | 
659  | 
val map: (T -> T) -> Proof.context -> Proof.context  | 
| 16533 | 660  | 
end;  | 
661  | 
||
| 
33517
 
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
 
wenzelm 
parents: 
33033 
diff
changeset
 | 
662  | 
functor Proof_Data(Data: PROOF_DATA_ARGS): PROOF_DATA =  | 
| 16533 | 663  | 
struct  | 
664  | 
||
665  | 
type T = Data.T;  | 
|
666  | 
exception Data of T;  | 
|
667  | 
||
| 33033 | 668  | 
val kind = Context.Proof_Data.declare (Data o Data.init);  | 
| 16533 | 669  | 
|
| 33033 | 670  | 
val get = Context.Proof_Data.get kind (fn Data x => x);  | 
671  | 
val put = Context.Proof_Data.put kind Data;  | 
|
| 16533 | 672  | 
fun map f prf = put (f (get prf)) prf;  | 
673  | 
||
674  | 
end;  | 
|
675  | 
||
| 18632 | 676  | 
|
677  | 
||
678  | 
(** generic data **)  | 
|
679  | 
||
680  | 
signature GENERIC_DATA_ARGS =  | 
|
681  | 
sig  | 
|
682  | 
type T  | 
|
683  | 
val empty: T  | 
|
684  | 
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
 | 
685  | 
val merge: T * T -> T  | 
| 18632 | 686  | 
end;  | 
687  | 
||
688  | 
signature GENERIC_DATA =  | 
|
689  | 
sig  | 
|
690  | 
type T  | 
|
691  | 
val get: Context.generic -> T  | 
|
692  | 
val put: T -> Context.generic -> Context.generic  | 
|
693  | 
val map: (T -> T) -> Context.generic -> Context.generic  | 
|
694  | 
end;  | 
|
695  | 
||
| 
33517
 
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
 
wenzelm 
parents: 
33033 
diff
changeset
 | 
696  | 
functor Generic_Data(Data: GENERIC_DATA_ARGS): GENERIC_DATA =  | 
| 18632 | 697  | 
struct  | 
698  | 
||
| 
33517
 
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
 
wenzelm 
parents: 
33033 
diff
changeset
 | 
699  | 
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
 | 
700  | 
structure Prf_Data = Proof_Data(type T = Data.T val init = Thy_Data.get);  | 
| 18632 | 701  | 
|
702  | 
type T = Data.T;  | 
|
703  | 
||
| 33033 | 704  | 
fun get (Context.Theory thy) = Thy_Data.get thy  | 
705  | 
| get (Context.Proof prf) = Prf_Data.get prf;  | 
|
| 18632 | 706  | 
|
| 33033 | 707  | 
fun put x (Context.Theory thy) = Context.Theory (Thy_Data.put x thy)  | 
708  | 
| put x (Context.Proof prf) = Context.Proof (Prf_Data.put x prf);  | 
|
| 18632 | 709  | 
|
710  | 
fun map f ctxt = put (f (get ctxt)) ctxt;  | 
|
711  | 
||
712  | 
end;  | 
|
713  | 
||
| 16533 | 714  | 
(*hide private interface*)  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
715  | 
structure Context: CONTEXT = Context;  |