author  wenzelm 
Thu, 30 Jun 2011 16:50:26 +0200  
changeset 43610  16482dc641d4 
parent 42818  128cc195ced3 
child 43684  85388f5570c4 
permissions  rwrr 
6185  1 
(* Title: Pure/context.ML 
2 
Author: Markus Wenzel, TU Muenchen 

3 

16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

4 
Generic theory contexts with unique identity, arbitrarily typed data, 
24141
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

5 
monotonic development graph and history support. Generic proof 
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

6 
contexts with arbitrarily typed data. 
33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

7 

b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

8 
Firm naming conventions: 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

9 
thy, thy', thy1, thy2: theory 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

10 
ctxt, ctxt', ctxt1, ctxt2: Proof.context 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

11 
context: Context.generic 
6185  12 
*) 
13 

14 
signature BASIC_CONTEXT = 

15 
sig 

16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

16 
type theory 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

17 
type theory_ref 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

18 
exception THEORY of string * theory list 
33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
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:
32784
diff
changeset

21 
sig 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
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:
34259
diff
changeset

23 
val init_global: theory > Proof.context 
33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

24 
end 
6185  25 
end; 
26 

27 
signature CONTEXT = 

28 
sig 

29 
include BASIC_CONTEXT 

16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

30 
(*theory context*) 
42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

31 
val timing: bool Unsynchronized.ref 
42383
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

32 
type pretty 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

33 
val parents_of: theory > theory list 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

34 
val ancestors_of: theory > theory list 
29069
c7ba485581ae
unified ids for ancestors and checkpoints, removed obsolete history of checkpoints;
wenzelm
parents:
29001
diff
changeset

35 
val theory_name: theory > string 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
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:
29069
diff
changeset

39 
val PureN: string 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

40 
val display_names: theory > string list 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

41 
val pretty_thy: theory > Pretty.T 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

42 
val string_of_thy: theory > string 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

43 
val pretty_abbrev_thy: theory > Pretty.T 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

44 
val str_of_thy: theory > string 
37867
b9783e9e96e1
added Context.get_theory  avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset

45 
val get_theory: theory > string > theory 
37871
c7ce7685e087
replaced Thy_Info.the_theory by Context.this_theory  avoid referring to accidental theory loader state;
wenzelm
parents:
37867
diff
changeset

46 
val this_theory: theory > string > theory 
24141
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

47 
val deref: theory_ref > theory 
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

48 
val check_thy: theory > theory_ref 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

49 
val eq_thy: theory * theory > bool 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
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:
22847
diff
changeset

52 
val merge: theory * theory > theory 
d2c033fd4514
merge/merge_refs: plain error instead of exception TERM;
wenzelm
parents:
22847
diff
changeset

53 
val merge_refs: theory_ref * theory_ref > theory_ref 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

54 
val copy_thy: theory > theory 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

55 
val checkpoint_thy: theory > theory 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

56 
val finish_thy: theory > theory 
42383
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
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:
32784
diff
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:
32784
diff
changeset

61 
datatype generic = Theory of theory  Proof of Proof.context 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

62 
val cases: (theory > 'a) > (Proof.context > 'a) > generic > 'a 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

63 
val mapping: (theory > theory) > (Proof.context > Proof.context) > generic > generic 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

64 
val mapping_result: (theory > 'a * theory) > (Proof.context > 'a * Proof.context) > 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

65 
generic > 'a * generic 
18632  66 
val the_theory: generic > theory 
33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
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:
32784
diff
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:
32784
diff
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:
32784
diff
changeset

73 
val proof_map: (generic > generic) > Proof.context > Proof.context 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

74 
val theory_of: generic > theory (*total*) 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
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:
42360
diff
changeset

76 
(*pretty printing context*) 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

77 
val pretty: Proof.context > pretty 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

78 
val pretty_global: theory > pretty 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

79 
val pretty_context: (theory > Proof.context) > pretty > Proof.context 
26413
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

80 
(*thread data*) 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

81 
val thread_data: unit > generic option 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

82 
val the_thread_data: unit > generic 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

83 
val set_thread_data: generic option > unit 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

