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