src/Pure/Isar/theory_target.ML
author wenzelm
Sun, 11 Nov 2007 14:17:15 +0100
changeset 25395 e83bef45e6a7
parent 25392 bb8d225dcf05
child 25462 dad0291cb76a
permissions -rw-r--r--
abbrev: back to PrintMode.internal, which works at least half-way;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
20894
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
     1
(*  Title:      Pure/Isar/theory_target.ML
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
     2
    ID:         $Id$
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
     3
    Author:     Makarius
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
     4
24935
a033971c63a0 removed LocalTheory.defs/target_morphism operations;
wenzelm
parents: 24914
diff changeset
     5
Common theory/locale/class targets.
20894
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
     6
*)
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
     7
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
     8
signature THEORY_TARGET =
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
     9
sig
25012
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
    10
  val peek: local_theory -> {target: string, is_locale: bool, is_class: bool}
25269
f9090ae5cec9 clarified theory target interface
haftmann
parents: 25240
diff changeset
    11
  val init: string option -> theory -> local_theory
24935
a033971c63a0 removed LocalTheory.defs/target_morphism operations;
wenzelm
parents: 24914
diff changeset
    12
  val begin: string -> Proof.context -> local_theory
25291
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
    13
  val context: xstring -> theory -> local_theory
20894
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    14
end;
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    15
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    16
structure TheoryTarget: THEORY_TARGET =
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    17
struct
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    18
21006
ac2732072403 added peek;
wenzelm
parents: 20984
diff changeset
    19
(* context data *)
ac2732072403 added peek;
wenzelm
parents: 20984
diff changeset
    20
25012
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
    21
datatype target = Target of {target: string, is_locale: bool, is_class: bool};
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
    22
25291
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
    23
fun make_target target is_locale is_class =
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
    24
  Target {target = target, is_locale = is_locale, is_class = is_class};
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
    25
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
    26
val global_target = make_target "" false false;
25012
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
    27
21006
ac2732072403 added peek;
wenzelm
parents: 20984
diff changeset
    28
structure Data = ProofDataFun
ac2732072403 added peek;
wenzelm
parents: 20984
diff changeset
    29
(
25012
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
    30
  type T = target;
25291
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
    31
  fun init _ = global_target;
21006
ac2732072403 added peek;
wenzelm
parents: 20984
diff changeset
    32
);
ac2732072403 added peek;
wenzelm
parents: 20984
diff changeset
    33
25012
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
    34
val peek = (fn Target args => args) o Data.get;
21006
ac2732072403 added peek;
wenzelm
parents: 20984
diff changeset
    35
ac2732072403 added peek;
wenzelm
parents: 20984
diff changeset
    36
20894
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    37
(* pretty *)
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    38
25012
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
    39
fun pretty (Target {target, is_locale, is_class}) ctxt =
20894
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    40
  let
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    41
    val thy = ProofContext.theory_of ctxt;
25012
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
    42
    val target_name = (if is_class then "class " else "locale ") ^ Locale.extern thy target;
