| author | haftmann | 
| Fri, 05 Dec 2008 18:42:37 +0100 | |
| changeset 29004 | a5a91f387791 | 
| parent 28617 | c9c1c8b28a62 | 
| child 29001 | b97a3f808133 | 
| permissions | -rw-r--r-- | 
| 6185 | 1  | 
(* Title: Pure/context.ML  | 
2  | 
ID: $Id$  | 
|
3  | 
Author: Markus Wenzel, TU Muenchen  | 
|
4  | 
||
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
5  | 
Generic theory contexts with unique identity, arbitrarily typed data,  | 
| 
24141
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
6  | 
monotonic development graph and history support. Generic proof  | 
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
7  | 
contexts with arbitrarily typed data.  | 
| 6185 | 8  | 
*)  | 
9  | 
||
10  | 
signature BASIC_CONTEXT =  | 
|
11  | 
sig  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
12  | 
type theory  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
13  | 
type theory_ref  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
14  | 
exception THEORY of string * theory list  | 
| 6185 | 15  | 
end;  | 
16  | 
||
17  | 
signature CONTEXT =  | 
|
18  | 
sig  | 
|
19  | 
include BASIC_CONTEXT  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
20  | 
(*theory context*)  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
21  | 
val theory_name: theory -> string  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
22  | 
val parents_of: theory -> theory list  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
23  | 
val ancestors_of: theory -> theory list  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
24  | 
val is_stale: theory -> bool  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
25  | 
val PureN: string  | 
| 26623 | 26  | 
val is_draft: theory -> bool  | 
| 28317 | 27  | 
val reject_draft: theory -> theory  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
28  | 
val exists_name: string -> theory -> bool  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
29  | 
val names_of: theory -> string list  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
30  | 
val pretty_thy: theory -> Pretty.T  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
31  | 
val string_of_thy: theory -> string  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
32  | 
val pprint_thy: theory -> pprint_args -> unit  | 
| 27341 | 33  | 
val pprint_thy_ref: theory_ref -> pprint_args -> unit  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
34  | 
val pretty_abbrev_thy: theory -> Pretty.T  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
35  | 
val str_of_thy: theory -> string  | 
| 
24141
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
36  | 
val deref: theory_ref -> theory  | 
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
37  | 
val check_thy: theory -> theory_ref  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
38  | 
val eq_thy: theory * theory -> bool  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
39  | 
val subthy: theory * theory -> bool  | 
| 16594 | 40  | 
val joinable: theory * theory -> bool  | 
| 
23355
 
d2c033fd4514
merge/merge_refs: plain error instead of exception TERM;
 
wenzelm 
parents: 
22847 
diff
changeset
 | 
41  | 
val merge: theory * theory -> theory  | 
| 
 
d2c033fd4514
merge/merge_refs: plain error instead of exception TERM;
 
wenzelm 
parents: 
22847 
diff
changeset
 | 
42  | 
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
 | 
43  | 
val copy_thy: theory -> theory  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
44  | 
val checkpoint_thy: theory -> theory  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
45  | 
val finish_thy: theory -> theory  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
46  | 
val begin_thy: (theory -> Pretty.pp) -> string -> theory list -> theory  | 
| 16533 | 47  | 
(*proof context*)  | 
48  | 
type proof  | 
|
49  | 
val theory_of_proof: proof -> theory  | 
|
| 
17060
 
cca2f3938443
type proof: theory_ref instead of theory (make proof contexts independent entities);
 
wenzelm 
parents: 
16894 
diff
changeset
 | 