84 
val setmp_thread_data: generic option > ('a > 'b) > 'a > 'b 
26463  85 
val >> : (generic > generic) > unit 
86 
val >>> : (generic > 'a * generic) > 'a 

6185  87 
end; 
88 

16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

89 
signature PRIVATE_CONTEXT = 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

90 
sig 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

91 
include CONTEXT 
33033  92 
structure Theory_Data: 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

93 
sig 
42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

94 
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:
42360
diff
changeset

95 
(pretty > Object.T * Object.T > Object.T) > serial 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

96 
val get: serial > (Object.T > 'a) > theory > 'a 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

97 
val put: serial > ('a > Object.T) > 'a > theory > theory 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

98 
end 
33033  99 
structure Proof_Data: 
16533  100 
sig 
22847
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
wenzelm
parents:
22827
diff
changeset

101 
val declare: (theory > Object.T) > serial 
33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

102 
val get: serial > (Object.T > 'a) > Proof.context > 'a 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

103 
val put: serial > ('a > Object.T) > 'a > Proof.context > Proof.context 
16533  104 
end 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

105 
end; 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

106 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

107 
structure Context: PRIVATE_CONTEXT = 
6185  108 
struct 
109 

16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

110 
(*** theory context ***) 
6185  111 

16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

112 
(** theory data **) 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

113 

f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

114 
(* data kinds and access methods *) 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

115 

42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

116 
val timing = Unsynchronized.ref false; 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

117 

19028
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
wenzelm
parents:
18931
diff
changeset

118 
(*private copy avoids potential conflict of table exceptions*) 
31971
8c1b845ed105
renamed functor TableFun to Table, and GraphFun to Graph;
wenzelm
parents:
30628
diff
changeset

119 
structure Datatab = Table(type key = int val ord = int_ord); 
19028
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
wenzelm
parents:
18931
diff
changeset

120 

42383
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

121 
datatype pretty = Pretty of Object.T; 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

122 

16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

123 
local 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

124 

f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

125 
type kind = 
42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

126 
{pos: Position.T, 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

127 
empty: Object.T, 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

128 
extend: Object.T > Object.T, 
42383
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

129 
merge: pretty > Object.T * Object.T > Object.T}; 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

130 

32738  131 
val kinds = Unsynchronized.ref (Datatab.empty: kind Datatab.table); 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

132 

42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

133 
fun invoke name f k x = 
19028
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
wenzelm
parents:
18931
diff
changeset

134 
(case Datatab.lookup (! kinds) k of 
42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

135 
SOME kind => 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

136 
if ! timing andalso name <> "" then 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

137 
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:
42383
diff
changeset

138 
(fn () => f kind x) 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

139 
else f kind x 
37852
a902f158b4fc
eliminated oldstyle sys_error/SYS_ERROR in favour of exception Fail  after careful checking that there is no overlap with existing handling of that;
wenzelm
parents:
37216
diff
changeset

140 
 NONE => raise Fail "Invalid theory data identifier"); 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

141 

f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

142 
in 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

143 

42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

144 
fun invoke_empty k = invoke "" (K o #empty) k (); 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

145 
val invoke_extend = invoke "extend" #extend; 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

146 
fun invoke_merge pp = invoke "merge" (fn kind => #merge kind pp); 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

147 

42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

148 
fun declare_theory_data pos empty extend merge = 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

149 
let 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

150 
val k = serial (); 
42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

151 
val kind = {pos = pos, empty = empty, extend = extend, merge = merge}; 
32738  152 
val _ = CRITICAL (fn () => Unsynchronized.change kinds (Datatab.update (k, kind))); 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

153 
in k end; 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

154 

39020  155 
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:
42818
diff
changeset

156 
fun merge_data pp = Datatab.join (invoke_merge pp) o pairself extend_data; 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

157 

f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

158 
end; 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

159 

f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

160 

f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

161 

f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

162 
(** datatype theory **) 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

163 

16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

164 
datatype theory = 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

165 
Theory of 
16533  166 
(*identity*) 
32738  167 
{self: theory Unsynchronized.ref option, (*dynamic self reference  follows theory changes*) 
29095  168 
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:
29069
diff
changeset

169 
id: serial, (*identifier*) 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

170 
ids: unit Inttab.table} * (*cumulative identifiers of nondrafts  symbolic body content*) 
29095  171 
(*data*) 
172 
Object.T Datatab.table * (*body content*) 

173 
(*ancestry*) 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

174 
{parents: theory list, (*immediate predecessors*) 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

175 
ancestors: theory list} * (*all predecessors  canonical reverse order*) 
29095  176 
(*history*) 
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

177 
{name: string, (*official theory name*) 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

178 
stage: int}; (*checkpoint counter*) 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

179 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

180 
exception THEORY of string * theory list; 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

181 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

182 
fun rep_theory (Theory args) = args; 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

183 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

184 
val identity_of = #1 o rep_theory; 
33033  185 
val data_of = #2 o rep_theory; 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

186 
val ancestry_of = #3 o rep_theory; 
33033  187 
val history_of = #4 o rep_theory; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

188 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

189 
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:
16436
diff
changeset

190 
fun make_ancestry parents ancestors = {parents = parents, ancestors = ancestors}; 
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

191 
fun make_history name stage = {name = name, stage = stage}; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

192 

16533  193 
val the_self = the o #self o identity_of; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

194 
val parents_of = #parents o ancestry_of; 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

195 
val ancestors_of = #ancestors o ancestry_of; 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

196 
val theory_name = #name o history_of; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

197 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

198 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

199 
(* staleness *) 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

200 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

201 
fun eq_id (i: int, j) = i = j; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

202 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

203 
fun is_stale 
32738  204 
(Theory ({self = 
205 
SOME (Unsynchronized.ref (Theory ({id = id', ...}, _, _, _))), id, ...}, _, _, _)) = 

16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

206 
not (eq_id (id, id')) 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

207 
 is_stale (Theory ({self = NONE, ...}, _, _, _)) = true; 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

208 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

209 
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:
29069
diff
changeset

210 
 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:
15801
diff
changeset

211 
let 
32738  212 
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:
29069
diff
changeset

213 
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:
15801
diff
changeset

214 
in r := thy'; thy' end; 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

215 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

216 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

217 
(* draft mode *) 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

218 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

219 
val is_draft = #draft o identity_of; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

220 

28317  221 
fun reject_draft thy = 
33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

222 
if is_draft thy then 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

223 
raise THEORY ("Illegal draft theory  stable checkpoint required", [thy]) 
28317  224 
else thy; 
225 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

226 

1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

227 
(* names *) 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

228 

1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

229 
val PureN = "Pure"; 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

230 
val draftN = "#"; 
29095  231 
val finished = ~1; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

232 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

233 
fun display_names thy = 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

234 
let 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

235 
val draft = if is_draft thy then [draftN] else []; 
29095  236 
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:
29069
diff
changeset

237 
val name = 
29095  238 
if stage = finished then theory_name thy 
239 
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:
29069
diff
changeset

240 
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:
29069
diff
changeset

241 
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:
29069
diff
changeset

242 
in rev (stale @ draft @ [name] @ ancestor_names) end; 
29069
c7ba485581ae
unified ids for ancestors and checkpoints, removed obsolete history of checkpoints;
wenzelm
parents:
29001
diff
changeset

243 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

244 
val pretty_thy = Pretty.str_list "{" "}" o display_names; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

245 
val string_of_thy = Pretty.string_of o pretty_thy; 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

246 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

247 
fun pretty_abbrev_thy thy = 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

248 
let 
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

249 
val names = display_names thy; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

250 
val n = length names; 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

251 
val abbrev = if n > 5 then "..." :: List.drop (names, n  5) else names; 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

252 
in Pretty.str_list "{" "}" abbrev end; 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

253 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

254 
val str_of_thy = Pretty.str_of o pretty_abbrev_thy; 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

255 

37867
b9783e9e96e1
added Context.get_theory  avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset

256 
fun get_theory thy name = 
b9783e9e96e1
added Context.get_theory  avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset

257 
if theory_name thy <> name then 
b9783e9e96e1
added Context.get_theory  avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset

258 
(case find_first (fn thy' => theory_name thy' = name) (ancestors_of thy) of 
b9783e9e96e1
added Context.get_theory  avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset

259 
SOME thy' => thy' 
b9783e9e96e1
added Context.get_theory  avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset

260 
 NONE => error ("Unknown ancestor theory " ^ quote name)) 
b9783e9e96e1
added Context.get_theory  avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset

261 
else if #stage (history_of thy) = finished then thy 
b9783e9e96e1
added Context.get_theory  avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset

262 
else error ("Unfinished theory " ^ quote name); 
b9783e9e96e1
added Context.get_theory  avoid referring to accidental theory loader state (cf. Thy_Info.get_theory);
wenzelm
parents:
37852
diff
changeset

263 

37871
c7ce7685e087
replaced Thy_Info.the_theory by Context.this_theory  avoid referring to accidental theory loader state;
wenzelm
parents:
37867
diff
changeset

264 
fun this_theory thy name = 
c7ce7685e087
replaced Thy_Info.the_theory by Context.this_theory  avoid referring to accidental theory loader state;
wenzelm
parents:
37867
diff
changeset

265 
if theory_name thy = name then thy 
c7ce7685e087
replaced Thy_Info.the_theory by Context.this_theory  avoid referring to accidental theory loader state;
wenzelm
parents:
37867
diff
changeset

266 
else get_theory thy name; 
c7ce7685e087
replaced Thy_Info.the_theory by Context.this_theory  avoid referring to accidental theory loader state;
wenzelm
parents:
37867
diff
changeset

267 

16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

268 

24141
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

269 
(* theory references *) 
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

270 

73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

271 
(*theory_ref provides a safe way to store dynamic references to a 
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

272 
theory in external data structures  a plain theory value would 
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

273 
become stale as the self reference moves on*) 
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

274 

33033  275 
datatype theory_ref = Theory_Ref of theory Unsynchronized.ref; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

276 

33033  277 
fun deref (Theory_Ref (Unsynchronized.ref thy)) = thy; 
24141
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

278 

73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

279 
fun check_thy thy = (*threadsafe version*) 
33033  280 
let val thy_ref = Theory_Ref (the_self thy) in 
24141
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

281 
if is_stale thy then error ("Stale theory encountered:\n" ^ string_of_thy thy) 
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

282 
else thy_ref 
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

283 
end; 
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

284 

73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

285 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

286 
(* build ids *) 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

287 

1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

288 
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:
29069
diff
changeset

289 
if draft then ids 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

290 
else Inttab.update (id, ()) ids; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

291 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

292 
fun merge_ids 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

293 
(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:
29069
diff
changeset

294 
(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:
29069
diff
changeset

295 
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:
29069
diff
changeset

296 
> insert_id draft1 id1 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

297 
> insert_id draft2 id2; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

298 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

299 

16533  300 
(* equality and inclusion *) 
301 

24141
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

302 
val eq_thy = eq_id o pairself (#id o identity_of); 
16533  303 

29069
c7ba485581ae
unified ids for ancestors and checkpoints, removed obsolete history of checkpoints;
wenzelm
parents:
29001
diff
changeset

304 
fun proper_subthy (Theory ({id, ...}, _, _, _), Theory ({ids, ...}, _, _, _)) = 
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

305 
Inttab.defined ids id; 
16533  306 

307 
fun subthy thys = eq_thy thys orelse proper_subthy thys; 

308 

16594  309 
fun joinable (thy1, thy2) = subthy (thy1, thy2) orelse subthy (thy2, thy1); 
310 

16533  311 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

312 
(* consistent ancestors *) 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

313 

1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

314 
fun extend_ancestors thy thys = 
33033  315 
if member eq_thy thys thy then 
316 
raise THEORY ("Duplicate theory node", thy :: thys) 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

317 
else thy :: thys; 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

318 

1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

319 
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:
29069
diff
changeset

320 

1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

321 
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:
29069
diff
changeset

322 
eq_thy (thy1, thy2) orelse 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

323 
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:
29069
diff
changeset

324 
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:
29069
diff
changeset

325 

1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

326 

23355
d2c033fd4514
merge/merge_refs: plain error instead of exception TERM;
wenzelm
parents:
22847
diff
changeset

327 
(* trivial merge *) 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

328 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

329 
fun merge (thy1, thy2) = 
16719  330 
if eq_thy (thy1, thy2) then thy1 
331 
else if proper_subthy (thy2, thy1) then thy1 

332 
else if proper_subthy (thy1, thy2) then thy2 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

333 
else error (cat_lines ["Attempt to perform nontrivial merge of theories:", 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

334 
str_of_thy thy1, str_of_thy thy2]); 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

335 

16719  336 
fun merge_refs (ref1, ref2) = 
337 
if ref1 = ref2 then ref1 

24141
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

338 
else check_thy (merge (deref ref1, deref ref2)); 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

339 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

340 

16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

341 

f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

342 
(** build theories **) 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

343 

f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

344 
(* primitives *) 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

345 

33606
2b27020ffcb2
local mutex for theory content/identity operations;
wenzelm
parents:
33517
diff
changeset

346 
local 
2b27020ffcb2
local mutex for theory content/identity operations;
wenzelm
parents:
33517
diff
changeset

347 
val lock = Mutex.mutex (); 
2b27020ffcb2
local mutex for theory content/identity operations;
wenzelm
parents:
33517
diff
changeset

348 
in 
37216
3165bc303f66
modernized some structure names, keeping a few legacy aliases;
wenzelm
parents:
36610
diff
changeset

349 
fun SYNCHRONIZED e = Simple_Thread.synchronized "theory" lock e; 
33606
2b27020ffcb2
local mutex for theory content/identity operations;
wenzelm
parents:
33517
diff
changeset

350 
end; 
2b27020ffcb2
local mutex for theory content/identity operations;
wenzelm
parents:
33517
diff
changeset

351 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

352 
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:
29069
diff
changeset

353 
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:
29069
diff
changeset

354 
in vitalize (Theory (identity, data, ancestry, history)) end; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

355 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

356 
fun change_thy draft' f thy = 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

357 
let 
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

358 
val Theory ({self, draft, id, ids}, data, ancestry, history) = thy; 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

359 
val (self', data', ancestry') = 
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

360 
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:
29069
diff
changeset

361 
else if #stage history > 0 
34245  362 
then (NONE, data, ancestry) 
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

363 
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:
29069
diff
changeset

364 
val ids' = insert_id draft id ids; 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

365 
val data'' = f data'; 
33606
2b27020ffcb2
local mutex for theory content/identity operations;
wenzelm
parents:
33517
diff
changeset

366 
val thy' = SYNCHRONIZED (fn () => 
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

367 
(check_thy thy; create_thy self' draft' ids' data'' ancestry' history)); 
24369  368 
in thy' end; 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

369 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

370 
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:
29069
diff
changeset

371 
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:
29069
diff
changeset

372 
val modify_thy = change_thy true; 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

373 

24369  374 
fun copy_thy thy = 
24141
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

375 
let 
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

376 
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:
29069
diff
changeset

377 
val ids' = insert_id draft id ids; 
33606
2b27020ffcb2
local mutex for theory content/identity operations;
wenzelm
parents:
33517
diff
changeset

378 
val thy' = SYNCHRONIZED (fn () => 
34245  379 
(check_thy thy; create_thy NONE true ids' data ancestry history)); 
24369  380 
in thy' end; 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

381 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

382 
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:
29001
diff
changeset

383 
Datatab.empty (make_ancestry [] []) (make_history PureN 0); 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

384 

f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

385 

f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

386 
(* named theory nodes *) 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

387 

f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

388 
fun merge_thys pp (thy1, thy2) = 
26957  389 
let 
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

390 
val ids = merge_ids thy1 thy2; 
26957  391 
val data = merge_data (pp thy1) (data_of thy1, data_of thy2); 
392 
val ancestry = make_ancestry [] []; 

29069
c7ba485581ae
unified ids for ancestors and checkpoints, removed obsolete history of checkpoints;
wenzelm
parents:
29001
diff
changeset

393 
val history = make_history "" 0; 
33606
2b27020ffcb2
local mutex for theory content/identity operations;
wenzelm
parents:
33517
diff
changeset

394 
val thy' = SYNCHRONIZED (fn () => 
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

395 
(check_thy thy1; check_thy thy2; create_thy NONE true ids data ancestry history)); 
26957  396 
in thy' end; 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

397 

16533  398 
fun maximal_thys thys = 
28617  399 
thys > filter_out (fn thy => exists (fn thy' => proper_subthy (thy, thy')) thys); 
16533  400 

16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

401 
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:
29069
diff
changeset

402 
if name = "" orelse name = draftN then error ("Bad theory name: " ^ quote name) 
24369  403 
else 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

404 
let 
24141
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

405 
val parents = maximal_thys (distinct eq_thy imports); 
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

406 
val ancestors = 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

407 
Library.foldl merge_ancestors ([], map ancestors_of parents) 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

408 
> fold extend_ancestors parents; 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

409 

1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

410 
val Theory ({ids, ...}, data, _, _) = 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

411 
(case parents of 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

412 
[] => error "No parent theories" 
16533  413 
 [thy] => extend_thy thy 
414 
 thy :: thys => Library.foldl (merge_thys pp) (thy, thys)); 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

415 

16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

416 
val ancestry = make_ancestry parents ancestors; 
29069
c7ba485581ae
unified ids for ancestors and checkpoints, removed obsolete history of checkpoints;
wenzelm
parents:
29001
diff
changeset

417 
val history = make_history name 0; 
33606
2b27020ffcb2
local mutex for theory content/identity operations;
wenzelm
parents:
33517
diff
changeset

418 
val thy' = SYNCHRONIZED (fn () => 
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

419 
(map check_thy imports; create_thy NONE true ids data ancestry history)); 
24369  420 
in thy' end; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

421 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

422 

29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

423 
(* history stages *) 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

424 

1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

425 
fun history_stage f thy = 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

426 
let 
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

427 
val {name, stage} = history_of thy; 
29095  428 
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:
29069
diff
changeset

429 
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:
29069
diff
changeset

430 
val thy' as Theory (identity', data', ancestry', _) = name_thy thy; 
33606
2b27020ffcb2
local mutex for theory content/identity operations;
wenzelm
parents:
33517
diff
changeset

431 
val thy'' = SYNCHRONIZED (fn () => 
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

432 
(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:
29069
diff
changeset

433 
in thy'' end; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

434 

16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

435 
fun checkpoint_thy thy = 
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

436 
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:
29069
diff
changeset

437 
else thy; 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

438 

29095  439 
val finish_thy = history_stage (fn _ => finished); 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

440 

f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

441 

f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

442 
(* theory data *) 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

443 

33033  444 
structure Theory_Data = 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

445 
struct 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

446 

f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

447 
val declare = declare_theory_data; 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

448 

f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

449 
fun get k dest thy = 
34253
5930c6391126
removed further remains of mutable theory data (cf. 25bd3ed2ac9f);
wenzelm
parents:
34245
diff
changeset

450 
(case Datatab.lookup (data_of thy) k of 
22847
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
wenzelm
parents:
22827
diff
changeset

451 
SOME x => x 
34253
5930c6391126
removed further remains of mutable theory data (cf. 25bd3ed2ac9f);
wenzelm
parents:
34245
diff
changeset

452 
 NONE => invoke_empty k) > dest; 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

453 

22847
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
wenzelm
parents:
22827
diff
changeset

454 
fun put k mk x = modify_thy (Datatab.update (k, mk x)); 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

455 

f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

456 
end; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

457 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

458 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

459 

16533  460 
(*** proof context ***) 
461 

33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

462 
(* datatype Proof.context *) 
17060
cca2f3938443
type proof: theory_ref instead of theory (make proof contexts independent entities);
wenzelm
parents:
16894
diff
changeset

463 

33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

464 
structure Proof = 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

465 
struct 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

466 
datatype context = Context of Object.T Datatab.table * theory_ref; 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

467 
end; 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

468 

b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

469 
fun theory_of_proof (Proof.Context (_, thy_ref)) = deref thy_ref; 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

470 
fun data_of_proof (Proof.Context (data, _)) = data; 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

471 
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:
16894
diff
changeset

472 

16533  473 

474 
(* proof data kinds *) 

475 

476 
local 

477 

32738  478 
val kinds = Unsynchronized.ref (Datatab.empty: (theory > Object.T) Datatab.table); 
16533  479 

22847
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
wenzelm
parents:
22827
diff
changeset

480 
fun invoke_init k = 
19028
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
wenzelm
parents:
18931
diff
changeset

481 
(case Datatab.lookup (! 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:
22827
diff
changeset

482 
SOME init => init 
37852
a902f158b4fc
eliminated oldstyle sys_error/SYS_ERROR in favour of exception Fail  after careful checking that there is no overlap with existing handling of that;
wenzelm
parents:
37216
diff
changeset

483 
 NONE => raise Fail "Invalid proof data identifier"); 
16533  484 

22847
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
wenzelm
parents:
22827
diff
changeset

485 
fun init_data thy = 
39020  486 
Datatab.map (fn k => fn _ => invoke_init k thy) (! kinds); 
22847
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
wenzelm
parents:
22827
diff
changeset

487 

22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
wenzelm
parents:
22827
diff
changeset

488 
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:
22827
diff
changeset

489 
Datatab.merge (K true) (data, init_data thy); 
16533  490 

491 
in 

492 

33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

493 
fun raw_transfer thy' (Proof.Context (data, thy_ref)) = 
24141
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

494 
let 
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

495 
val thy = deref thy_ref; 
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

496 
val _ = subthy (thy, thy') orelse error "transfer proof context: not a super theory"; 
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

497 
val _ = check_thy thy; 
24184
19cb051154fd
threadsafeness: when creating certified items, perform Theory.check_thy *last*;
wenzelm
parents:
24141
diff
changeset

498 
val data' = init_new_data data thy'; 
24141
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

499 
val thy_ref' = check_thy thy'; 
33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

500 
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:
22827
diff
changeset

501 

42360  502 
structure Proof_Context = 
33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

503 
struct 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

504 
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:
34259
diff
changeset

505 
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:
32784
diff
changeset

506 
end; 
16533  507 

33033  508 
structure Proof_Data = 
16533  509 
struct 
510 

22847
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
wenzelm
parents:
22827
diff
changeset

511 
fun declare init = 
16533  512 
let 
513 
val k = serial (); 

32738  514 
val _ = CRITICAL (fn () => Unsynchronized.change kinds (Datatab.update (k, init))); 
16533  515 
in k end; 
516 

517 
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:
22827
diff
changeset

518 
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:
22827
diff
changeset

519 
SOME x => x 
42360  520 
 NONE => invoke_init k (Proof_Context.theory_of prf)); (*adhoc value*) 
16533  521 

19028
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
wenzelm
parents:
18931
diff
changeset

522 
fun put k mk x = map_prf (Datatab.update (k, mk x)); 
16533  523 

524 
end; 

525 

526 
end; 

527 

528 

18632  529 

16533  530 
(*** generic context ***) 
531 

33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

532 
datatype generic = Theory of theory  Proof of Proof.context; 
18632  533 

534 
fun cases f _ (Theory thy) = f thy 

535 
 cases _ g (Proof prf) = g prf; 

16533  536 

19678  537 
fun mapping f g = cases (Theory o f) (Proof o g); 
21660  538 
fun mapping_result f g = cases (apsnd Theory o f) (apsnd Proof o g); 
19678  539 

23595
7ca68a2c8575
the_theory/proof: error instead of exception Fail;
wenzelm
parents:
23355
diff
changeset

540 
val the_theory = cases I (fn _ => error "Illtyped context: theory expected"); 
7ca68a2c8575
the_theory/proof: error instead of exception Fail;
wenzelm
parents:
23355
diff
changeset

541 
val the_proof = cases (fn _ => error "Illtyped context: proof expected") I; 
16533  542 

18731  543 
fun map_theory f = Theory o f o the_theory; 
544 
fun map_proof f = Proof o f o the_proof; 

545 

26486  546 
fun map_theory_result f = apsnd Theory o f o the_theory; 
547 
fun map_proof_result f = apsnd Proof o f o the_proof; 

548 

18731  549 
fun theory_map f = the_theory o f o Theory; 
550 
fun proof_map f = the_proof o f o Proof; 

18665  551 

42360  552 
val theory_of = cases I Proof_Context.theory_of; 
553 
val proof_of = cases Proof_Context.init_global I; 

16533  554 

22085
c138cfd500f7
ML context: full generic context, tuned signature;
wenzelm
parents:
21962
diff
changeset

555 

42383
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

556 
(* pretty printing context *) 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

557 

0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

558 
exception PRETTY of generic; 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

559 

0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

560 
val pretty = Pretty o PRETTY o Proof; 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

561 
val pretty_global = Pretty o PRETTY o Theory; 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

562 

0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

563 
fun pretty_context init (Pretty (PRETTY context)) = cases init I context; 
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

564 

0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

565 

22085
c138cfd500f7
ML context: full generic context, tuned signature;
wenzelm
parents:
21962
diff
changeset

566 

26413
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

567 
(** thread data **) 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

568 

003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

569 
local val tag = Universal.tag () : generic option Universal.tag in 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

570 

003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

571 
fun thread_data () = 
28122  572 
(case Thread.getLocal tag of 
26413
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

573 
SOME (SOME context) => SOME context 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

574 
 _ => NONE); 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

575 

003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

576 
fun the_thread_data () = 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

577 
(case thread_data () of 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

578 
SOME context => context 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

579 
 _ => error "Unknown context"); 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

580 

28122  581 
fun set_thread_data context = Thread.setLocal (tag, context); 
26413
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

582 
fun setmp_thread_data context = Library.setmp_thread_data tag (thread_data ()) context; 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

583 

26428  584 
end; 
585 

586 
fun >>> f = 

587 
let 

26463  588 
val (res, context') = f (the_thread_data ()); 
589 
val _ = set_thread_data (SOME context'); 

26428  590 
in res end; 
591 

26421  592 
nonfix >>; 
26463  593 
fun >> f = >>> (fn context => ((), f context)); 
26413
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

594 

26428  595 
val _ = set_thread_data (SOME (Theory pre_pure_thy)); 
26413
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
wenzelm
parents:
24559
diff
changeset

596 

6185  597 
end; 
598 

33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

599 
structure Basic_Context: BASIC_CONTEXT = Context; 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

600 
open Basic_Context; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

601 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

602 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

603 

16533  604 
(*** typesafe interfaces for data declarations ***) 
605 

606 
(** theory data **) 

16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

607 

34259
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations  hard to get rid of);
wenzelm
parents:
34253
diff
changeset

608 
signature THEORY_DATA_PP_ARGS = 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

609 
sig 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

610 
type T 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

611 
val empty: T 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

612 
val extend: T > T 
42383
0ae4ad40d7b5
simplified pretty printing context, which is only required for certain kernel operations;
wenzelm
parents:
42360
diff
changeset

613 
val merge: Context.pretty > T * T > T 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

614 
end; 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

615 

34259
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations  hard to get rid of);
wenzelm
parents:
34253
diff
changeset

616 
signature THEORY_DATA_ARGS = 
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations  hard to get rid of);
wenzelm
parents:
34253
diff
changeset

617 
sig 
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations  hard to get rid of);
wenzelm
parents:
34253
diff
changeset

618 
type T 
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations  hard to get rid of);
wenzelm
parents:
34253
diff
changeset

619 
val empty: T 
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations  hard to get rid of);
wenzelm
parents:
34253
diff
changeset

620 
val extend: T > T 
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations  hard to get rid of);
wenzelm
parents:
34253
diff
changeset

621 
val merge: T * T > T 
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations  hard to get rid of);
wenzelm
parents:
34253
diff
changeset

622 
end; 
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations  hard to get rid of);
wenzelm
parents:
34253
diff
changeset

623 

34253
5930c6391126
removed further remains of mutable theory data (cf. 25bd3ed2ac9f);
wenzelm
parents:
34245
diff
changeset

624 
signature THEORY_DATA = 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

625 
sig 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

626 
type T 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

627 
val get: theory > T 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

628 
val put: T > theory > theory 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

629 
val map: (T > T) > theory > theory 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

630 
end; 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

631 

34259
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations  hard to get rid of);
wenzelm
parents:
34253
diff
changeset

632 
functor Theory_Data_PP(Data: THEORY_DATA_PP_ARGS): THEORY_DATA = 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

633 
struct 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

634 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

635 
type T = Data.T; 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

636 
exception Data of T; 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

637 

42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

638 
val kind = 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

639 
Context.Theory_Data.declare 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

640 
(Position.thread_data ()) 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

641 
(Data Data.empty) 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

642 
(fn Data x => Data (Data.extend x)) 
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

643 
(fn pp => fn (Data x1, Data x2) => Data (Data.merge pp (x1, x2))); 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

644 

33033  645 
val get = Context.Theory_Data.get kind (fn Data x => x); 
646 
val put = Context.Theory_Data.put kind Data; 

16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

647 
fun map f thy = put (f (get thy)) thy; 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

648 

7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

649 
end; 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

650 

33517
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
wenzelm
parents:
33033
diff
changeset

651 
functor Theory_Data(Data: THEORY_DATA_ARGS): THEORY_DATA = 
34259
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations  hard to get rid of);
wenzelm
parents:
34253
diff
changeset

652 
Theory_Data_PP 
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations  hard to get rid of);
wenzelm
parents:
34253
diff
changeset

653 
( 
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations  hard to get rid of);
wenzelm
parents:
34253
diff
changeset

654 
type T = Data.T; 
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations  hard to get rid of);
wenzelm
parents:
34253
diff
changeset

655 
val empty = Data.empty; 
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations  hard to get rid of);
wenzelm
parents:
34253
diff
changeset

656 
val extend = Data.extend; 
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations  hard to get rid of);
wenzelm
parents:
34253
diff
changeset

657 
fun merge _ = Data.merge; 
2ba492b8b6e8
discontinued old TheoryDataFun, but retain Theory_Data_PP with is Pretty.pp argument to merge (still required in exotic situations  hard to get rid of);
wenzelm
parents:
34253
diff
changeset

658 
); 
33517
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
wenzelm
parents:
33033
diff
changeset

659 

16533  660 

661 

662 
(** proof data **) 

663 

664 
signature PROOF_DATA_ARGS = 

665 
sig 

666 
type T 

667 
val init: theory > T 

668 
end; 

669 

670 
signature PROOF_DATA = 

671 
sig 

672 
type T 

33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

673 
val get: Proof.context > T 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

674 
val put: T > Proof.context > Proof.context 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

675 
val map: (T > T) > Proof.context > Proof.context 
16533  676 
end; 
677 

33517
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
wenzelm
parents:
33033
diff
changeset

678 
functor Proof_Data(Data: PROOF_DATA_ARGS): PROOF_DATA = 
16533  679 
struct 
680 

681 
type T = Data.T; 

682 
exception Data of T; 

683 

33033  684 
val kind = Context.Proof_Data.declare (Data o Data.init); 
16533  685 

33033  686 
val get = Context.Proof_Data.get kind (fn Data x => x); 
687 
val put = Context.Proof_Data.put kind Data; 

16533  688 
fun map f prf = put (f (get prf)) prf; 
689 

690 
end; 

691 

18632  692 

693 

694 
(** generic data **) 

695 

696 
signature GENERIC_DATA_ARGS = 

697 
sig 

698 
type T 

699 
val empty: T 

700 
val extend: T > T 

33517
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
wenzelm
parents:
33033
diff
changeset

701 
val merge: T * T > T 
18632  702 
end; 
703 

704 
signature GENERIC_DATA = 

705 
sig 

706 
type T 

707 
val get: Context.generic > T 

708 
val put: T > Context.generic > Context.generic 

709 
val map: (T > T) > Context.generic > Context.generic 

710 
end; 

711 

33517
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
wenzelm
parents:
33033
diff
changeset

712 
functor Generic_Data(Data: GENERIC_DATA_ARGS): GENERIC_DATA = 
18632  713 
struct 
714 

33517
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
wenzelm
parents:
33033
diff
changeset

715 
structure Thy_Data = Theory_Data(Data); 
d064fa48f305
modernized/simplified functor Theory_Data, Proof_Data, Generic_Data: eliminated Pretty.pp, discontinued mutable data;
wenzelm
parents:
33033
diff
changeset

716 
structure Prf_Data = Proof_Data(type T = Data.T val init = Thy_Data.get); 
18632  717 

718 
type T = Data.T; 

719 

33033  720 
fun get (Context.Theory thy) = Thy_Data.get thy 
721 
 get (Context.Proof prf) = Prf_Data.get prf; 

18632  722 

33033  723 
fun put x (Context.Theory thy) = Context.Theory (Thy_Data.put x thy) 
724 
 put x (Context.Proof prf) = Context.Proof (Prf_Data.put x prf); 

18632  725 

726 
fun map f ctxt = put (f (get ctxt)) ctxt; 

727 

728 
end; 

729 

16533  730 
(*hide private interface*) 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

731 
structure Context: CONTEXT = Context; 
20297  732 