author  wenzelm 
Thu, 18 Jul 2013 13:12:54 +0200  
changeset 52696  38466f4f3483 
parent 52682  77146b576ac7 
child 52788  da1fdbfebd39 
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 
51686  24 
val get_global: theory > string > Proof.context 
33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

25 
end 
6185  26 
end; 
27 

28 
signature CONTEXT = 

29 
sig 

30 
include BASIC_CONTEXT 

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

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

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

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

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

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

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

37 
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

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

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

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

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

42 
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

43 
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

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

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

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

47 
val eq_thy: theory * theory > bool 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

48 
val subthy: theory * theory > bool 
16594  49 
val joinable: theory * theory > bool 
23355
d2c033fd4514
merge/merge_refs: plain error instead of exception TERM;
wenzelm
parents:
22847
diff
changeset

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

51 
val merge_refs: theory_ref * theory_ref > theory_ref 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

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

53 
val begin_thy: (theory > pretty) > string > theory list > theory 
16533  54 
(*proof context*) 
33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

55 
val raw_transfer: theory > Proof.context > Proof.context 
16533  56 
(*generic context*) 
33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

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

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

59 
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

60 
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

61 
generic > 'a * generic 
18632  62 
val the_theory: generic > theory 
33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

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

65 
val map_proof: (Proof.context > Proof.context) > generic > generic 
26486  66 
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

