| author | wenzelm | 
| Sun, 20 May 2012 11:34:33 +0200 | |
| changeset 47884 | 21c42b095c84 | 
| parent 47005 | 421760a1efe7 | 
| child 48638 | 22d65e375c01 | 
| 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: 
15801diff
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: 
23944diff
changeset | 5 | monotonic development graph and history support. Generic proof | 
| 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 6 | contexts with arbitrarily typed data. | 
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 7 | |
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 8 | Firm naming conventions: | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 9 | thy, thy', thy1, thy2: theory | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 10 | ctxt, ctxt', ctxt1, ctxt2: Proof.context | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
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: 
15801diff
changeset | 16 | type theory | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 17 | type theory_ref | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 18 | exception THEORY of string * theory list | 
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 19 | structure Proof: sig type context end | 
| 42360 | 20 | structure Proof_Context: | 
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 21 | sig | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 22 | 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: 
34259diff
changeset | 23 | val init_global: theory -> Proof.context | 
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
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: 
15801diff
changeset | 30 | (*theory context*) | 
| 42818 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 31 | val timing: bool Unsynchronized.ref | 
| 42383 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 32 | type pretty | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 33 | val parents_of: theory -> theory list | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 34 | val ancestors_of: theory -> theory list | 
| 29069 
c7ba485581ae
unified ids for ancestors and checkpoints, removed obsolete history of checkpoints;
 wenzelm parents: 
29001diff
changeset | 35 | val theory_name: theory -> string | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 36 | val is_stale: theory -> bool | 
| 26623 | 37 | val is_draft: theory -> bool | 
| 28317 | 38 | val reject_draft: theory -> theory | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 39 | val PureN: string | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 40 | val display_names: theory -> string list | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 41 | val pretty_thy: theory -> Pretty.T | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 42 | val string_of_thy: theory -> string | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 43 | val pretty_abbrev_thy: theory -> Pretty.T | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 44 | val str_of_thy: theory -> string | 
| 37867 
b9783e9e96e1
added Context.get_theory -- avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
 wenzelm parents: 
37852diff
changeset | 45 | val get_theory: theory -> string -> theory | 
| 37871 
c7ce7685e087
replaced Thy_Info.the_theory by Context.this_theory -- avoid referring to accidental theory loader state;
 wenzelm parents: 
37867diff
changeset | 46 | val this_theory: theory -> string -> theory | 
| 24141 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 47 | val deref: theory_ref -> theory | 
| 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 48 | val check_thy: theory -> theory_ref | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 49 | val eq_thy: theory * theory -> bool | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 50 | val subthy: theory * theory -> bool | 
| 16594 | 51 | val joinable: theory * theory -> bool | 
| 23355 
d2c033fd4514
merge/merge_refs: plain error instead of exception TERM;
 wenzelm parents: 
22847diff
changeset | 52 | val merge: theory * theory -> theory | 
| 
d2c033fd4514
merge/merge_refs: plain error instead of exception TERM;
 wenzelm parents: 