20894
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    43
    val fixes = map (fn (x, T) => (x, SOME T, NoSyn)) (#1 (ProofContext.inferred_fixes ctxt));
21585
2444f1d1127b Assumption.assms_of: cterm;
wenzelm
parents: 21570
diff changeset
    44
    val assumes = map (fn A => (("", []), [(A, [])])) (map Thm.term_of (Assumption.assms_of ctxt));
20894
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    45
    val elems =
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    46
      (if null fixes then [] else [Element.Fixes fixes]) @
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    47
      (if null assumes then [] else [Element.Assumes assumes]);
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    48
  in
24939
wenzelm
parents: 24935
diff changeset
    49
    Pretty.block [Pretty.str "theory", Pretty.brk 1, Pretty.str (Context.theory_name thy)] ::
25012
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
    50
     (if target = "" then []
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
    51
      else if null elems then [Pretty.str target_name]
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
    52
      else [Pretty.big_list (target_name ^ " =")
24939
wenzelm
parents: 24935
diff changeset
    53
        (map (Pretty.chunks o Element.pretty_ctxt ctxt) elems)])
20894
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    54
  end;
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    55
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    56
24838
1d1bddf87353 put declarations first
haftmann
parents: 24818
diff changeset
    57
(* target declarations *)
1d1bddf87353 put declarations first
haftmann
parents: 24818
diff changeset
    58
25012
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
    59
fun target_decl add (Target {target, ...}) d lthy =
24838
1d1bddf87353 put declarations first
haftmann
parents: 24818
diff changeset
    60
  let
24935
a033971c63a0 removed LocalTheory.defs/target_morphism operations;
wenzelm
parents: 24914
diff changeset
    61
    val d' = Morphism.transform (LocalTheory.target_morphism lthy) d;
24838
1d1bddf87353 put declarations first
haftmann
parents: 24818
diff changeset
    62
    val d0 = Morphism.form d';
1d1bddf87353 put declarations first
haftmann
parents: 24818
diff changeset
    63
  in
25012
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
    64
    if target = "" then
24838
1d1bddf87353 put declarations first
haftmann
parents: 24818
diff changeset
    65
      lthy
1d1bddf87353 put declarations first
haftmann
parents: 24818
diff changeset
    66
      |> LocalTheory.theory (Context.theory_map d0)
1d1bddf87353 put declarations first
haftmann
parents: 24818
diff changeset
    67
      |> LocalTheory.target (Context.proof_map d0)
1d1bddf87353 put declarations first
haftmann
parents: 24818
diff changeset
    68
    else
1d1bddf87353 put declarations first
haftmann
parents: 24818
diff changeset
    69
      lthy
25012
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
    70
      |> LocalTheory.target (add target d')
24838
1d1bddf87353 put declarations first
haftmann
parents: 24818
diff changeset
    71
  end;
1d1bddf87353 put declarations first
haftmann
parents: 24818
diff changeset
    72
1d1bddf87353 put declarations first
haftmann
parents: 24818
diff changeset
    73
val type_syntax = target_decl Locale.add_type_syntax;
1d1bddf87353 put declarations first
haftmann
parents: 24818
diff changeset
    74
val term_syntax = target_decl Locale.add_term_syntax;
1d1bddf87353 put declarations first
haftmann
parents: 24818
diff changeset
    75
val declaration = target_decl Locale.add_declaration;
1d1bddf87353 put declarations first
haftmann
parents: 24818
diff changeset
    76
25105
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
    77
fun class_target (Target {target, ...}) f =
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
    78
  LocalTheory.raw_theory f #>
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
    79
  LocalTheory.target (Class.refresh_syntax target);
24838
1d1bddf87353 put declarations first
haftmann
parents: 24818
diff changeset
    80
21611
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
    81
20894
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    82
(* notes *)
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
    83
21611
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
    84
fun import_export_proof ctxt (name, raw_th) =
21594
2859c94d67d4 reworked notes: towards proper import/export of proof terms;
wenzelm
parents: 21585
diff changeset
    85
  let
21611
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
    86
    val thy = ProofContext.theory_of ctxt;
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
    87
    val thy_ctxt = ProofContext.init thy;
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
    88
    val certT = Thm.ctyp_of thy;
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
    89
    val cert = Thm.cterm_of thy;
21594
2859c94d67d4 reworked notes: towards proper import/export of proof terms;
wenzelm
parents: 21585
diff changeset
    90
21611
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
    91
    (*export assumes/defines*)
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
    92
    val th = Goal.norm_result raw_th;
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
    93
    val (defs, th') = LocalDefs.export ctxt thy_ctxt th;
21708
45e7491bea47 reorganized structure Tactic vs. MetaSimplifier;
wenzelm
parents: 21691
diff changeset
    94
    val concl_conv = MetaSimplifier.rewrite true defs (Thm.cprop_of th);
45e7491bea47 reorganized structure Tactic vs. MetaSimplifier;
wenzelm
parents: 21691
diff changeset
    95
    val assms = map (MetaSimplifier.rewrite_rule defs o Thm.assume) (Assumption.assms_of ctxt);
21611
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
    96
    val nprems = Thm.nprems_of th' - Thm.nprems_of th;
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
    97
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
    98
    (*export fixes*)
22692
1e057a3f087d proper ProofContext.infer_types;
wenzelm
parents: 22673
diff changeset
    99
    val tfrees = map TFree (Thm.fold_terms Term.add_tfrees th' []);
1e057a3f087d proper ProofContext.infer_types;
wenzelm
parents: 22673
diff changeset
   100
    val frees = map Free (Thm.fold_terms Term.add_frees th' []);
21611
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   101
    val (th'' :: vs) = (th' :: map (Drule.mk_term o cert) (map Logic.mk_type tfrees @ frees))
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   102
      |> Variable.export ctxt thy_ctxt
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   103
      |> Drule.zero_var_indexes_list;
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   104
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   105
    (*thm definition*)
21644
5154a7213d3c notes: added non-official name;
wenzelm
parents: 21615
diff changeset
   106
    val result = th''
5154a7213d3c notes: added non-official name;
wenzelm
parents: 21615
diff changeset
   107
      |> PureThy.name_thm true true ""
5154a7213d3c notes: added non-official name;
wenzelm
parents: 21615
diff changeset
   108
      |> Goal.close_result
24779
2949fb459c7b keep context position as tags for consts/thms;
wenzelm
parents: 24748
diff changeset
   109
      |> fold PureThy.tag_rule (ContextPosition.properties_of ctxt)
21644
5154a7213d3c notes: added non-official name;
wenzelm
parents: 21615
diff changeset
   110
      |> PureThy.name_thm true true name;
21611
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   111
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   112
    (*import fixes*)
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   113
    val (tvars, vars) =
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   114
      chop (length tfrees) (map (Thm.term_of o Drule.dest_term) vs)
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   115
      |>> map Logic.dest_type;
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   116
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   117
    val instT = map_filter (fn (TVar v, T) => SOME (v, T) | _ => NONE) (tvars ~~ tfrees);
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   118
    val inst = filter (is_Var o fst) (vars ~~ frees);
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   119
    val cinstT = map (pairself certT o apfst TVar) instT;
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   120
    val cinst = map (pairself (cert o Term.map_types (TermSubst.instantiateT instT))) inst;
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   121
    val result' = Thm.instantiate (cinstT, cinst) result;
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   122
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   123
    (*import assumes/defines*)
21594
2859c94d67d4 reworked notes: towards proper import/export of proof terms;
wenzelm
parents: 21585
diff changeset
   124
    val assm_tac = FIRST' (map (fn assm => Tactic.compose_tac (false, assm, 0)) assms);
21611
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   125
    val result'' =
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   126
      (case SINGLE (Seq.INTERVAL assm_tac 1 nprems) result' of
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   127
        NONE => raise THM ("Failed to re-import result", 0, [result'])
21845
da545169fe06 defs/notes: more robust transitivity reasoning;
wenzelm
parents: 21825
diff changeset
   128
      | SOME res => LocalDefs.trans_props ctxt [res, Thm.symmetric concl_conv])
21644
5154a7213d3c notes: added non-official name;
wenzelm
parents: 21615
diff changeset
   129
      |> Goal.norm_result
5154a7213d3c notes: added non-official name;
wenzelm
parents: 21615
diff changeset
   130
      |> PureThy.name_thm false false name;
21611
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   131
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   132
  in (result'', result) end;
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   133
25022
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   134
fun notes (Target {target, is_locale, ...}) kind facts lthy =
21585
2444f1d1127b Assumption.assms_of: cterm;
wenzelm
parents: 21570
diff changeset
   135
  let
21594
2859c94d67d4 reworked notes: towards proper import/export of proof terms;
wenzelm
parents: 21585
diff changeset
   136
    val thy = ProofContext.theory_of lthy;
21615
1bd558879c44 notes: proper naming of thm proof, activated import_export_proof;
wenzelm
parents: 21613
diff changeset
   137
    val full = LocalTheory.full_name lthy;
21585
2444f1d1127b Assumption.assms_of: cterm;
wenzelm
parents: 21570
diff changeset
   138
21594
2859c94d67d4 reworked notes: towards proper import/export of proof terms;
wenzelm
parents: 21585
diff changeset
   139
    val facts' = facts
21615
1bd558879c44 notes: proper naming of thm proof, activated import_export_proof;
wenzelm
parents: 21613
diff changeset
   140
      |> map (fn (a, bs) => (a, PureThy.burrow_fact (PureThy.name_multi (full (fst a))) bs))
1bd558879c44 notes: proper naming of thm proof, activated import_export_proof;
wenzelm
parents: 21613
diff changeset
   141
      |> PureThy.map_facts (import_export_proof lthy);
21611
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   142
    val local_facts = PureThy.map_facts #1 facts'
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   143
      |> Attrib.map_facts (Attrib.attribute_i thy);
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   144
    val target_facts = PureThy.map_facts #1 facts'
25012
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
   145
      |> is_locale ? Element.facts_map (Element.morph_ctxt (LocalTheory.target_morphism lthy));
21611
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   146
    val global_facts = PureThy.map_facts #2 facts'
25012
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
   147
      |> Attrib.map_facts (if is_locale then K I else Attrib.attribute_i thy);
21594
2859c94d67d4 reworked notes: towards proper import/export of proof terms;
wenzelm
parents: 21585
diff changeset
   148
  in
21611
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   149
    lthy |> LocalTheory.theory
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   150
      (Sign.qualified_names
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   151
        #> PureThy.note_thmss_i kind global_facts #> snd
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   152
        #> Sign.restore_naming thy)
21585
2444f1d1127b Assumption.assms_of: cterm;
wenzelm
parents: 21570
diff changeset
   153
25012
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
   154
    |> is_locale ? LocalTheory.target (Locale.add_thmss target kind target_facts)
21594
2859c94d67d4 reworked notes: towards proper import/export of proof terms;
wenzelm
parents: 21585
diff changeset
   155
20894
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
   156
    |> ProofContext.qualified_names
21611
fc95ff1fe738 notes: proper import/export of proofs (still inactive);
wenzelm
parents: 21594
diff changeset
   157
    |> ProofContext.note_thmss_i kind local_facts
20894
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
   158
    ||> ProofContext.restore_naming lthy
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
   159
  end;
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
   160
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
   161
25105
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   162
(* declare_const *)
24939
wenzelm
parents: 24935
diff changeset
   163
25105
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   164
fun fork_mixfix (Target {is_locale, is_class, ...}) mx =
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   165
  if not is_locale then (NoSyn, NoSyn, mx)
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   166
  else if not is_class then (NoSyn, mx, NoSyn)
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   167
  else (mx, NoSyn, NoSyn);
25068
a11d25316c3d tuned fork_mixfix (back from class.ML);
wenzelm
parents: 25064
diff changeset
   168
25212
9dd61cb753ae locale_const: in_class workaround prevents additional locale version of class consts;
wenzelm
parents: 25150
diff changeset
   169
fun locale_const (Target {target, is_class, ...}) (prmode as (mode, _)) pos ((c, mx), rhs) phi =
24939
wenzelm
parents: 24935
diff changeset
   170
  let
wenzelm
parents: 24935
diff changeset
   171
    val c' = Morphism.name phi c;
wenzelm
parents: 24935
diff changeset
   172
    val rhs' = Morphism.term phi rhs;
25053
2b86fac03ec5 misc cleanup of abbrev/local_const;
wenzelm
parents: 25040
diff changeset
   173
    val legacy_arg = (c', Term.close_schematic_term (Logic.legacy_varify rhs'));
2b86fac03ec5 misc cleanup of abbrev/local_const;
wenzelm
parents: 25040
diff changeset
   174
    val arg = (c', Term.close_schematic_term rhs');
25372
a718f1ccaf1a locale_const: suppress in class body as well (prevents qualified printing);
wenzelm
parents: 25320
diff changeset
   175
    val similar_body = Type.similar_types (rhs, rhs');
25212
9dd61cb753ae locale_const: in_class workaround prevents additional locale version of class consts;
wenzelm
parents: 25150
diff changeset
   176
    (* FIXME workaround based on educated guess *)
25372
a718f1ccaf1a locale_const: suppress in class body as well (prevents qualified printing);
wenzelm
parents: 25320
diff changeset
   177
    val class_global = c' = NameSpace.qualified (Class.class_prefix target) c;
24939
wenzelm
parents: 24935
diff changeset
   178
  in
25372
a718f1ccaf1a locale_const: suppress in class body as well (prevents qualified printing);
wenzelm
parents: 25320
diff changeset
   179
    not (is_class andalso (similar_body orelse class_global)) ?
25212
9dd61cb753ae locale_const: in_class workaround prevents additional locale version of class consts;
wenzelm
parents: 25150
diff changeset
   180
      (Context.mapping_result
9dd61cb753ae locale_const: in_class workaround prevents additional locale version of class consts;
wenzelm
parents: 25150
diff changeset
   181
        (Sign.add_abbrev PrintMode.internal pos legacy_arg)
9dd61cb753ae locale_const: in_class workaround prevents additional locale version of class consts;
wenzelm
parents: 25150
diff changeset
   182
        (ProofContext.add_abbrev PrintMode.internal pos arg)
9dd61cb753ae locale_const: in_class workaround prevents additional locale version of class consts;
wenzelm
parents: 25150
diff changeset
   183
      #-> (fn (lhs' as Const (d, _), _) =>
25372
a718f1ccaf1a locale_const: suppress in class body as well (prevents qualified printing);
wenzelm
parents: 25320
diff changeset
   184
          similar_body ?
25212
9dd61cb753ae locale_const: in_class workaround prevents additional locale version of class consts;
wenzelm
parents: 25150
diff changeset
   185
            (Context.mapping (Sign.revert_abbrev mode d) (ProofContext.revert_abbrev mode d) #>
9dd61cb753ae locale_const: in_class workaround prevents additional locale version of class consts;
wenzelm
parents: 25150
diff changeset
   186
             Morphism.form (ProofContext.target_notation true prmode [(lhs', mx)]))))
24939
wenzelm
parents: 24935
diff changeset
   187
  end;
wenzelm
parents: 24935
diff changeset
   188
25105
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   189
fun declare_const (ta as Target {target, is_locale, is_class}) depends ((c, T), mx) lthy =
24939
wenzelm
parents: 24935
diff changeset
   190
  let
25053
2b86fac03ec5 misc cleanup of abbrev/local_const;
wenzelm
parents: 25040
diff changeset
   191
    val pos = ContextPosition.properties_of lthy;
24939
wenzelm
parents: 24935
diff changeset
   192
    val xs = filter depends (#1 (ProofContext.inferred_fixes (LocalTheory.target_of lthy)));
25105
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   193
    val U = map #2 xs ---> T;
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   194
    val (mx1, mx2, mx3) = fork_mixfix ta mx;
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   195
    val (const, lthy') = lthy |> LocalTheory.theory_result (Sign.declare_const pos (c, U, mx3));
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   196
    val t = Term.list_comb (const, map Free xs);
24939
wenzelm
parents: 24935
diff changeset
   197
  in
wenzelm
parents: 24935
diff changeset
   198
    lthy'
25212
9dd61cb753ae locale_const: in_class workaround prevents additional locale version of class consts;
wenzelm
parents: 25150
diff changeset
   199
    |> is_locale ? term_syntax ta (locale_const ta Syntax.mode_default pos ((c, mx2), t))
25105
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   200
    |> is_class ? class_target ta (Class.add_logical_const target pos ((c, mx1), t))
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   201
    |> LocalDefs.add_def ((c, NoSyn), t)
24939
wenzelm
parents: 24935
diff changeset
   202
  end;
wenzelm
parents: 24935
diff changeset
   203
wenzelm
parents: 24935
diff changeset
   204
wenzelm
parents: 24935
diff changeset
   205
(* abbrev *)
wenzelm
parents: 24935
diff changeset
   206
25105
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   207
fun abbrev (ta as Target {target, is_locale, is_class}) prmode ((c, mx), t) lthy =
24939
wenzelm
parents: 24935
diff changeset
   208
  let
25053
2b86fac03ec5 misc cleanup of abbrev/local_const;
wenzelm
parents: 25040
diff changeset
   209
    val pos = ContextPosition.properties_of lthy;
2b86fac03ec5 misc cleanup of abbrev/local_const;
wenzelm
parents: 25040
diff changeset
   210
    val thy_ctxt = ProofContext.init (ProofContext.theory_of lthy);
25012
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
   211
    val target_ctxt = LocalTheory.target_of lthy;
25105
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   212
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   213
    val (mx1, mx2, mx3) = fork_mixfix ta mx;
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   214
    val t' = Assumption.export_term lthy target_ctxt t;
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   215
    val xs = map Free (rev (Variable.add_fixed target_ctxt t' []));
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   216
    val u = fold_rev lambda xs t';
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   217
    val global_rhs =
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   218
      singleton (Variable.export_terms (Variable.declare_term u target_ctxt) thy_ctxt) u;
25121
fbea3ca04d51 tuned abbrev interface;
wenzelm
parents: 25105
diff changeset
   219
  in
fbea3ca04d51 tuned abbrev interface;
wenzelm
parents: 25105
diff changeset
   220
    lthy |>
fbea3ca04d51 tuned abbrev interface;
wenzelm
parents: 25105
diff changeset
   221
     (if is_locale then
25395
e83bef45e6a7 abbrev: back to PrintMode.internal, which works at least half-way;
wenzelm
parents: 25392
diff changeset
   222
        LocalTheory.theory_result (Sign.add_abbrev PrintMode.internal pos (c, global_rhs))
25121
fbea3ca04d51 tuned abbrev interface;
wenzelm
parents: 25105
diff changeset
   223
        #-> (fn (lhs, _) =>
25105
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   224
          let val lhs' = Term.list_comb (Logic.unvarify lhs, xs) in
25212
9dd61cb753ae locale_const: in_class workaround prevents additional locale version of class consts;
wenzelm
parents: 25150
diff changeset
   225
            term_syntax ta (locale_const ta prmode pos ((c, mx2), lhs')) #>
25150
wenzelm
parents: 25146
diff changeset
   226
            is_class ? class_target ta (Class.add_syntactic_const target prmode pos ((c, mx1), t'))
25105
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   227
          end)
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   228
      else
25121
fbea3ca04d51 tuned abbrev interface;
wenzelm
parents: 25105
diff changeset
   229
        LocalTheory.theory
25105
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   230
          (Sign.add_abbrev (#1 prmode) pos (c, global_rhs) #-> (fn (lhs, _) =>
25121
fbea3ca04d51 tuned abbrev interface;
wenzelm
parents: 25105
diff changeset
   231
           Sign.notation true prmode [(lhs, mx3)])))
fbea3ca04d51 tuned abbrev interface;
wenzelm
parents: 25105
diff changeset
   232
    |> ProofContext.add_abbrev PrintMode.internal pos (c, t) |> snd
fbea3ca04d51 tuned abbrev interface;
wenzelm
parents: 25105
diff changeset
   233
    |> LocalDefs.fixed_abbrev ((c, NoSyn), t)
24939
wenzelm
parents: 24935
diff changeset
   234
  end;
wenzelm
parents: 24935
diff changeset
   235
wenzelm
parents: 24935
diff changeset
   236
25022
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   237
(* define *)
24939
wenzelm
parents: 24935
diff changeset
   238
25022
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   239
fun define (ta as Target {target, is_locale, is_class})
25012
448af76a1ba3 pass explicit target record -- more informative peek operation;
wenzelm
parents: 25002
diff changeset
   240
    kind ((c, mx), ((name, atts), rhs)) lthy =
24939
wenzelm
parents: 24935
diff changeset
   241
  let
24987
50b07326da38 local_theory: incorporated consts into axioms;
wenzelm
parents: 24983
diff changeset
   242
    val thy = ProofContext.theory_of lthy;
24939
wenzelm
parents: 24935
diff changeset
   243
    val thy_ctxt = ProofContext.init thy;
wenzelm
parents: 24935
diff changeset
   244
25022
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   245
    val name' = Thm.def_name_optional c name;
24987
50b07326da38 local_theory: incorporated consts into axioms;
wenzelm
parents: 24983
diff changeset
   246
    val (rhs', rhs_conv) =
50b07326da38 local_theory: incorporated consts into axioms;
wenzelm
parents: 24983
diff changeset
   247
      LocalDefs.export_cterm lthy thy_ctxt (Thm.cterm_of thy rhs) |>> Thm.term_of;
50b07326da38 local_theory: incorporated consts into axioms;
wenzelm
parents: 24983
diff changeset
   248
    val xs = Variable.add_fixed (LocalTheory.target_of lthy) rhs' [];
24939
wenzelm
parents: 24935
diff changeset
   249
    val T = Term.fastype_of rhs;
wenzelm
parents: 24935
diff changeset
   250
25105
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   251
    (*const*)
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   252
    val ((lhs, local_def), lthy2) = lthy |> declare_const ta (member (op =) xs) ((c, T), mx);
25022
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   253
    val (_, lhs') = Logic.dest_equals (Thm.prop_of local_def);
24939
wenzelm
parents: 24935
diff changeset
   254
wenzelm
parents: 24935
diff changeset
   255
    (*def*)
25022
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   256
    val (global_def, lthy3) = lthy2
24983
f2f4ba67cef1 replaced Term.equiv_types by Type.similar_types;
wenzelm
parents: 24959
diff changeset
   257
      |> LocalTheory.theory_result (Thm.add_def false (name', Logic.mk_equals (lhs', rhs')));
25022
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   258
    val def = LocalDefs.trans_terms lthy3
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   259
      [(*c == global.c xs*)     local_def,
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   260
       (*global.c xs == rhs'*)  global_def,
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   261
       (*rhs' == rhs*)          Thm.symmetric rhs_conv];
24939
wenzelm
parents: 24935
diff changeset
   262
25105
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   263
    (*note*)
24939
wenzelm
parents: 24935
diff changeset
   264
    val ([(res_name, [res])], lthy4) = lthy3
25022
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   265
      |> notes ta kind [((name', atts), [([def], [])])];
24939
wenzelm
parents: 24935
diff changeset
   266
  in ((lhs, (res_name, res)), lthy4) end;
wenzelm
parents: 24935
diff changeset
   267
wenzelm
parents: 24935
diff changeset
   268
wenzelm
parents: 24935
diff changeset
   269
(* axioms *)
wenzelm
parents: 24935
diff changeset
   270
25022
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   271
fun axioms ta kind (vars, specs) lthy =
24939
wenzelm
parents: 24935
diff changeset
   272
  let
25022
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   273
    val thy_ctxt = ProofContext.init (ProofContext.theory_of lthy);
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   274
    val expanded_props = map (Assumption.export_term lthy thy_ctxt) (maps snd specs);
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   275
    val xs = fold Term.add_frees expanded_props [];
24989
e656aeaa8b28 local_axioms: impose hyps stemming from local consts as well
wenzelm
parents: 24987
diff changeset
   276
25022
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   277
    (*consts*)
25105
c9f67836c4d8 internal tuning: class_target, fork_mixfix, declare_const (singleton), abbrev;
wenzelm
parents: 25096
diff changeset
   278
    val (consts, lthy') = fold_map (declare_const ta (member (op =) xs)) vars lthy;
25022
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   279
    val global_consts = map (Term.dest_Const o Term.head_of o Thm.term_of o Thm.rhs_of o #2) consts;
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   280
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   281
    (*axioms*)
24989
e656aeaa8b28 local_axioms: impose hyps stemming from local consts as well
wenzelm
parents: 24987
diff changeset
   282
    val hyps = map Thm.term_of (Assumption.assms_of lthy');
24939
wenzelm
parents: 24935
diff changeset
   283
    fun axiom ((name, atts), props) thy = thy
24983
f2f4ba67cef1 replaced Term.equiv_types by Type.similar_types;
wenzelm
parents: 24959
diff changeset
   284
      |> fold_map (Thm.add_axiom hyps) (PureThy.name_multi name props)
24939
wenzelm
parents: 24935
diff changeset
   285
      |-> (fn ths => pair ((name, atts), [(ths, [])]));
wenzelm
parents: 24935
diff changeset
   286
  in
24987
50b07326da38 local_theory: incorporated consts into axioms;
wenzelm
parents: 24983
diff changeset
   287
    lthy'
25022
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   288
    |> fold Variable.declare_term expanded_props
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   289
    |> LocalTheory.theory (fold (fn c => Theory.add_deps "" c []) global_consts)
24939
wenzelm
parents: 24935
diff changeset
   290
    |> LocalTheory.theory_result (fold_map axiom specs)
25022
bb0dcb603a13 abbrev: return hypothetical def;
wenzelm
parents: 25012
diff changeset
   291
    |-> notes ta kind
24987
50b07326da38 local_theory: incorporated consts into axioms;
wenzelm
parents: 24983
diff changeset
   292
    |>> pair (map #1 consts)
24939
wenzelm
parents: 24935
diff changeset
   293
  end;
wenzelm
parents: 24935
diff changeset
   294
wenzelm
parents: 24935
diff changeset
   295
25291
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   296
(* init *)
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   297
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   298
local
20894
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
   299
25291
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   300
fun init_target _ NONE = global_target
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   301
  | init_target thy (SOME target) = make_target target true (Class.is_class thy target);
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   302
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   303
fun init_ctxt (Target {target, is_locale, is_class}) =
25320
wenzelm
parents: 25311
diff changeset
   304
  if not is_locale then ProofContext.init
wenzelm
parents: 25311
diff changeset
   305
  else if not is_class then Locale.init target
wenzelm
parents: 25311
diff changeset
   306
  else Class.init target;
25269
f9090ae5cec9 clarified theory target interface
haftmann
parents: 25240
diff changeset
   307
25291
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   308
fun init_lthy (ta as Target {target, ...}) =
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   309
  Data.put ta #>
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   310
  LocalTheory.init (NameSpace.base target)
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   311
   {pretty = pretty ta,
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   312
    axioms = axioms ta,
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   313
    abbrev = abbrev ta,
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   314
    define = define ta,
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   315
    notes = notes ta,
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   316
    type_syntax = type_syntax ta,
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   317
    term_syntax = term_syntax ta,
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   318
    declaration = declaration ta,
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   319
    reinit = fn lthy => init_lthy_ctxt ta (ProofContext.theory_of lthy),
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   320
    exit = LocalTheory.target_of}
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   321
and init_lthy_ctxt ta = init_lthy ta o init_ctxt ta;
20894
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
   322
25291
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   323
in
20894
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
   324
25291
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   325
fun init target thy = init_lthy_ctxt (init_target thy target) thy;
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   326
fun begin target ctxt = init_lthy (init_target (ProofContext.theory_of ctxt) (SOME target)) ctxt;
25269
f9090ae5cec9 clarified theory target interface
haftmann
parents: 25240
diff changeset
   327
25291
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   328
fun context "-" thy = init NONE thy
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   329
  | context target thy = init (SOME (Locale.intern thy target)) thy;
20894
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
   330
784eefc906aa Common theory targets.
wenzelm
parents:
diff changeset
   331
end;
25291
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   332
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   333
end;
870455627720 misc cleanup of init functions;
wenzelm
parents: 25269
diff changeset
   334