67 
val map_proof_result: (Proof.context > 'a * Proof.context) > generic > 'a * generic 
18731  68 
val theory_map: (generic > generic) > theory > theory 
33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

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

70 
val theory_of: generic > theory (*total*) 
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

71 
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

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

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

74 
val pretty_global: theory > pretty 
47005
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
wenzelm
parents:
43684
diff
changeset

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

76 
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

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

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

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

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

81 
val setmp_thread_data: generic option > ('a > 'b) > 'a > 'b 
26463  82 
val >> : (generic > generic) > unit 
83 
val >>> : (generic > 'a * generic) > 'a 

6185  84 
end; 
85 

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

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

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

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

90 
sig 
51368
2ea5c7c2d825
tuned signature  prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset

91 
val declare: Position.T > Any.T > (Any.T > Any.T) > 
2ea5c7c2d825
tuned signature  prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset

92 
(pretty > Any.T * Any.T > Any.T) > serial 
2ea5c7c2d825
tuned signature  prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset

93 
val get: serial > (Any.T > 'a) > theory > 'a 
2ea5c7c2d825
tuned signature  prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset

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

95 
end 
33033  96 
structure Proof_Data: 
16533  97 
sig 
51368
2ea5c7c2d825
tuned signature  prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset

98 
val declare: (theory > Any.T) > serial 
2ea5c7c2d825
tuned signature  prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset

99 
val get: serial > (Any.T > 'a) > Proof.context > 'a 
2ea5c7c2d825
tuned signature  prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset

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

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

103 

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

104 
structure Context: PRIVATE_CONTEXT = 
6185  105 
struct 
106 

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

107 
(*** theory context ***) 
6185  108 

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

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

110 

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

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

112 

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

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

114 

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

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

116 
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

117 

51368
2ea5c7c2d825
tuned signature  prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset

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

119 

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

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

121 

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

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

123 
{pos: Position.T, 
51368
2ea5c7c2d825
tuned signature  prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset

124 
empty: Any.T, 
2ea5c7c2d825
tuned signature  prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset

125 
extend: Any.T > Any.T, 
2ea5c7c2d825
tuned signature  prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset

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

127 

43684  128 
val kinds = Synchronized.var "Theory_Data" (Datatab.empty: kind Datatab.table); 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

129 

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

130 
fun invoke name f k x = 
43684  131 
(case Datatab.lookup (Synchronized.value kinds) k of 
42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

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

133 
if ! timing andalso name <> "" then 
48992  134 
Timing.cond_timeit true ("Theory_Data." ^ name ^ Position.here (#pos kind)) 
42818
128cc195ced3
timing of Theory_Data operations, with implicit thread positions when functor is applied;
wenzelm
parents:
42383
diff
changeset

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

136 
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

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

138 

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

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

140 

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

141 
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

142 
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

143 
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

144 

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

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

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

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

148 
val kind = {pos = pos, empty = empty, extend = extend, merge = merge}; 
43684  149 
val _ = Synchronized.change kinds (Datatab.update (k, kind)); 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

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

151 

39020  152 
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

153 
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

154 

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

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

156 

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

157 

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

158 

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

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

160 

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

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

162 
Theory of 
16533  163 
(*identity*) 
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

164 
{id: serial, (*identifier*) 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

165 
ids: Inttab.set} * (*cumulative identifiers  symbolic body content*) 
29095  166 
(*data*) 
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

167 
Any.T Datatab.table * (*body content*) 
29095  168 
(*ancestry*) 
29093
1cc36c0ec9eb
refined identity and ancestry: explicit draft flat, ids are unnamed, name consistency is checked for ancestry;
wenzelm
parents:
29069
diff
changeset

169 
{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

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

172 
{name: string, (*official theory name*) 
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

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

174 

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

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

176 

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

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

178 

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

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

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

183 

52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

184 
fun make_identity id ids = {id = id, ids = ids}; 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

185 
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

186 
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

187 

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

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

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

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

191 

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

192 

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

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

194 

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

195 
val PureN = "Pure"; 
29095  196 
val finished = ~1; 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

197 

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

198 
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

199 
let 
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

200 
val {name, stage} = history_of thy; 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

201 
val name' = 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

202 
if stage = finished then name 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

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

204 
val ancestor_names = map theory_name (ancestors_of thy); 
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

205 
in rev (name' :: ancestor_names) end; 
29069
c7ba485581ae
unified ids for ancestors and checkpoints, removed obsolete history of checkpoints;
wenzelm
parents:
29001
diff
changeset

206 

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

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

208 
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

209 

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

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

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

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

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

214 
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

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

216 

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

217 
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

218 

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

219 
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

220 
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

221 
(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

222 
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

223 
 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

224 
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

225 
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

226 

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

227 
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

228 
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

229 
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

230 

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

231 

52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

232 
(* theory references *) (* FIXME dummy *) 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

233 

52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

234 
datatype theory_ref = Theory_Ref of theory; 
24141
73baca986087
improved check_thy: produce a checked theory_ref (threadsafe version);
wenzelm
parents:
23944
diff
changeset

235 

52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

236 
fun deref (Theory_Ref thy) = thy; 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

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

238 

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

239 

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

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

241 

52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

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

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 
fun merge_ids 
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

245 
(Theory ({id = id1, ids = ids1, ...}, _, _, _)) 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

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

247 
Inttab.merge (K true) (ids1, ids2) 
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

248 
> insert_id id1 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

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

250 

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

251 

16533  252 
(* equality and inclusion *) 
253 

52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

254 
val eq_thy = op = o pairself (#id o identity_of); 
16533  255 

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

256 
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

257 
Inttab.defined ids id; 
16533  258 

259 
fun subthy thys = eq_thy thys orelse proper_subthy thys; 

260 

16594  261 
fun joinable (thy1, thy2) = subthy (thy1, thy2) orelse subthy (thy2, thy1); 
262 

16533  263 

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

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

265 

50431
955c4aa44f60
check consistent theory names for direct imports as well  as claimed in the comments (see also 1cc36c0ec9eb);
wenzelm
parents:
48992
diff
changeset

266 
fun eq_thy_consistent (thy1, thy2) = 
955c4aa44f60
check consistent theory names for direct imports as well  as claimed in the comments (see also 1cc36c0ec9eb);
wenzelm
parents:
48992
diff
changeset

267 
eq_thy (thy1, thy2) orelse 
955c4aa44f60
check consistent theory names for direct imports as well  as claimed in the comments (see also 1cc36c0ec9eb);
wenzelm
parents:
48992
diff
changeset

268 
(theory_name thy1 = theory_name thy2 andalso 
955c4aa44f60
check consistent theory names for direct imports as well  as claimed in the comments (see also 1cc36c0ec9eb);
wenzelm
parents:
48992
diff
changeset

269 
raise THEORY ("Duplicate theory name", [thy1, thy2])); 
955c4aa44f60
check consistent theory names for direct imports as well  as claimed in the comments (see also 1cc36c0ec9eb);
wenzelm
parents:
48992
diff
changeset

270 

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

271 
fun extend_ancestors thy thys = 
50431
955c4aa44f60
check consistent theory names for direct imports as well  as claimed in the comments (see also 1cc36c0ec9eb);
wenzelm
parents:
48992
diff
changeset

272 
if member eq_thy_consistent thys thy then 
33033  273 
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

274 
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

275 

50431
955c4aa44f60
check consistent theory names for direct imports as well  as claimed in the comments (see also 1cc36c0ec9eb);
wenzelm
parents:
48992
diff
changeset

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

277 

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

278 

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

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

280 

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

281 
fun merge (thy1, thy2) = 
16719  282 
if eq_thy (thy1, thy2) then thy1 
283 
else if proper_subthy (thy2, thy1) then thy1 

284 
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

285 
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

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

287 

52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

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

289 

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

290 

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

291 

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

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

293 

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

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

295 

52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

296 
fun create_thy ids data ancestry history = 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

297 
Theory (make_identity (serial ()) ids, data, ancestry, history); 
33606
2b27020ffcb2
local mutex for theory content/identity operations;
wenzelm
parents:
33517
diff
changeset

298 

52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

299 
val pre_pure_thy = 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

300 
create_thy Inttab.empty Datatab.empty (make_ancestry [] []) (make_history PureN 0); 
16436
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
wenzelm
parents:
15801
diff
changeset

301 

52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

302 
local 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

303 

38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

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

305 
let 
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

306 
val Theory ({id, ids}, data, ancestry, {name, stage}) = thy; 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

307 
val (data', ancestry') = 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

308 
if stage = finished then 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

309 
(extend_data data, make_ancestry [thy] (extend_ancestors thy (ancestors_of thy))) 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

310 
else (data, ancestry); 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

311 
val history' = {name = name, stage = if finish then finished else stage + 1}; 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

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

313 
val data'' = f data'; 
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

314 
in create_thy ids' data'' ancestry' history' end; 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

315 

52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

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

317 

52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

318 
val update_thy = change_thy false; 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

319 
val extend_thy = update_thy I; 
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

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

321 

52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

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

323 

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

324 

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

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

326 

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

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

329 
val ids = merge_ids thy1 thy2; 
26957  330 
val data = merge_data (pp thy1) (data_of thy1, data_of thy2); 
331 
val ancestry = make_ancestry [] []; 

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

332 
val history = make_history "" 0; 
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

333 
in create_thy ids data ancestry history end; 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

334 

16533  335 
fun maximal_thys thys = 
28617  336 
thys > filter_out (fn thy => exists (fn thy' => proper_subthy (thy, thy')) thys); 
16533  337 

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

338 
fun begin_thy pp name imports = 
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

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

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

342 
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

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

344 
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

345 
> 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

346 

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

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

348 
(case parents of 
48638  349 
[] => error "Missing theory imports" 
16533  350 
 [thy] => extend_thy thy 
351 
 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

352 

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

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

354 
val history = make_history name 0; 
52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

355 
in create_thy ids data ancestry history end; 
16489
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
wenzelm
parents:
16436
diff
changeset

356 

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

357 

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

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

359 

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

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

362 

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

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

364 

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

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

366 
(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

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

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

369 

52696
38466f4f3483
immutable theory values with full stamp record of every update (increase of stamp size for HOL: 20000 > 100000, JinjaThreads: 65000 > 300000)  minimal measurable impact on inference kernel performance;
wenzelm
parents:
52682
diff
changeset

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

371 

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

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

373 

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

374 

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

375 

16533  376 
(*** proof context ***) 
377 

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

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

379 

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

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

381 
struct 
51368
2ea5c7c2d825
tuned signature  prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset

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

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

384 

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

385 
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

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

387 
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

388 

16533  389 

390 
(* proof data kinds *) 

391 

392 
local 

393 

51368
2ea5c7c2d825
tuned signature  prefer terminology of Scala and Axiom;
wenzelm
parents:
50431
diff
changeset

394 
val kinds = Synchronized.var "Proof_Data" (Datatab.empty: (theory > Any.T) Datatab.table); 
16533  395 

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

396 
fun invoke_init k = 
43684  397 
(case Datatab.lookup (Synchronized.value kinds) k of 
22847
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
wenzelm
parents:
22827
diff
changeset

398 
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

399 
 NONE => raise Fail "Invalid proof data identifier"); 
16533  400 

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

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

403 

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

404 
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

405 
Datatab.merge (K true) (data, init_data thy); 
16533  406 

407 
in 

408 

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

409 
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

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

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

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

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

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

416 
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

417 

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

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

420 
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

421 
fun init_global thy = Proof.Context (init_data thy, check_thy thy); 
51686  422 
fun get_global thy name = init_global (get_theory thy name); 
33031
b75c35574e04
backpatching of structure Proof and ProofContext  avoid odd aliases;
wenzelm
parents:
32784
diff
changeset

423 
end; 
16533  424 

33033  425 
structure Proof_Data = 
16533  426 
struct 
427 

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

428 
fun declare init = 
16533  429 
let 
430 
val k = serial (); 

43684  431 
val _ = Synchronized.change kinds (Datatab.update (k, init)); 
16533  432 
in k end; 
433 

434 
fun get k dest prf = 

52682  435 
(case Datatab.lookup (data_of_proof prf) 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

436 
SOME x => x 
52682  437 
 NONE => invoke_init k (Proof_Context.theory_of prf)) > dest; (*adhoc value for old theories*) 
16533  438 

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

439 
fun put k mk x = map_prf (Datatab.update (k, mk x)); 
16533  440 

441 
end; 

442 

443 
end; 

444 

445 

18632  446 

16533  447 
(*** generic context ***) 
448 

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

449 
datatype generic = Theory of theory  Proof of Proof.context; 
18632  450 

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

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

16533  453 

19678  454 
fun mapping f g = cases (Theory o f) (Proof o g); 
21660  455 
fun mapping_result f g = cases (apsnd Theory o f) (apsnd Proof o g); 
19678  456 

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

457 
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

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

18731  460 
fun map_theory f = Theory o f o the_theory; 
461 
fun map_proof f = Proof o f o the_proof; 

462 

26486  463 
fun map_theory_result f = apsnd Theory o f o the_theory; 
464 
fun map_proof_result f = apsnd Proof o f o the_proof; 

465 

18731  466 
fun theory_map f = the_theory o f o Theory; 
467 
fun proof_map f = the_proof o f o Proof; 

18665  468 

42360  469 
val theory_of = cases I Proof_Context.theory_of; 
470 
val proof_of = cases Proof_Context.init_global I; 

16533  471 

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

472 

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

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

474 

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

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

476 

47005
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
wenzelm
parents:
43684
diff
changeset

477 
val pretty_generic = Pretty o PRETTY; 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
wenzelm
parents:
43684
diff
changeset

478 
val pretty = pretty_generic o Proof; 
421760a1efe7
maintain generic context naming in structure Name_Space (NB: empty = default_naming, init = local_naming);
wenzelm
parents:
43684
diff
changeset

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

480 

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

481 
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

482 

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

483 

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

484 

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

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

486 

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

487 
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

488 

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

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

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

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

493 

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

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

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

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

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

498 

28122  499 
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

500 
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

501 

26428  502 
end; 
503 

504 
fun >>> f = 

505 
let 

26463  506 
val (res, context') = f (the_thread_data ()); 
507 
val _ = set_thread_data (SOME context'); 

26428  508 
in res end; 
509 

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

512 

26428  513 
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

514 

6185  515 
end; 
516 

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

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

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

519 

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

520 

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

521 

16533  522 
(*** typesafe interfaces for data declarations ***) 
523 

524 
(** theory data **) 

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

525 

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

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

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

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

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

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

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

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

533 

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

534 
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

535 
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

536 
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

537 
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

538 
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

539 
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

540 
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

541 

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

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

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

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

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

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

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

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

549 

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

550 
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

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

552 

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

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

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

555 

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

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

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

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

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

560 
(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

561 
(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

562 

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

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

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

566 

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

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

568 

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

569 
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

570 
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

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

572 
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

573 
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

574 
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

575 
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

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

577 

16533  578 

579 

580 
(** proof data **) 

581 

582 
signature PROOF_DATA_ARGS = 

583 
sig 

584 
type T 

585 
val init: theory > T 

586 
end; 

587 

588 
signature PROOF_DATA = 

589 
sig 

590 
type T 

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

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

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

593 
val map: (T > T) > Proof.context > Proof.context 
16533  594 
end; 
595 

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

596 
functor Proof_Data(Data: PROOF_DATA_ARGS): PROOF_DATA = 
16533  597 
struct 
598 

599 
type T = Data.T; 

600 
exception Data of T; 

601 

33033  602 
val kind = Context.Proof_Data.declare (Data o Data.init); 
16533  603 

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

16533  606 
fun map f prf = put (f (get prf)) prf; 
607 

608 
end; 

609 

18632  610 

611 

612 
(** generic data **) 

613 

614 
signature GENERIC_DATA_ARGS = 

615 
sig 

616 
type T 

617 
val empty: T 

618 
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

619 
val merge: T * T > T 
18632  620 
end; 
621 

622 
signature GENERIC_DATA = 

623 
sig 

624 
type T 

625 
val get: Context.generic > T 

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

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

628 
end; 

629 

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

630 
functor Generic_Data(Data: GENERIC_DATA_ARGS): GENERIC_DATA = 
18632  631 
struct 
632 

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

633 
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

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

636 
type T = Data.T; 

637 

33033  638 
fun get (Context.Theory thy) = Thy_Data.get thy 
639 
 get (Context.Proof prf) = Prf_Data.get prf; 

18632  640 

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

18632  643 

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

645 

646 
end; 

647 

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

649 
structure Context: CONTEXT = Context; 
20297  650 