22847diff
changeset | 53 | val merge_refs: theory_ref * theory_ref -> theory_ref | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 54 | val copy_thy: theory -> theory | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 55 | val checkpoint_thy: theory -> theory | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 56 | val finish_thy: theory -> theory | 
| 42383 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 57 | val begin_thy: (theory -> pretty) -> string -> theory list -> theory | 
| 16533 | 58 | (*proof context*) | 
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 59 | val raw_transfer: theory -> Proof.context -> Proof.context | 
| 16533 | 60 | (*generic context*) | 
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 61 | datatype generic = Theory of theory | Proof of Proof.context | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 62 | val cases: (theory -> 'a) -> (Proof.context -> 'a) -> generic -> 'a | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 63 | val mapping: (theory -> theory) -> (Proof.context -> Proof.context) -> generic -> generic | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 64 | val mapping_result: (theory -> 'a * theory) -> (Proof.context -> 'a * Proof.context) -> | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 65 | generic -> 'a * generic | 
| 18632 | 66 | val the_theory: generic -> theory | 
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 67 | val the_proof: generic -> Proof.context | 
| 18731 | 68 | val map_theory: (theory -> theory) -> generic -> generic | 
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 69 | val map_proof: (Proof.context -> Proof.context) -> generic -> generic | 
| 26486 | 70 | val map_theory_result: (theory -> 'a * theory) -> generic -> 'a * generic | 
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 71 | val map_proof_result: (Proof.context -> 'a * Proof.context) -> generic -> 'a * generic | 
| 18731 | 72 | val theory_map: (generic -> generic) -> theory -> theory | 
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 73 | val proof_map: (generic -> generic) -> Proof.context -> Proof.context | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 74 | val theory_of: generic -> theory (*total*) | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 75 | val proof_of: generic -> Proof.context (*total*) | 
| 42383 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 76 | (*pretty printing context*) | 
| 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 77 | val pretty: Proof.context -> pretty | 
| 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 78 | val pretty_global: theory -> pretty | 
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
43684diff
changeset | 79 | val pretty_generic: generic -> pretty | 
| 42383 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 80 | val pretty_context: (theory -> Proof.context) -> pretty -> Proof.context | 
| 26413 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 81 | (*thread data*) | 
| 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 82 | val thread_data: unit -> generic option | 
| 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 83 | val the_thread_data: unit -> generic | 
| 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 84 | val set_thread_data: generic option -> unit | 
| 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 85 |   val setmp_thread_data: generic option -> ('a -> 'b) -> 'a -> 'b
 | 
| 26463 | 86 | val >> : (generic -> generic) -> unit | 
| 87 | val >>> : (generic -> 'a * generic) -> 'a | |
| 6185 | 88 | end; | 
| 89 | ||
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 90 | signature PRIVATE_CONTEXT = | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 91 | sig | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 92 | include CONTEXT | 
| 33033 | 93 | structure Theory_Data: | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 94 | sig | 
| 42818 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 95 | val declare: Position.T -> Object.T -> (Object.T -> Object.T) -> | 
| 42383 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 96 | (pretty -> Object.T * Object.T -> Object.T) -> serial | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 97 | val get: serial -> (Object.T -> 'a) -> theory -> 'a | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 98 |     val put: serial -> ('a -> Object.T) -> 'a -> theory -> theory
 | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 99 | end | 
| 33033 | 100 | structure Proof_Data: | 
| 16533 | 101 | sig | 
| 22847 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 wenzelm parents: 
22827diff
changeset | 102 | val declare: (theory -> Object.T) -> serial | 
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 103 | val get: serial -> (Object.T -> 'a) -> Proof.context -> 'a | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 104 |     val put: serial -> ('a -> Object.T) -> 'a -> Proof.context -> Proof.context
 | 
| 16533 | 105 | end | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 106 | end; | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 107 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 108 | structure Context: PRIVATE_CONTEXT = | 
| 6185 | 109 | struct | 
| 110 | ||
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 111 | (*** theory context ***) | 
| 6185 | 112 | |
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 113 | (** theory data **) | 
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 114 | |
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 115 | (* data kinds and access methods *) | 
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 116 | |
| 42818 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 117 | val timing = Unsynchronized.ref false; | 
| 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 118 | |
| 19028 
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
 wenzelm parents: 
18931diff
changeset | 119 | (*private copy avoids potential conflict of table exceptions*) | 
| 31971 
8c1b845ed105
renamed functor TableFun to Table, and GraphFun to Graph;
 wenzelm parents: 
30628diff
changeset | 120 | structure Datatab = Table(type key = int val ord = int_ord); | 
| 19028 
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
 wenzelm parents: 
18931diff
changeset | 121 | |
| 42383 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 122 | datatype pretty = Pretty of Object.T; | 
| 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 123 | |
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 124 | local | 
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 125 | |
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 126 | type kind = | 
| 42818 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 127 |  {pos: Position.T,
 | 
| 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 128 | empty: Object.T, | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 129 | extend: Object.T -> Object.T, | 
| 42383 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 130 | merge: pretty -> Object.T * Object.T -> Object.T}; | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 131 | |
| 43684 | 132 | val kinds = Synchronized.var "Theory_Data" (Datatab.empty: kind Datatab.table); | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 133 | |
| 42818 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 134 | fun invoke name f k x = | 
| 43684 | 135 | (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: 
42383diff
changeset | 136 | SOME kind => | 
| 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 137 | if ! timing andalso name <> "" then | 
| 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 138 |         Timing.cond_timeit true ("Theory_Data." ^ name ^ Position.str_of (#pos kind))
 | 
| 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 139 | (fn () => f kind x) | 
| 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 140 | 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: 
37216diff
changeset | 141 | | NONE => raise Fail "Invalid theory data identifier"); | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 142 | |
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 143 | in | 
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 144 | |
| 42818 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 145 | 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: 
42383diff
changeset | 146 | val invoke_extend = invoke "extend" #extend; | 
| 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 147 | fun invoke_merge pp = invoke "merge" (fn kind => #merge kind pp); | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 148 | |
| 42818 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 149 | fun declare_theory_data pos empty extend merge = | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 150 | let | 
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 151 | val k = serial (); | 
| 42818 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 152 |     val kind = {pos = pos, empty = empty, extend = extend, merge = merge};
 | 
| 43684 | 153 | val _ = Synchronized.change kinds (Datatab.update (k, kind)); | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 154 | in k end; | 
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 155 | |
| 39020 | 156 | val extend_data = Datatab.map invoke_extend; | 
| 43610 
16482dc641d4
back to sequential merge_data, reverting 741373421318 (NB: expensive Parser.merge_gram is already asynchronous since 3daff3cc2214);
 wenzelm parents: 
42818diff
changeset | 157 | fun merge_data pp = Datatab.join (invoke_merge pp) o pairself extend_data; | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 158 | |
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 159 | end; | 
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 160 | |
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 161 | |
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 162 | |
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 163 | (** datatype theory **) | 
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 164 | |
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 165 | datatype theory = | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 166 | Theory of | 
| 16533 | 167 | (*identity*) | 
| 32738 | 168 |    {self: theory Unsynchronized.ref option,  (*dynamic self reference -- follows theory changes*)
 | 
| 29095 | 169 | draft: bool, (*draft mode -- linear destructive changes*) | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 170 | id: serial, (*identifier*) | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 171 | ids: unit Inttab.table} * (*cumulative identifiers of non-drafts -- symbolic body content*) | 
| 29095 | 172 | (*data*) | 
| 173 | Object.T Datatab.table * (*body content*) | |
| 174 | (*ancestry*) | |
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 175 |    {parents: theory list,         (*immediate predecessors*)
 | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 176 | ancestors: theory list} * (*all predecessors -- canonical reverse order*) | 
| 29095 | 177 | (*history*) | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 178 |    {name: string,                 (*official theory name*)
 | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 179 | stage: int}; (*checkpoint counter*) | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 180 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 181 | exception THEORY of string * theory list; | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 182 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 183 | fun rep_theory (Theory args) = args; | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 184 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 185 | val identity_of = #1 o rep_theory; | 
| 33033 | 186 | val data_of = #2 o rep_theory; | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 187 | val ancestry_of = #3 o rep_theory; | 
| 33033 | 188 | val history_of = #4 o rep_theory; | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 189 | |
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 190 | fun make_identity self draft id ids = {self = self, draft = draft, id = id, ids = ids};
 | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 191 | 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: 
29069diff
changeset | 192 | fun make_history name stage = {name = name, stage = stage};
 | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 193 | |
| 16533 | 194 | val the_self = the o #self o identity_of; | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 195 | val parents_of = #parents o ancestry_of; | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 196 | val ancestors_of = #ancestors o ancestry_of; | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 197 | val theory_name = #name o history_of; | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 198 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 199 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 200 | (* staleness *) | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 201 | |
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 202 | fun eq_id (i: int, j) = i = j; | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 203 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 204 | fun is_stale | 
| 32738 | 205 |     (Theory ({self =
 | 
| 206 |         SOME (Unsynchronized.ref (Theory ({id = id', ...}, _, _, _))), id, ...}, _, _, _)) =
 | |
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 207 | not (eq_id (id, id')) | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 208 |   | is_stale (Theory ({self = NONE, ...}, _, _, _)) = true;
 | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 209 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 210 | fun vitalize (thy as Theory ({self = SOME r, ...}, _, _, _)) = (r := thy; thy)
 | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 211 |   | vitalize (thy as Theory ({self = NONE, draft, id, ids}, data, ancestry, history)) =
 | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 212 | let | 
| 32738 | 213 | val r = Unsynchronized.ref thy; | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 214 | val thy' = Theory (make_identity (SOME r) draft id ids, data, ancestry, history); | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 215 | in r := thy'; thy' end; | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 216 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 217 | |
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 218 | (* draft mode *) | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 219 | |
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 220 | val is_draft = #draft o identity_of; | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 221 | |
| 28317 | 222 | fun reject_draft thy = | 
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 223 | if is_draft thy then | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 224 |     raise THEORY ("Illegal draft theory -- stable checkpoint required", [thy])
 | 
| 28317 | 225 | else thy; | 
| 226 | ||
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 227 | |
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 228 | (* names *) | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 229 | |
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 230 | val PureN = "Pure"; | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 231 | val draftN = "#"; | 
| 29095 | 232 | val finished = ~1; | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 233 | |
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 234 | fun display_names thy = | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 235 | let | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 236 | val draft = if is_draft thy then [draftN] else []; | 
| 29095 | 237 |     val {stage, ...} = history_of thy;
 | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 238 | val name = | 
| 29095 | 239 | if stage = finished then theory_name thy | 
| 240 | else theory_name thy ^ ":" ^ string_of_int stage; | |
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 241 | val ancestor_names = map theory_name (ancestors_of thy); | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 242 | val stale = if is_stale thy then ["!"] else []; | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 243 | in rev (stale @ draft @ [name] @ ancestor_names) end; | 
| 29069 
c7ba485581ae
unified ids for ancestors and checkpoints, removed obsolete history of checkpoints;
 wenzelm parents: 
29001diff
changeset | 244 | |
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 245 | val pretty_thy = Pretty.str_list "{" "}" o display_names;
 | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 246 | val string_of_thy = Pretty.string_of o pretty_thy; | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 247 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 248 | fun pretty_abbrev_thy thy = | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 249 | let | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 250 | val names = display_names thy; | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 251 | val n = length names; | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 252 | 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: 
15801diff
changeset | 253 |   in Pretty.str_list "{" "}" abbrev end;
 | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 254 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 255 | val str_of_thy = Pretty.str_of o pretty_abbrev_thy; | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 256 | |
| 37867 
b9783e9e96e1
added Context.get_theory -- avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
 wenzelm parents: 
37852diff
changeset | 257 | fun get_theory thy name = | 
| 
b9783e9e96e1
added Context.get_theory -- avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
 wenzelm parents: 
37852diff
changeset | 258 | 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: 
37852diff
changeset | 259 | (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: 
37852diff
changeset | 260 | SOME thy' => thy' | 
| 
b9783e9e96e1
added Context.get_theory -- avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
 wenzelm parents: 
37852diff
changeset | 261 |     | 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: 
37852diff
changeset | 262 | 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: 
37852diff
changeset | 263 |   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: 
37852diff
changeset | 264 | |
| 37871 
c7ce7685e087
replaced Thy_Info.the_theory by Context.this_theory -- avoid referring to accidental theory loader state;
 wenzelm parents: 
37867diff
changeset | 265 | fun this_theory thy name = | 
| 
c7ce7685e087
replaced Thy_Info.the_theory by Context.this_theory -- avoid referring to accidental theory loader state;
 wenzelm parents: 
37867diff
changeset | 266 | 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: 
37867diff
changeset | 267 | else get_theory thy name; | 
| 
c7ce7685e087
replaced Thy_Info.the_theory by Context.this_theory -- avoid referring to accidental theory loader state;
 wenzelm parents: 
37867diff
changeset | 268 | |
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 269 | |
| 24141 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 270 | (* theory references *) | 
| 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 271 | |
| 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 272 | (*theory_ref provides a safe way to store dynamic references to a | 
| 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 273 | theory in external data structures -- a plain theory value would | 
| 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 274 | become stale as the self reference moves on*) | 
| 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 275 | |
| 33033 | 276 | datatype theory_ref = Theory_Ref of theory Unsynchronized.ref; | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 277 | |
| 33033 | 278 | fun deref (Theory_Ref (Unsynchronized.ref thy)) = thy; | 
| 24141 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 279 | |
| 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 280 | fun check_thy thy = (*thread-safe version*) | 
| 33033 | 281 | let val thy_ref = Theory_Ref (the_self thy) in | 
| 24141 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 282 |     if is_stale thy then error ("Stale theory encountered:\n" ^ string_of_thy thy)
 | 
| 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 283 | else thy_ref | 
| 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 284 | end; | 
| 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 285 | |
| 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 286 | |
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 287 | (* build ids *) | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 288 | |
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 289 | fun insert_id draft id ids = | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 290 | if draft then ids | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 291 | else Inttab.update (id, ()) ids; | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 292 | |
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 293 | fun merge_ids | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 294 |     (Theory ({draft = draft1, id = id1, ids = ids1, ...}, _, _, _))
 | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 295 |     (Theory ({draft = draft2, id = id2, ids = ids2, ...}, _, _, _)) =
 | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 296 | Inttab.merge (K true) (ids1, ids2) | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 297 | |> insert_id draft1 id1 | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 298 | |> insert_id draft2 id2; | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 299 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 300 | |
| 16533 | 301 | (* equality and inclusion *) | 
| 302 | ||
| 24141 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 303 | val eq_thy = eq_id o pairself (#id o identity_of); | 
| 16533 | 304 | |
| 29069 
c7ba485581ae
unified ids for ancestors and checkpoints, removed obsolete history of checkpoints;
 wenzelm parents: 
29001diff
changeset | 305 | 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: 
29069diff
changeset | 306 | Inttab.defined ids id; | 
| 16533 | 307 | |
| 308 | fun subthy thys = eq_thy thys orelse proper_subthy thys; | |
| 309 | ||
| 16594 | 310 | fun joinable (thy1, thy2) = subthy (thy1, thy2) orelse subthy (thy2, thy1); | 
| 311 | ||
| 16533 | 312 | |
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 313 | (* consistent ancestors *) | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 314 | |
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 315 | fun extend_ancestors thy thys = | 
| 33033 | 316 | if member eq_thy thys thy then | 
| 317 |     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: 
29069diff
changeset | 318 | else thy :: thys; | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 319 | |
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 320 | fun extend_ancestors_of thy = extend_ancestors thy (ancestors_of thy); | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 321 | |
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 322 | val merge_ancestors = merge (fn (thy1, thy2) => | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 323 | eq_thy (thy1, thy2) orelse | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 324 | theory_name thy1 = theory_name thy2 andalso | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 325 |       raise THEORY ("Inconsistent theory versions", [thy1, thy2]));
 | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 326 | |
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 327 | |
| 23355 
d2c033fd4514
merge/merge_refs: plain error instead of exception TERM;
 wenzelm parents: 
22847diff
changeset | 328 | (* trivial merge *) | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 329 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 330 | fun merge (thy1, thy2) = | 
| 16719 | 331 | if eq_thy (thy1, thy2) then thy1 | 
| 332 | else if proper_subthy (thy2, thy1) then thy1 | |
| 333 | 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: 
29069diff
changeset | 334 | 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: 
29069diff
changeset | 335 | str_of_thy thy1, str_of_thy thy2]); | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 336 | |
| 16719 | 337 | fun merge_refs (ref1, ref2) = | 
| 338 | if ref1 = ref2 then ref1 | |
| 24141 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 339 | else check_thy (merge (deref ref1, deref ref2)); | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 340 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 341 | |
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 342 | |
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 343 | (** build theories **) | 
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 344 | |
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 345 | (* primitives *) | 
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 346 | |
| 33606 
2b27020ffcb2
local mutex for theory content/identity operations;
 wenzelm parents: 
33517diff
changeset | 347 | local | 
| 
2b27020ffcb2
local mutex for theory content/identity operations;
 wenzelm parents: 
33517diff
changeset | 348 | val lock = Mutex.mutex (); | 
| 
2b27020ffcb2
local mutex for theory content/identity operations;
 wenzelm parents: 
33517diff
changeset | 349 | in | 
| 37216 
3165bc303f66
modernized some structure names, keeping a few legacy aliases;
 wenzelm parents: 
36610diff
changeset | 350 | fun SYNCHRONIZED e = Simple_Thread.synchronized "theory" lock e; | 
| 33606 
2b27020ffcb2
local mutex for theory content/identity operations;
 wenzelm parents: 
33517diff
changeset | 351 | end; | 
| 
2b27020ffcb2
local mutex for theory content/identity operations;
 wenzelm parents: 
33517diff
changeset | 352 | |
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 353 | fun create_thy self draft ids data ancestry history = | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 354 | let val identity = make_identity self draft (serial ()) ids; | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 355 | in vitalize (Theory (identity, data, ancestry, history)) end; | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 356 | |
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 357 | fun change_thy draft' f thy = | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 358 | let | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 359 |     val Theory ({self, draft, id, ids}, data, ancestry, history) = thy;
 | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 360 | val (self', data', ancestry') = | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 361 | if draft then (self, data, ancestry) (*destructive change!*) | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 362 | else if #stage history > 0 | 
| 34245 | 363 | then (NONE, data, ancestry) | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 364 | else (NONE, extend_data data, make_ancestry [thy] (extend_ancestors_of thy)); | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 365 | val ids' = insert_id draft id ids; | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 366 | val data'' = f data'; | 
| 33606 
2b27020ffcb2
local mutex for theory content/identity operations;
 wenzelm parents: 
33517diff
changeset | 367 | val thy' = SYNCHRONIZED (fn () => | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 368 | (check_thy thy; create_thy self' draft' ids' data'' ancestry' history)); | 
| 24369 | 369 | in thy' end; | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 370 | |
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 371 | val name_thy = change_thy false I; | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 372 | val extend_thy = change_thy true I; | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 373 | val modify_thy = change_thy true; | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 374 | |
| 24369 | 375 | fun copy_thy thy = | 
| 24141 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 376 | let | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 377 |     val Theory ({draft, id, ids, ...}, data, ancestry, history) = thy;
 | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 378 | val ids' = insert_id draft id ids; | 
| 33606 
2b27020ffcb2
local mutex for theory content/identity operations;
 wenzelm parents: 
33517diff
changeset | 379 | val thy' = SYNCHRONIZED (fn () => | 
| 34245 | 380 | (check_thy thy; create_thy NONE true ids' data ancestry history)); | 
| 24369 | 381 | in thy' end; | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 382 | |
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 383 | val pre_pure_thy = create_thy NONE true Inttab.empty | 
| 29069 
c7ba485581ae
unified ids for ancestors and checkpoints, removed obsolete history of checkpoints;
 wenzelm parents: 
29001diff
changeset | 384 | Datatab.empty (make_ancestry [] []) (make_history PureN 0); | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 385 | |
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 386 | |
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 387 | (* named theory nodes *) | 
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 388 | |
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 389 | fun merge_thys pp (thy1, thy2) = | 
| 26957 | 390 | let | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 391 | val ids = merge_ids thy1 thy2; | 
| 26957 | 392 | val data = merge_data (pp thy1) (data_of thy1, data_of thy2); | 
| 393 | val ancestry = make_ancestry [] []; | |
| 29069 
c7ba485581ae
unified ids for ancestors and checkpoints, removed obsolete history of checkpoints;
 wenzelm parents: 
29001diff
changeset | 394 | val history = make_history "" 0; | 
| 33606 
2b27020ffcb2
local mutex for theory content/identity operations;
 wenzelm parents: 
33517diff
changeset | 395 | val thy' = SYNCHRONIZED (fn () => | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 396 | (check_thy thy1; check_thy thy2; create_thy NONE true ids data ancestry history)); | 
| 26957 | 397 | in thy' end; | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 398 | |
| 16533 | 399 | fun maximal_thys thys = | 
| 28617 | 400 | thys |> filter_out (fn thy => exists (fn thy' => proper_subthy (thy, thy')) thys); | 
| 16533 | 401 | |
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 402 | fun begin_thy pp name imports = | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 403 |   if name = "" orelse name = draftN then error ("Bad theory name: " ^ quote name)
 | 
| 24369 | 404 | else | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 405 | let | 
| 24141 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 406 | 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: 
29069diff
changeset | 407 | val ancestors = | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 408 | 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: 
29069diff
changeset | 409 | |> fold extend_ancestors parents; | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 410 | |
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 411 |       val Theory ({ids, ...}, data, _, _) =
 | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 412 | (case parents of | 
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 413 | [] => error "No parent theories" | 
| 16533 | 414 | | [thy] => extend_thy thy | 
| 415 | | 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: 
29069diff
changeset | 416 | |
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 417 | val ancestry = make_ancestry parents ancestors; | 
| 29069 
c7ba485581ae
unified ids for ancestors and checkpoints, removed obsolete history of checkpoints;
 wenzelm parents: 
29001diff
changeset | 418 | val history = make_history name 0; | 
| 33606 
2b27020ffcb2
local mutex for theory content/identity operations;
 wenzelm parents: 
33517diff
changeset | 419 | val thy' = SYNCHRONIZED (fn () => | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 420 | (map check_thy imports; create_thy NONE true ids data ancestry history)); | 
| 24369 | 421 | in thy' end; | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 422 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 423 | |
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 424 | (* history stages *) | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 425 | |
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 426 | fun history_stage f thy = | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 427 | let | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 428 |     val {name, stage} = history_of thy;
 | 
| 29095 | 429 |     val _ = stage = finished andalso raise THEORY ("Theory already finished", [thy]);
 | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 430 | val history' = make_history name (f stage); | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 431 | val thy' as Theory (identity', data', ancestry', _) = name_thy thy; | 
| 33606 
2b27020ffcb2
local mutex for theory content/identity operations;
 wenzelm parents: 
33517diff
changeset | 432 | val thy'' = SYNCHRONIZED (fn () => | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 433 | (check_thy thy'; vitalize (Theory (identity', data', ancestry', history')))); | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 434 | in thy'' end; | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 435 | |
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 436 | fun checkpoint_thy thy = | 
| 29093 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 437 | if is_draft thy then history_stage (fn stage => stage + 1) thy | 
| 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
 wenzelm parents: 
29069diff
changeset | 438 | else thy; | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 439 | |
| 29095 | 440 | val finish_thy = history_stage (fn _ => finished); | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 441 | |
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 442 | |
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 443 | (* theory data *) | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 444 | |
| 33033 | 445 | structure Theory_Data = | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 446 | struct | 
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 447 | |
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 448 | val declare = declare_theory_data; | 
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 449 | |
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 450 | fun get k dest thy = | 
| 34253 
5930c6391126
removed further remains of mutable theory data (cf. 25bd3ed2ac9f);
 wenzelm parents: 
34245diff
changeset | 451 | (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: 
22827diff
changeset | 452 | SOME x => x | 
| 34253 
5930c6391126
removed further remains of mutable theory data (cf. 25bd3ed2ac9f);
 wenzelm parents: 
34245diff
changeset | 453 | | NONE => invoke_empty k) |> dest; | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 454 | |
| 22847 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 wenzelm parents: 
22827diff
changeset | 455 | fun put k mk x = modify_thy (Datatab.update (k, mk x)); | 
| 16489 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 456 | |
| 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 wenzelm parents: 
16436diff
changeset | 457 | end; | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 458 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 459 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 460 | |
| 16533 | 461 | (*** proof context ***) | 
| 462 | ||
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 463 | (* datatype Proof.context *) | 
| 17060 
cca2f3938443
type proof: theory_ref instead of theory (make proof contexts independent entities);
 wenzelm parents: 
16894diff
changeset | 464 | |
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 465 | structure Proof = | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 466 | struct | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 467 | datatype context = Context of Object.T Datatab.table * theory_ref; | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 468 | end; | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 469 | |
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 470 | fun theory_of_proof (Proof.Context (_, thy_ref)) = deref thy_ref; | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 471 | fun data_of_proof (Proof.Context (data, _)) = data; | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 472 | fun map_prf f (Proof.Context (data, thy_ref)) = Proof.Context (f data, thy_ref); | 
| 17060 
cca2f3938443
type proof: theory_ref instead of theory (make proof contexts independent entities);
 wenzelm parents: 
16894diff
changeset | 473 | |
| 16533 | 474 | |
| 475 | (* proof data kinds *) | |
| 476 | ||
| 477 | local | |
| 478 | ||
| 43684 | 479 | val kinds = Synchronized.var "Proof_Data" (Datatab.empty: (theory -> Object.T) Datatab.table); | 
| 16533 | 480 | |
| 22847 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 wenzelm parents: 
22827diff
changeset | 481 | fun invoke_init k = | 
| 43684 | 482 | (case Datatab.lookup (Synchronized.value kinds) k of | 
| 22847 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 wenzelm parents: 
22827diff
changeset | 483 | SOME init => init | 
| 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: 
37216diff
changeset | 484 | | NONE => raise Fail "Invalid proof data identifier"); | 
| 16533 | 485 | |
| 22847 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 wenzelm parents: 
22827diff
changeset | 486 | fun init_data thy = | 
| 43684 | 487 | Datatab.map (fn k => fn _ => invoke_init k thy) (Synchronized.value kinds); | 
| 22847 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 wenzelm parents: 
22827diff
changeset | 488 | |
| 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 wenzelm parents: 
22827diff
changeset | 489 | fun init_new_data data thy = | 
| 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 wenzelm parents: 
22827diff
changeset | 490 | Datatab.merge (K true) (data, init_data thy); | 
| 16533 | 491 | |
| 492 | in | |
| 493 | ||
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 494 | fun raw_transfer thy' (Proof.Context (data, thy_ref)) = | 
| 24141 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 495 | let | 
| 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 496 | val thy = deref thy_ref; | 
| 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 497 | val _ = subthy (thy, thy') orelse error "transfer proof context: not a super theory"; | 
| 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 498 | val _ = check_thy thy; | 
| 24184 
19cb051154fd
thread-safeness: when creating certified items, perform Theory.check_thy *last*;
 wenzelm parents: 
24141diff
changeset | 499 | val data' = init_new_data data thy'; | 
| 24141 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 wenzelm parents: 
23944diff
changeset | 500 | val thy_ref' = check_thy thy'; | 
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 501 | in Proof.Context (data', thy_ref') end; | 
| 22847 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 wenzelm parents: 
22827diff
changeset | 502 | |
| 42360 | 503 | structure Proof_Context = | 
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 504 | struct | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 505 | val theory_of = theory_of_proof; | 
| 36610 
bafd82950e24
renamed ProofContext.init to ProofContext.init_global to emphasize that this is not the real thing;
 wenzelm parents: 
34259diff
changeset | 506 | fun init_global thy = Proof.Context (init_data thy, check_thy thy); | 
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 507 | end; | 
| 16533 | 508 | |
| 33033 | 509 | structure Proof_Data = | 
| 16533 | 510 | struct | 
| 511 | ||
| 22847 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 wenzelm parents: 
22827diff
changeset | 512 | fun declare init = | 
| 16533 | 513 | let | 
| 514 | val k = serial (); | |
| 43684 | 515 | val _ = Synchronized.change kinds (Datatab.update (k, init)); | 
| 16533 | 516 | in k end; | 
| 517 | ||
| 518 | fun get k dest prf = | |
| 22847 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 wenzelm parents: 
22827diff
changeset | 519 | dest (case Datatab.lookup (data_of_proof prf) k of | 
| 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 wenzelm parents: 
22827diff
changeset | 520 | SOME x => x | 
| 42360 | 521 | | NONE => invoke_init k (Proof_Context.theory_of prf)); (*adhoc value*) | 
| 16533 | 522 | |
| 19028 
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
 wenzelm parents: 
18931diff
changeset | 523 | fun put k mk x = map_prf (Datatab.update (k, mk x)); | 
| 16533 | 524 | |
| 525 | end; | |
| 526 | ||
| 527 | end; | |
| 528 | ||
| 529 | ||
| 18632 | 530 | |
| 16533 | 531 | (*** generic context ***) | 
| 532 | ||
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 533 | datatype generic = Theory of theory | Proof of Proof.context; | 
| 18632 | 534 | |
| 535 | fun cases f _ (Theory thy) = f thy | |
| 536 | | cases _ g (Proof prf) = g prf; | |
| 16533 | 537 | |
| 19678 | 538 | fun mapping f g = cases (Theory o f) (Proof o g); | 
| 21660 | 539 | fun mapping_result f g = cases (apsnd Theory o f) (apsnd Proof o g); | 
| 19678 | 540 | |
| 23595 
7ca68a2c8575
the_theory/proof: error instead of exception Fail;
 wenzelm parents: 
23355diff
changeset | 541 | val the_theory = cases I (fn _ => error "Ill-typed context: theory expected"); | 
| 
7ca68a2c8575
the_theory/proof: error instead of exception Fail;
 wenzelm parents: 
23355diff
changeset | 542 | val the_proof = cases (fn _ => error "Ill-typed context: proof expected") I; | 
| 16533 | 543 | |
| 18731 | 544 | fun map_theory f = Theory o f o the_theory; | 
| 545 | fun map_proof f = Proof o f o the_proof; | |
| 546 | ||
| 26486 | 547 | fun map_theory_result f = apsnd Theory o f o the_theory; | 
| 548 | fun map_proof_result f = apsnd Proof o f o the_proof; | |
| 549 | ||
| 18731 | 550 | fun theory_map f = the_theory o f o Theory; | 
| 551 | fun proof_map f = the_proof o f o Proof; | |
| 18665 | 552 | |
| 42360 | 553 | val theory_of = cases I Proof_Context.theory_of; | 
| 554 | val proof_of = cases Proof_Context.init_global I; | |
| 16533 | 555 | |
| 22085 
c138cfd500f7
ML context: full generic context, tuned signature;
 wenzelm parents: 
21962diff
changeset | 556 | |
| 42383 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 557 | (* pretty printing context *) | 
| 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 558 | |
| 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 559 | exception PRETTY of generic; | 
| 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 560 | |
| 47005 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
43684diff
changeset | 561 | val pretty_generic = Pretty o PRETTY; | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
43684diff
changeset | 562 | val pretty = pretty_generic o Proof; | 
| 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
 wenzelm parents: 
43684diff
changeset | 563 | val pretty_global = pretty_generic o Theory; | 
| 42383 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 564 | |
| 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 565 | 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: 
42360diff
changeset | 566 | |
| 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 567 | |
| 22085 
c138cfd500f7
ML context: full generic context, tuned signature;
 wenzelm parents: 
21962diff
changeset | 568 | |
| 26413 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 569 | (** thread data **) | 
| 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 570 | |
| 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 571 | local val tag = Universal.tag () : generic option Universal.tag in | 
| 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 572 | |
| 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 573 | fun thread_data () = | 
| 28122 | 574 | (case Thread.getLocal tag of | 
| 26413 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 575 | SOME (SOME context) => SOME context | 
| 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 576 | | _ => NONE); | 
| 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 577 | |
| 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 578 | fun the_thread_data () = | 
| 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 579 | (case thread_data () of | 
| 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 580 | SOME context => context | 
| 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 581 | | _ => error "Unknown context"); | 
| 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 582 | |
| 28122 | 583 | fun set_thread_data context = Thread.setLocal (tag, context); | 
| 26413 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 584 | 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: 
24559diff
changeset | 585 | |
| 26428 | 586 | end; | 
| 587 | ||
| 588 | fun >>> f = | |
| 589 | let | |
| 26463 | 590 | val (res, context') = f (the_thread_data ()); | 
| 591 | val _ = set_thread_data (SOME context'); | |
| 26428 | 592 | in res end; | 
| 593 | ||
| 26421 | 594 | nonfix >>; | 
| 26463 | 595 | fun >> f = >>> (fn context => ((), f context)); | 
| 26413 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 596 | |
| 26428 | 597 | val _ = set_thread_data (SOME (Theory pre_pure_thy)); | 
| 26413 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 wenzelm parents: 
24559diff
changeset | 598 | |
| 6185 | 599 | end; | 
| 600 | ||
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 601 | structure Basic_Context: BASIC_CONTEXT = Context; | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 602 | open Basic_Context; | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 603 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 604 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 605 | |
| 16533 | 606 | (*** type-safe interfaces for data declarations ***) | 
| 607 | ||
| 608 | (** theory data **) | |
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 609 | |
| 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: 
34253diff
changeset | 610 | signature THEORY_DATA_PP_ARGS = | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 611 | sig | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 612 | type T | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 613 | val empty: T | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 614 | val extend: T -> T | 
| 42383 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
 wenzelm parents: 
42360diff
changeset | 615 | val merge: Context.pretty -> T * T -> T | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 616 | end; | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 617 | |
| 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: 
34253diff
changeset | 618 | 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: 
34253diff
changeset | 619 | 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: 
34253diff
changeset | 620 | 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: 
34253diff
changeset | 621 | 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: 
34253diff
changeset | 622 | 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: 
34253diff
changeset | 623 | 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: 
34253diff
changeset | 624 | 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: 
34253diff
changeset | 625 | |
| 34253 
5930c6391126
removed further remains of mutable theory data (cf. 25bd3ed2ac9f);
 wenzelm parents: 
34245diff
changeset | 626 | signature THEORY_DATA = | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 627 | sig | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 628 | type T | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 629 | val get: theory -> T | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 630 | val put: T -> theory -> theory | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 631 | val map: (T -> T) -> theory -> theory | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 632 | end; | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 633 | |
| 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: 
34253diff
changeset | 634 | functor Theory_Data_PP(Data: THEORY_DATA_PP_ARGS): THEORY_DATA = | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 635 | struct | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 636 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 637 | type T = Data.T; | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 638 | exception Data of T; | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 639 | |
| 42818 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 640 | val kind = | 
| 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 641 | Context.Theory_Data.declare | 
| 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 642 | (Position.thread_data ()) | 
| 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 643 | (Data Data.empty) | 
| 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 644 | (fn Data x => Data (Data.extend x)) | 
| 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
 wenzelm parents: 
42383diff
changeset | 645 | (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: 
15801diff
changeset | 646 | |
| 33033 | 647 | val get = Context.Theory_Data.get kind (fn Data x => x); | 
| 648 | val put = Context.Theory_Data.put kind Data; | |
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 649 | fun map f thy = put (f (get thy)) thy; | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 650 | |
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 651 | end; | 
| 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 652 | |
| 33517 
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
 wenzelm parents: 
33033diff
changeset | 653 | 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: 
34253diff
changeset | 654 | 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: 
34253diff
changeset | 655 | ( | 
| 
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: 
34253diff
changeset | 656 | 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: 
34253diff
changeset | 657 | 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: 
34253diff
changeset | 658 | 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: 
34253diff
changeset | 659 | 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: 
34253diff
changeset | 660 | ); | 
| 33517 
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
 wenzelm parents: 
33033diff
changeset | 661 | |
| 16533 | 662 | |
| 663 | ||
| 664 | (** proof data **) | |
| 665 | ||
| 666 | signature PROOF_DATA_ARGS = | |
| 667 | sig | |
| 668 | type T | |
| 669 | val init: theory -> T | |
| 670 | end; | |
| 671 | ||
| 672 | signature PROOF_DATA = | |
| 673 | sig | |
| 674 | type T | |
| 33031 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 675 | val get: Proof.context -> T | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 676 | val put: T -> Proof.context -> Proof.context | 
| 
b75c35574e04
backpatching of structure Proof and ProofContext -- avoid odd aliases;
 wenzelm parents: 
32784diff
changeset | 677 | val map: (T -> T) -> Proof.context -> Proof.context | 
| 16533 | 678 | end; | 
| 679 | ||
| 33517 
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
 wenzelm parents: 
33033diff
changeset | 680 | functor Proof_Data(Data: PROOF_DATA_ARGS): PROOF_DATA = | 
| 16533 | 681 | struct | 
| 682 | ||
| 683 | type T = Data.T; | |
| 684 | exception Data of T; | |
| 685 | ||
| 33033 | 686 | val kind = Context.Proof_Data.declare (Data o Data.init); | 
| 16533 | 687 | |
| 33033 | 688 | val get = Context.Proof_Data.get kind (fn Data x => x); | 
| 689 | val put = Context.Proof_Data.put kind Data; | |
| 16533 | 690 | fun map f prf = put (f (get prf)) prf; | 
| 691 | ||
| 692 | end; | |
| 693 | ||
| 18632 | 694 | |
| 695 | ||
| 696 | (** generic data **) | |
| 697 | ||
| 698 | signature GENERIC_DATA_ARGS = | |
| 699 | sig | |
| 700 | type T | |
| 701 | val empty: T | |
| 702 | val extend: T -> T | |
| 33517 
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
 wenzelm parents: 
33033diff
changeset | 703 | val merge: T * T -> T | 
| 18632 | 704 | end; | 
| 705 | ||
| 706 | signature GENERIC_DATA = | |
| 707 | sig | |
| 708 | type T | |
| 709 | val get: Context.generic -> T | |
| 710 | val put: T -> Context.generic -> Context.generic | |
| 711 | val map: (T -> T) -> Context.generic -> Context.generic | |
| 712 | end; | |
| 713 | ||
| 33517 
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
 wenzelm parents: 
33033diff
changeset | 714 | functor Generic_Data(Data: GENERIC_DATA_ARGS): GENERIC_DATA = | 
| 18632 | 715 | struct | 
| 716 | ||
| 33517 
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
 wenzelm parents: 
33033diff
changeset | 717 | structure Thy_Data = Theory_Data(Data); | 
| 
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
 wenzelm parents: 
33033diff
changeset | 718 | structure Prf_Data = Proof_Data(type T = Data.T val init = Thy_Data.get); | 
| 18632 | 719 | |
| 720 | type T = Data.T; | |
| 721 | ||
| 33033 | 722 | fun get (Context.Theory thy) = Thy_Data.get thy | 
| 723 | | get (Context.Proof prf) = Prf_Data.get prf; | |
| 18632 | 724 | |
| 33033 | 725 | fun put x (Context.Theory thy) = Context.Theory (Thy_Data.put x thy) | 
| 726 | | put x (Context.Proof prf) = Context.Proof (Prf_Data.put x prf); | |
| 18632 | 727 | |
| 728 | fun map f ctxt = put (f (get ctxt)) ctxt; | |
| 729 | ||
| 730 | end; | |
| 731 | ||
| 16533 | 732 | (*hide private interface*) | 
| 16436 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 wenzelm parents: 
15801diff
changeset | 733 | structure Context: CONTEXT = Context; | 
| 20297 | 734 |