50  | 
val transfer_proof: theory -> proof -> proof  | 
| 16533 | 51  | 
val init_proof: theory -> proof  | 
52  | 
(*generic context*)  | 
|
| 18632 | 53  | 
datatype generic = Theory of theory | Proof of proof  | 
54  | 
val cases: (theory -> 'a) -> (proof -> 'a) -> generic -> 'a  | 
|
| 19678 | 55  | 
val mapping: (theory -> theory) -> (proof -> proof) -> generic -> generic  | 
| 21660 | 56  | 
val mapping_result: (theory -> 'a * theory) -> (proof -> 'a * proof) -> generic -> 'a * generic  | 
| 18632 | 57  | 
val the_theory: generic -> theory  | 
58  | 
val the_proof: generic -> proof  | 
|
| 18731 | 59  | 
val map_theory: (theory -> theory) -> generic -> generic  | 
60  | 
val map_proof: (proof -> proof) -> generic -> generic  | 
|
| 26486 | 61  | 
val map_theory_result: (theory -> 'a * theory) -> generic -> 'a * generic  | 
62  | 
val map_proof_result: (proof -> 'a * proof) -> generic -> 'a * generic  | 
|
| 18731 | 63  | 
val theory_map: (generic -> generic) -> theory -> theory  | 
64  | 
val proof_map: (generic -> generic) -> proof -> proof  | 
|
| 18665 | 65  | 
val theory_of: generic -> theory (*total*)  | 
66  | 
val proof_of: generic -> proof (*total*)  | 
|
| 
26413
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
67  | 
(*thread data*)  | 
| 
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
68  | 
val thread_data: unit -> generic option  | 
| 
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
69  | 
val the_thread_data: unit -> generic  | 
| 
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
70  | 
val set_thread_data: generic option -> unit  | 
| 
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
71  | 
  val setmp_thread_data: generic option -> ('a -> 'b) -> 'a -> 'b
 | 
| 26463 | 72  | 
val >> : (generic -> generic) -> unit  | 
73  | 
val >>> : (generic -> 'a * generic) -> 'a  | 
|
| 6185 | 74  | 
end;  | 
75  | 
||
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
76  | 
signature PRIVATE_CONTEXT =  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
77  | 
sig  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
78  | 
include CONTEXT  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
79  | 
structure TheoryData:  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
80  | 
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
 | 
81  | 
val declare: Object.T -> (Object.T -> Object.T) -> (Object.T -> Object.T) ->  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
82  | 
(Pretty.pp -> Object.T * Object.T -> Object.T) -> serial  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
83  | 
val get: serial -> (Object.T -> 'a) -> theory -> 'a  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
84  | 
    val put: serial -> ('a -> Object.T) -> 'a -> theory -> theory
 | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
85  | 
end  | 
| 16533 | 86  | 
structure ProofData:  | 
87  | 
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
 | 
88  | 
val declare: (theory -> Object.T) -> serial  | 
| 16533 | 89  | 
val get: serial -> (Object.T -> 'a) -> proof -> 'a  | 
90  | 
    val put: serial -> ('a -> Object.T) -> 'a -> proof -> proof
 | 
|
91  | 
end  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
92  | 
end;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
93  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
94  | 
structure Context: PRIVATE_CONTEXT =  | 
| 6185 | 95  | 
struct  | 
96  | 
||
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
97  | 
(*** theory context ***)  | 
| 6185 | 98  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
99  | 
(** theory data **)  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
100  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
101  | 
(* data kinds and access methods *)  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
102  | 
|
| 
19028
 
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
 
wenzelm 
parents: 
18931 
diff
changeset
 | 
103  | 
(*private copy avoids potential conflict of table exceptions*)  | 
| 
 
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
 
wenzelm 
parents: 
18931 
diff
changeset
 | 
104  | 
structure Datatab = TableFun(type key = int val ord = int_ord);  | 
| 
 
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
 
wenzelm 
parents: 
18931 
diff
changeset
 | 
105  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
106  | 
local  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
107  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
108  | 
type kind =  | 
| 
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
 | 
109  | 
 {empty: Object.T,
 | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
110  | 
copy: Object.T -> Object.T,  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
111  | 
extend: Object.T -> Object.T,  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
112  | 
merge: Pretty.pp -> Object.T * Object.T -> Object.T};  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
113  | 
|
| 
19028
 
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
 
wenzelm 
parents: 
18931 
diff
changeset
 | 
114  | 
val kinds = ref (Datatab.empty: kind Datatab.table);  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
115  | 
|
| 
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
 | 
116  | 
fun invoke f k =  | 
| 
19028
 
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
 
wenzelm 
parents: 
18931 
diff
changeset
 | 
117  | 
(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
 | 
118  | 
SOME kind => f kind  | 
| 
 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 
wenzelm 
parents: 
22827 
diff
changeset
 | 
119  | 
| NONE => sys_error "Invalid theory data identifier");  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
120  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
121  | 
in  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
122  | 
|
| 
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
 | 
123  | 
fun invoke_empty k = invoke (K o #empty) k ();  | 
| 
 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 
wenzelm 
parents: 
22827 
diff
changeset
 | 
124  | 
val invoke_copy = invoke #copy;  | 
| 
 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 
wenzelm 
parents: 
22827 
diff
changeset
 | 
125  | 
val invoke_extend = invoke #extend;  | 
| 
 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 
wenzelm 
parents: 
22827 
diff
changeset
 | 
126  | 
fun invoke_merge pp = invoke (fn kind => #merge kind pp);  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
127  | 
|
| 
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
 | 
128  | 
fun declare_theory_data empty copy extend merge =  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
129  | 
let  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
130  | 
val k = serial ();  | 
| 
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
 | 
131  | 
    val kind = {empty = empty, copy = copy, extend = extend, merge = merge};
 | 
| 23944 | 132  | 
val _ = CRITICAL (fn () => change kinds (Datatab.update (k, kind)));  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
133  | 
in k end;  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
134  | 
|
| 
19028
 
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
 
wenzelm 
parents: 
18931 
diff
changeset
 | 
135  | 
val copy_data = Datatab.map' invoke_copy;  | 
| 
 
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
 
wenzelm 
parents: 
18931 
diff
changeset
 | 
136  | 
val extend_data = Datatab.map' invoke_extend;  | 
| 
 
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
 
wenzelm 
parents: 
18931 
diff
changeset
 | 
137  | 
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
 | 
138  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
139  | 
end;  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
140  | 
|
| 
 
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  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
143  | 
(** datatype theory **)  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
144  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
145  | 
datatype theory =  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
146  | 
Theory of  | 
| 16533 | 147  | 
(*identity*)  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
148  | 
   {self: theory ref option,            (*dynamic self reference -- follows theory changes*)
 | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
149  | 
id: serial * string, (*identifier of this theory*)  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
150  | 
ids: string Inttab.table, (*identifiers of ancestors*)  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
151  | 
iids: string Inttab.table} * (*identifiers of intermediate checkpoints*)  | 
| 16533 | 152  | 
(*data*)  | 
| 
22847
 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 
wenzelm 
parents: 
22827 
diff
changeset
 | 
153  | 
Object.T Datatab.table *  | 
| 16533 | 154  | 
(*ancestry*)  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
155  | 
   {parents: theory list,               (*immediate predecessors*)
 | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
156  | 
ancestors: theory list} * (*all predecessors*)  | 
| 16533 | 157  | 
(*history*)  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
158  | 
   {name: string,                       (*prospective name of finished theory*)
 | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
159  | 
version: int, (*checkpoint counter*)  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
160  | 
intermediates: theory list}; (*intermediate checkpoints*)  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
161  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
162  | 
exception THEORY of string * theory list;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
163  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
164  | 
fun rep_theory (Theory args) = args;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
165  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
166  | 
val identity_of = #1 o rep_theory;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
167  | 
val data_of = #2 o rep_theory;  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
168  | 
val ancestry_of = #3 o rep_theory;  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
169  | 
val history_of = #4 o rep_theory;  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
170  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
171  | 
fun make_identity self id ids iids = {self = self, id = id, ids = ids, iids = iids};
 | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
172  | 
fun make_ancestry parents ancestors = {parents = parents, ancestors = ancestors};
 | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
173  | 
fun make_history name vers ints = {name = name, version = vers, intermediates = ints};
 | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
174  | 
|
| 16533 | 175  | 
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
 | 
176  | 
val parents_of = #parents o ancestry_of;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
177  | 
val ancestors_of = #ancestors o ancestry_of;  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
178  | 
val theory_name = #name o history_of;  | 
| 
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  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
181  | 
(* staleness *)  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
182  | 
|
| 16533 | 183  | 
fun eq_id ((i: int, _), (j, _)) = (i = j);  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
184  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
185  | 
fun is_stale  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
186  | 
    (Theory ({self = SOME (ref (Theory ({id = id', ...}, _, _, _))), id, ...}, _, _, _)) =
 | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
187  | 
not (eq_id (id, id'))  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
188  | 
  | is_stale (Theory ({self = NONE, ...}, _, _, _)) = true;
 | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
189  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
190  | 
fun vitalize (thy as Theory ({self = SOME r, ...}, _, _, _)) = (r := thy; thy)
 | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
191  | 
  | vitalize (thy as Theory ({self = NONE, id, ids, iids}, data, ancestry, history)) =
 | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
192  | 
let  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
193  | 
val r = ref thy;  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
194  | 
val thy' = Theory (make_identity (SOME r) id ids iids, data, ancestry, history);  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
195  | 
in r := thy'; thy' end;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
196  | 
|
| 
 
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  | 
(* names *)  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
199  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
200  | 
val PureN = "Pure";  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
201  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
202  | 
val draftN = "#";  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
203  | 
fun draft_id (_, name) = (name = draftN);  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
204  | 
val is_draft = draft_id o #id o identity_of;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
205  | 
|
| 28317 | 206  | 
fun reject_draft thy =  | 
207  | 
  if is_draft thy then raise THEORY ("Illegal draft theory -- stable checkpoint required", [thy])
 | 
|
208  | 
else thy;  | 
|
209  | 
||
| 20821 | 210  | 
fun exists_name name (thy as Theory ({id, ids, iids, ...}, _, _, _)) =
 | 
211  | 
name = theory_name thy orelse  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
212  | 
name = #2 id orelse  | 
| 28375 | 213  | 
Inttab.exists (fn (_, a) => a = name) ids orelse  | 
214  | 
Inttab.exists (fn (_, a) => a = name) iids;  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
215  | 
|
| 
26889
 
ccea41fb5c39
names_of: exclude intermediate ids -- less verbosity;
 
wenzelm 
parents: 
26623 
diff
changeset
 | 
216  | 
fun names_of (Theory ({id, ids, ...}, _, _, _)) =
 | 
| 
 
ccea41fb5c39
names_of: exclude intermediate ids -- less verbosity;
 
wenzelm 
parents: 
26623 
diff
changeset
 | 
217  | 
rev (#2 id :: Inttab.fold (cons o #2) ids []);  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
218  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
219  | 
fun pretty_thy thy =  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
220  | 
  Pretty.str_list "{" "}" (names_of thy @ (if is_stale thy then ["!"] else []));
 | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
221  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
222  | 
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
 | 
223  | 
val pprint_thy = Pretty.pprint o pretty_thy;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
224  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
225  | 
fun pretty_abbrev_thy thy =  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
226  | 
let  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
227  | 
val names = names_of thy;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
228  | 
val n = length names;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
229  | 
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
 | 
230  | 
  in Pretty.str_list "{" "}" abbrev end;
 | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
231  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
232  | 
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
 | 
233  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
234  | 
|
| 
24141
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
235  | 
(* theory references *)  | 
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
236  | 
|
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
237  | 
(*theory_ref provides a safe way to store dynamic references to a  | 
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
238  | 
theory in external data structures -- a plain theory value would  | 
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
239  | 
become stale as the self reference moves on*)  | 
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
240  | 
|
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
241  | 
datatype theory_ref = TheoryRef of theory ref;  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
242  | 
|
| 
24141
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
243  | 
fun deref (TheoryRef (ref thy)) = thy;  | 
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
244  | 
|
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
245  | 
fun check_thy thy = (*thread-safe version*)  | 
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
246  | 
let val thy_ref = TheoryRef (the_self thy) in  | 
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
247  | 
    if is_stale thy then error ("Stale theory encountered:\n" ^ string_of_thy thy)
 | 
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
248  | 
else thy_ref  | 
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
249  | 
end;  | 
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
250  | 
|
| 27341 | 251  | 
val pprint_thy_ref = Pretty.pprint o pretty_thy o deref;  | 
252  | 
||
| 
24141
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
253  | 
|
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
254  | 
(* consistency *)  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
255  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
256  | 
fun check_ins id ids =  | 
| 16894 | 257  | 
if draft_id id orelse Inttab.defined ids (#1 id) then ids  | 
| 28375 | 258  | 
else if Inttab.exists (fn (_, a) => a = #2 id) ids then  | 
| 
23355
 
d2c033fd4514
merge/merge_refs: plain error instead of exception TERM;
 
wenzelm 
parents: 
22847 
diff
changeset
 | 
259  | 
    error ("Different versions of theory component " ^ quote (#2 id))
 | 
| 17412 | 260  | 
else Inttab.update id ids;  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
261  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
262  | 
fun check_insert intermediate id (ids, iids) =  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
263  | 
let val ids' = check_ins id ids and iids' = check_ins id iids  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
264  | 
in if intermediate then (ids, iids') else (ids', iids) end;  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
265  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
266  | 
fun check_merge  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
267  | 
    (Theory ({id = id1, ids = ids1, iids = iids1, ...}, _, _, history1))
 | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
268  | 
    (Theory ({id = id2, ids = ids2, iids = iids2, ...}, _, _, history2)) =
 | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
269  | 
(Inttab.fold check_ins ids2 ids1, Inttab.fold check_ins iids2 iids1)  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
270  | 
|> check_insert (#version history1 > 0) id1  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
271  | 
|> check_insert (#version history2 > 0) id2;  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
272  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
273  | 
|
| 16533 | 274  | 
(* equality and inclusion *)  | 
275  | 
||
| 
24141
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
276  | 
val eq_thy = eq_id o pairself (#id o identity_of);  | 
| 16533 | 277  | 
|
| 28375 | 278  | 
fun proper_subthy (Theory ({id = (i, _), ...}, _, _, _), Theory ({ids, iids, ...}, _, _, _)) =
 | 
| 16894 | 279  | 
Inttab.defined ids i orelse Inttab.defined iids i;  | 
| 16533 | 280  | 
|
281  | 
fun subthy thys = eq_thy thys orelse proper_subthy thys;  | 
|
282  | 
||
| 16594 | 283  | 
fun joinable (thy1, thy2) = subthy (thy1, thy2) orelse subthy (thy2, thy1);  | 
284  | 
||
| 16533 | 285  | 
|
| 
23355
 
d2c033fd4514
merge/merge_refs: plain error instead of exception TERM;
 
wenzelm 
parents: 
22847 
diff
changeset
 | 
286  | 
(* trivial merge *)  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
287  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
288  | 
fun merge (thy1, thy2) =  | 
| 16719 | 289  | 
if eq_thy (thy1, thy2) then thy1  | 
290  | 
else if proper_subthy (thy2, thy1) then thy1  | 
|
291  | 
else if proper_subthy (thy1, thy2) then thy2  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
292  | 
else (check_merge thy1 thy2;  | 
| 
23355
 
d2c033fd4514
merge/merge_refs: plain error instead of exception TERM;
 
wenzelm 
parents: 
22847 
diff
changeset
 | 
293  | 
error (cat_lines ["Attempt to perform non-trivial merge of theories:",  | 
| 
 
d2c033fd4514
merge/merge_refs: plain error instead of exception TERM;
 
wenzelm 
parents: 
22847 
diff
changeset
 | 
294  | 
str_of_thy thy1, str_of_thy thy2]));  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
295  | 
|
| 16719 | 296  | 
fun merge_refs (ref1, ref2) =  | 
297  | 
if ref1 = ref2 then ref1  | 
|
| 
24141
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
298  | 
else check_thy (merge (deref ref1, deref ref2));  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
299  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
300  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
301  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
302  | 
(** build theories **)  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
303  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
304  | 
(* primitives *)  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
305  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
306  | 
fun create_thy name self id ids iids data ancestry history =  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
307  | 
let  | 
| 17756 | 308  | 
    val {version, name = _, intermediates = _} = history;
 | 
309  | 
val intermediate = version > 0;  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
310  | 
val (ids', iids') = check_insert intermediate id (ids, iids);  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
311  | 
val id' = (serial (), name);  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
312  | 
val _ = check_insert intermediate id' (ids', iids');  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
313  | 
val identity' = make_identity self id' ids' iids';  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
314  | 
in vitalize (Theory (identity', data, ancestry, history)) end;  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
315  | 
|
| 24369 | 316  | 
fun change_thy name f thy =  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
317  | 
let  | 
| 
24141
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
318  | 
    val Theory ({self, id, ids, iids}, data, ancestry, history) = thy;
 | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
319  | 
val (self', data', ancestry') =  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
320  | 
if is_draft thy then (self, data, ancestry) (*destructive change!*)  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
321  | 
else if #version history > 0  | 
| 
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
 | 
322  | 
then (NONE, copy_data data, ancestry)  | 
| 24369 | 323  | 
else (NONE, extend_data data, make_ancestry [thy] (thy :: #ancestors ancestry));  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
324  | 
val data'' = f data';  | 
| 24369 | 325  | 
val thy' = NAMED_CRITICAL "theory" (fn () =>  | 
326  | 
(check_thy thy; create_thy name self' id ids iids data'' ancestry' history));  | 
|
327  | 
in thy' end;  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
328  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
329  | 
fun name_thy name = change_thy name I;  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
330  | 
val modify_thy = change_thy draftN;  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
331  | 
val extend_thy = modify_thy I;  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
332  | 
|
| 24369 | 333  | 
fun copy_thy thy =  | 
| 
24141
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
334  | 
let  | 
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
335  | 
    val Theory ({id, ids, iids, ...}, data, ancestry, history) = thy;
 | 
| 24369 | 336  | 
val data' = copy_data data;  | 
337  | 
val thy' = NAMED_CRITICAL "theory" (fn () =>  | 
|
338  | 
(check_thy thy; create_thy draftN NONE id ids iids data' ancestry history));  | 
|
339  | 
in thy' end;  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
340  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
341  | 
val pre_pure_thy = create_thy draftN NONE (serial (), draftN) Inttab.empty Inttab.empty  | 
| 26428 | 342  | 
Datatab.empty (make_ancestry [] []) (make_history PureN 0 []);  | 
| 
16489
 
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  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
345  | 
(* named theory nodes *)  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
346  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
347  | 
fun merge_thys pp (thy1, thy2) =  | 
| 26957 | 348  | 
let  | 
349  | 
val (ids, iids) = check_merge thy1 thy2;  | 
|
350  | 
val data = merge_data (pp thy1) (data_of thy1, data_of thy2);  | 
|
351  | 
val ancestry = make_ancestry [] [];  | 
|
352  | 
val history = make_history "" 0 [];  | 
|
353  | 
val thy' = NAMED_CRITICAL "theory" (fn () =>  | 
|
354  | 
(check_thy thy1; check_thy thy2;  | 
|
355  | 
create_thy draftN NONE (serial (), draftN) ids iids data ancestry history))  | 
|
356  | 
in thy' end;  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
357  | 
|
| 16533 | 358  | 
fun maximal_thys thys =  | 
| 28617 | 359  | 
thys |> filter_out (fn thy => exists (fn thy' => proper_subthy (thy, thy')) thys);  | 
| 16533 | 360  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
361  | 
fun begin_thy pp name imports =  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
362  | 
  if name = draftN then error ("Illegal theory name: " ^ quote draftN)
 | 
| 24369 | 363  | 
else  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
364  | 
let  | 
| 
24141
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
365  | 
val parents = maximal_thys (distinct eq_thy imports);  | 
| 22603 | 366  | 
val ancestors = distinct eq_thy (parents @ maps ancestors_of parents);  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
367  | 
      val Theory ({id, ids, iids, ...}, data, _, _) =
 | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
368  | 
(case parents of  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
369  | 
[] => error "No parent theories"  | 
| 16533 | 370  | 
| [thy] => extend_thy thy  | 
371  | 
| thy :: thys => Library.foldl (merge_thys pp) (thy, thys));  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
372  | 
val ancestry = make_ancestry parents ancestors;  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
373  | 
val history = make_history name 0 [];  | 
| 24369 | 374  | 
val thy' = NAMED_CRITICAL "theory" (fn () =>  | 
375  | 
(map check_thy imports; create_thy draftN NONE id ids iids data ancestry history));  | 
|
376  | 
in thy' end;  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
377  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
378  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
379  | 
(* undoable checkpoints *)  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
380  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
381  | 
fun checkpoint_thy thy =  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
382  | 
if not (is_draft thy) then thy  | 
| 24369 | 383  | 
else  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
384  | 
let  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
385  | 
      val {name, version, intermediates} = history_of thy;
 | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
386  | 
val thy' as Theory (identity', data', ancestry', _) =  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
387  | 
name_thy (name ^ ":" ^ string_of_int version) thy;  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
388  | 
val history' = make_history name (version + 1) (thy' :: intermediates);  | 
| 24369 | 389  | 
val thy'' = NAMED_CRITICAL "theory" (fn () =>  | 
390  | 
(check_thy thy'; vitalize (Theory (identity', data', ancestry', history'))));  | 
|
391  | 
in thy'' end;  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
392  | 
|
| 
24141
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
393  | 
fun finish_thy thy = NAMED_CRITICAL "theory" (fn () =>  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
394  | 
let  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
395  | 
    val {name, version, intermediates} = history_of thy;
 | 
| 
24141
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
396  | 
val rs = map ((fn TheoryRef r => r) o check_thy) intermediates;  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
397  | 
    val thy' as Theory ({self, id, ids, ...}, data', ancestry', _) = name_thy name thy;
 | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
398  | 
val identity' = make_identity self id ids Inttab.empty;  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
399  | 
val history' = make_history name 0 [];  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
400  | 
val thy'' = vitalize (Theory (identity', data', ancestry', history'));  | 
| 16533 | 401  | 
val _ = List.app (fn r => r := thy'') rs;  | 
| 
24141
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
402  | 
in thy'' end);  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
403  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
404  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
405  | 
(* theory data *)  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
406  | 
|
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
407  | 
structure TheoryData =  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
408  | 
struct  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
409  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
410  | 
val declare = declare_theory_data;  | 
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
411  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
412  | 
fun get k dest thy =  | 
| 
22847
 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 
wenzelm 
parents: 
22827 
diff
changeset
 | 
413  | 
dest ((case Datatab.lookup (data_of thy) 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
 | 
414  | 
SOME x => x  | 
| 
 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 
wenzelm 
parents: 
22827 
diff
changeset
 | 
415  | 
| NONE => invoke_copy k (invoke_empty k))); (*adhoc value*)  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
416  | 
|
| 
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  | 
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
 | 
418  | 
|
| 
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
419  | 
end;  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
420  | 
|
| 
 
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  | 
|
| 16533 | 423  | 
(*** proof context ***)  | 
424  | 
||
425  | 
(* datatype proof *)  | 
|
426  | 
||
| 
24184
 
19cb051154fd
thread-safeness: when creating certified items, perform Theory.check_thy *last*;
 
wenzelm 
parents: 
24141 
diff
changeset
 | 
427  | 
datatype proof = Prf of Object.T Datatab.table * theory_ref;  | 
| 
17060
 
cca2f3938443
type proof: theory_ref instead of theory (make proof contexts independent entities);
 
wenzelm 
parents: 
16894 
diff
changeset
 | 
428  | 
|
| 
24184
 
19cb051154fd
thread-safeness: when creating certified items, perform Theory.check_thy *last*;
 
wenzelm 
parents: 
24141 
diff
changeset
 | 
429  | 
fun theory_of_proof (Prf (_, thy_ref)) = deref thy_ref;  | 
| 
 
19cb051154fd
thread-safeness: when creating certified items, perform Theory.check_thy *last*;
 
wenzelm 
parents: 
24141 
diff
changeset
 | 
430  | 
fun data_of_proof (Prf (data, _)) = data;  | 
| 
 
19cb051154fd
thread-safeness: when creating certified items, perform Theory.check_thy *last*;
 
wenzelm 
parents: 
24141 
diff
changeset
 | 
431  | 
fun map_prf f (Prf (data, thy_ref)) = Prf (f data, thy_ref);  | 
| 
17060
 
cca2f3938443
type proof: theory_ref instead of theory (make proof contexts independent entities);
 
wenzelm 
parents: 
16894 
diff
changeset
 | 
432  | 
|
| 16533 | 433  | 
|
434  | 
(* proof data kinds *)  | 
|
435  | 
||
436  | 
local  | 
|
437  | 
||
| 
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
 | 
438  | 
val kinds = ref (Datatab.empty: (theory -> Object.T) Datatab.table);  | 
| 16533 | 439  | 
|
| 
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
 | 
440  | 
fun invoke_init k =  | 
| 
19028
 
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
 
wenzelm 
parents: 
18931 
diff
changeset
 | 
441  | 
(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
 | 
442  | 
SOME init => init  | 
| 
 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 
wenzelm 
parents: 
22827 
diff
changeset
 | 
443  | 
| NONE => sys_error "Invalid proof data identifier");  | 
| 16533 | 444  | 
|
| 
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
 | 
445  | 
fun init_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
 | 
446  | 
Datatab.map' (fn k => fn _ => invoke_init k thy) (! kinds);  | 
| 
 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 
wenzelm 
parents: 
22827 
diff
changeset
 | 
447  | 
|
| 
 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 
wenzelm 
parents: 
22827 
diff
changeset
 | 
448  | 
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
 | 
449  | 
Datatab.merge (K true) (data, init_data thy);  | 
| 16533 | 450  | 
|
451  | 
in  | 
|
452  | 
||
| 
24184
 
19cb051154fd
thread-safeness: when creating certified items, perform Theory.check_thy *last*;
 
wenzelm 
parents: 
24141 
diff
changeset
 | 
453  | 
fun init_proof thy = Prf (init_data thy, check_thy thy);  | 
| 16533 | 454  | 
|
| 
24184
 
19cb051154fd
thread-safeness: when creating certified items, perform Theory.check_thy *last*;
 
wenzelm 
parents: 
24141 
diff
changeset
 | 
455  | 
fun transfer_proof thy' (prf as Prf (data, thy_ref)) =  | 
| 
24141
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
456  | 
let  | 
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
457  | 
val thy = deref thy_ref;  | 
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
458  | 
val _ = subthy (thy, thy') orelse error "transfer proof context: not a super theory";  | 
| 
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
459  | 
val _ = check_thy thy;  | 
| 
24184
 
19cb051154fd
thread-safeness: when creating certified items, perform Theory.check_thy *last*;
 
wenzelm 
parents: 
24141 
diff
changeset
 | 
460  | 
val data' = init_new_data data thy';  | 
| 
24141
 
73baca986087
improved check_thy: produce a checked theory_ref (thread-safe version);
 
wenzelm 
parents: 
23944 
diff
changeset
 | 
461  | 
val thy_ref' = check_thy thy';  | 
| 
24184
 
19cb051154fd
thread-safeness: when creating certified items, perform Theory.check_thy *last*;
 
wenzelm 
parents: 
24141 
diff
changeset
 | 
462  | 
in Prf (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
 | 
463  | 
|
| 16533 | 464  | 
|
465  | 
structure ProofData =  | 
|
466  | 
struct  | 
|
467  | 
||
| 
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
 | 
468  | 
fun declare init =  | 
| 16533 | 469  | 
let  | 
470  | 
val k = serial ();  | 
|
| 23944 | 471  | 
val _ = CRITICAL (fn () => change kinds (Datatab.update (k, init)));  | 
| 16533 | 472  | 
in k end;  | 
473  | 
||
474  | 
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
 | 
475  | 
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
 | 
476  | 
SOME x => x  | 
| 
 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 
wenzelm 
parents: 
22827 
diff
changeset
 | 
477  | 
| NONE => invoke_init k (theory_of_proof prf)); (*adhoc value*)  | 
| 16533 | 478  | 
|
| 
19028
 
6c238953f66c
structure Datatab: private copy avoids potential conflict of table exceptions;
 
wenzelm 
parents: 
18931 
diff
changeset
 | 
479  | 
fun put k mk x = map_prf (Datatab.update (k, mk x));  | 
| 16533 | 480  | 
|
481  | 
end;  | 
|
482  | 
||
483  | 
end;  | 
|
484  | 
||
485  | 
||
| 18632 | 486  | 
|
| 16533 | 487  | 
(*** generic context ***)  | 
488  | 
||
| 18632 | 489  | 
datatype generic = Theory of theory | Proof of proof;  | 
490  | 
||
491  | 
fun cases f _ (Theory thy) = f thy  | 
|
492  | 
| cases _ g (Proof prf) = g prf;  | 
|
| 16533 | 493  | 
|
| 19678 | 494  | 
fun mapping f g = cases (Theory o f) (Proof o g);  | 
| 21660 | 495  | 
fun mapping_result f g = cases (apsnd Theory o f) (apsnd Proof o g);  | 
| 19678 | 496  | 
|
| 
23595
 
7ca68a2c8575
the_theory/proof: error instead of exception Fail;
 
wenzelm 
parents: 
23355 
diff
changeset
 | 
497  | 
val the_theory = cases I (fn _ => error "Ill-typed context: theory expected");  | 
| 
 
7ca68a2c8575
the_theory/proof: error instead of exception Fail;
 
wenzelm 
parents: 
23355 
diff
changeset
 | 
498  | 
val the_proof = cases (fn _ => error "Ill-typed context: proof expected") I;  | 
| 16533 | 499  | 
|
| 18731 | 500  | 
fun map_theory f = Theory o f o the_theory;  | 
501  | 
fun map_proof f = Proof o f o the_proof;  | 
|
502  | 
||
| 26486 | 503  | 
fun map_theory_result f = apsnd Theory o f o the_theory;  | 
504  | 
fun map_proof_result f = apsnd Proof o f o the_proof;  | 
|
505  | 
||
| 18731 | 506  | 
fun theory_map f = the_theory o f o Theory;  | 
507  | 
fun proof_map f = the_proof o f o Proof;  | 
|
| 18665 | 508  | 
|
| 18632 | 509  | 
val theory_of = cases I theory_of_proof;  | 
510  | 
val proof_of = cases init_proof I;  | 
|
| 16533 | 511  | 
|
| 
22085
 
c138cfd500f7
ML context: full generic context, tuned signature;
 
wenzelm 
parents: 
21962 
diff
changeset
 | 
512  | 
|
| 
 
c138cfd500f7
ML context: full generic context, tuned signature;
 
wenzelm 
parents: 
21962 
diff
changeset
 | 
513  | 
|
| 
26413
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
514  | 
(** thread data **)  | 
| 
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
515  | 
|
| 
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
516  | 
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
 | 
517  | 
|
| 
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
518  | 
fun thread_data () =  | 
| 28122 | 519  | 
(case Thread.getLocal tag of  | 
| 
26413
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
520  | 
SOME (SOME context) => SOME context  | 
| 
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
521  | 
| _ => NONE);  | 
| 
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
522  | 
|
| 
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
523  | 
fun the_thread_data () =  | 
| 
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
524  | 
(case thread_data () of  | 
| 
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
525  | 
SOME context => context  | 
| 
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
526  | 
| _ => error "Unknown context");  | 
| 
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
527  | 
|
| 28122 | 528  | 
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
 | 
529  | 
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
 | 
530  | 
|
| 26428 | 531  | 
end;  | 
532  | 
||
533  | 
fun >>> f =  | 
|
534  | 
let  | 
|
| 26463 | 535  | 
val (res, context') = f (the_thread_data ());  | 
536  | 
val _ = set_thread_data (SOME context');  | 
|
| 26428 | 537  | 
in res end;  | 
538  | 
||
| 26421 | 539  | 
nonfix >>;  | 
| 26463 | 540  | 
fun >> f = >>> (fn context => ((), f context));  | 
| 
26413
 
003dd6155870
added thread data (formerly global ref in ML/ml_context.ML);
 
wenzelm 
parents: 
24559 
diff
changeset
 | 
541  | 
|
| 26428 | 542  | 
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
 | 
543  | 
|
| 6185 | 544  | 
end;  | 
545  | 
||
546  | 
structure BasicContext: BASIC_CONTEXT = Context;  | 
|
547  | 
open BasicContext;  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
548  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
549  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
550  | 
|
| 16533 | 551  | 
(*** type-safe interfaces for data declarations ***)  | 
552  | 
||
553  | 
(** theory data **)  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
554  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
555  | 
signature THEORY_DATA_ARGS =  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
556  | 
sig  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
557  | 
type T  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
558  | 
val empty: T  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
559  | 
val copy: T -> T  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
560  | 
val extend: T -> T  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
561  | 
val merge: Pretty.pp -> T * T -> T  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
562  | 
end;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
563  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
564  | 
signature THEORY_DATA =  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
565  | 
sig  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
566  | 
type T  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
567  | 
val get: theory -> T  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
568  | 
val put: T -> theory -> theory  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
569  | 
val map: (T -> T) -> theory -> theory  | 
| 
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
 | 
570  | 
val init: theory -> theory  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
571  | 
end;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
572  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
573  | 
functor TheoryDataFun(Data: THEORY_DATA_ARGS): THEORY_DATA =  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
574  | 
struct  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
575  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
576  | 
structure TheoryData = Context.TheoryData;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
577  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
578  | 
type T = Data.T;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
579  | 
exception Data of T;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
580  | 
|
| 
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
 | 
581  | 
val kind = TheoryData.declare  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
582  | 
(Data Data.empty)  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
583  | 
(fn Data x => Data (Data.copy x))  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
584  | 
(fn Data x => Data (Data.extend x))  | 
| 
16489
 
f66ab8a4e98f
improved treatment of intermediate checkpoints: actual copy
 
wenzelm 
parents: 
16436 
diff
changeset
 | 
585  | 
(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
 | 
586  | 
|
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
587  | 
val get = TheoryData.get kind (fn Data x => x);  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
588  | 
val put = TheoryData.put kind Data;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
589  | 
fun map f thy = put (f (get thy)) thy;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
590  | 
|
| 
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
 | 
591  | 
fun init thy = map I 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
 | 
592  | 
|
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
593  | 
end;  | 
| 
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
594  | 
|
| 16533 | 595  | 
|
596  | 
||
597  | 
(** proof data **)  | 
|
598  | 
||
599  | 
signature PROOF_DATA_ARGS =  | 
|
600  | 
sig  | 
|
601  | 
type T  | 
|
602  | 
val init: theory -> T  | 
|
603  | 
end;  | 
|
604  | 
||
605  | 
signature PROOF_DATA =  | 
|
606  | 
sig  | 
|
607  | 
type T  | 
|
608  | 
val get: Context.proof -> T  | 
|
609  | 
val put: T -> Context.proof -> Context.proof  | 
|
610  | 
val map: (T -> T) -> Context.proof -> Context.proof  | 
|
611  | 
end;  | 
|
612  | 
||
613  | 
functor ProofDataFun(Data: PROOF_DATA_ARGS): PROOF_DATA =  | 
|
614  | 
struct  | 
|
615  | 
||
616  | 
structure ProofData = Context.ProofData;  | 
|
617  | 
||
618  | 
type T = Data.T;  | 
|
619  | 
exception Data of T;  | 
|
620  | 
||
| 
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
 | 
621  | 
val kind = ProofData.declare (Data o Data.init);  | 
| 16533 | 622  | 
|
623  | 
val get = ProofData.get kind (fn Data x => x);  | 
|
624  | 
val put = ProofData.put kind Data;  | 
|
625  | 
fun map f prf = put (f (get prf)) prf;  | 
|
626  | 
||
627  | 
end;  | 
|
628  | 
||
| 18632 | 629  | 
|
630  | 
||
631  | 
(** generic data **)  | 
|
632  | 
||
633  | 
signature GENERIC_DATA_ARGS =  | 
|
634  | 
sig  | 
|
635  | 
type T  | 
|
636  | 
val empty: T  | 
|
637  | 
val extend: T -> T  | 
|
638  | 
val merge: Pretty.pp -> T * T -> T  | 
|
639  | 
end;  | 
|
640  | 
||
641  | 
signature GENERIC_DATA =  | 
|
642  | 
sig  | 
|
643  | 
type T  | 
|
644  | 
val get: Context.generic -> T  | 
|
645  | 
val put: T -> Context.generic -> Context.generic  | 
|
646  | 
val map: (T -> T) -> Context.generic -> Context.generic  | 
|
647  | 
end;  | 
|
648  | 
||
649  | 
functor GenericDataFun(Data: GENERIC_DATA_ARGS): GENERIC_DATA =  | 
|
650  | 
struct  | 
|
651  | 
||
| 
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
 | 
652  | 
structure ThyData = TheoryDataFun(open Data val copy = I);  | 
| 
 
22da6c4bc422
simplified DataFun interfaces: removed name/print, use adhoc value for uninitialized data, init only required for impure data;
 
wenzelm 
parents: 
22827 
diff
changeset
 | 
653  | 
structure PrfData = ProofDataFun(type T = Data.T val init = ThyData.get);  | 
| 18632 | 654  | 
|
655  | 
type T = Data.T;  | 
|
656  | 
||
657  | 
fun get (Context.Theory thy) = ThyData.get thy  | 
|
658  | 
| get (Context.Proof prf) = PrfData.get prf;  | 
|
659  | 
||
660  | 
fun put x (Context.Theory thy) = Context.Theory (ThyData.put x thy)  | 
|
661  | 
| put x (Context.Proof prf) = Context.Proof (PrfData.put x prf);  | 
|
662  | 
||
663  | 
fun map f ctxt = put (f (get ctxt)) ctxt;  | 
|
664  | 
||
665  | 
end;  | 
|
666  | 
||
| 16533 | 667  | 
(*hide private interface*)  | 
| 
16436
 
7eb6b6cbd166
added type theory: generic theory contexts with unique identity,
 
wenzelm 
parents: 
15801 
diff
changeset
 | 
668  | 
structure Context: CONTEXT = Context;  | 
| 20297 | 669  | 
|
| 21518 | 670  | 
(*fake predeclarations*)  | 
| 20297 | 671  | 
structure Proof = struct type context = Context.proof end;  | 
| 21518 | 672  | 
structure ProofContext =  | 
673  | 
struct val theory_of = Context.theory_of_proof val init = Context.init_proof end;  |