src/Pure/display.ML
author blanchet
Wed, 04 Mar 2009 10:45:52 +0100
changeset 30240 5b25fee0362c
parent 30186 1f836e949ac2
child 30412 6037cac149a1
permissions -rw-r--r--
Merge.
paulson@1591
     1
(*  Title:      Pure/display.ML
paulson@1591
     2
    Author:     Lawrence C Paulson, Cambridge University Computer Laboratory
paulson@1591
     3
    Copyright   1993  University of Cambridge
paulson@1591
     4
wenzelm@19420
     5
Printing of theorems, goals, results etc.
paulson@1591
     6
*)
paulson@1591
     7
wenzelm@11883
     8
signature BASIC_DISPLAY =
wenzelm@11883
     9
sig
wenzelm@12081
    10
  val goals_limit: int ref
wenzelm@11883
    11
  val show_hyps: bool ref
wenzelm@11883
    12
  val show_tags: bool ref
wenzelm@11883
    13
  val show_consts: bool ref
wenzelm@11883
    14
end;
wenzelm@11883
    15
paulson@1591
    16
signature DISPLAY =
wenzelm@4950
    17
sig
wenzelm@11883
    18
  include BASIC_DISPLAY
wenzelm@14876
    19
  val pretty_flexpair: Pretty.pp -> term * term -> Pretty.T
wenzelm@17447
    20
  val pretty_thm_aux: Pretty.pp -> bool -> bool -> term list -> thm -> Pretty.T
wenzelm@11883
    21
  val pretty_thm: thm -> Pretty.T
wenzelm@26928
    22
  val string_of_thm: thm -> string
wenzelm@11883
    23
  val pretty_thms: thm list -> Pretty.T
wenzelm@16437
    24
  val pretty_thm_sg: theory -> thm -> Pretty.T
wenzelm@16437
    25
  val pretty_thms_sg: theory -> thm list -> Pretty.T
wenzelm@26928
    26
  val print_thm: thm -> unit
wenzelm@26928
    27
  val print_thms: thm list -> unit
wenzelm@26928
    28
  val prth: thm -> thm
wenzelm@26928
    29
  val prthq: thm Seq.seq -> thm Seq.seq
wenzelm@26928
    30
  val prths: thm list -> thm list
wenzelm@11883
    31
  val pretty_ctyp: ctyp -> Pretty.T
wenzelm@26928
    32
  val string_of_ctyp: ctyp -> string
wenzelm@26928
    33
  val print_ctyp: ctyp -> unit
wenzelm@11883
    34
  val pretty_cterm: cterm -> Pretty.T
wenzelm@26928
    35
  val string_of_cterm: cterm -> string
wenzelm@26928
    36
  val print_cterm: cterm -> unit
wenzelm@26928
    37
  val print_syntax: theory -> unit
wenzelm@20629
    38
  val pretty_full_theory: bool -> theory -> Pretty.T list
wenzelm@23634
    39
  val pretty_goals_aux: Pretty.pp -> Markup.T -> bool * bool -> int -> thm -> Pretty.T list
wenzelm@11883
    40
  val pretty_goals: int -> thm -> Pretty.T list
wenzelm@11883
    41
  val print_goals: int -> thm -> unit
wenzelm@4950
    42
end;
paulson@1591
    43
wenzelm@4950
    44
structure Display: DISPLAY =
paulson@1591
    45
struct
paulson@1591
    46
wenzelm@11883
    47
wenzelm@6087
    48
(** print thm **)
wenzelm@6087
    49
wenzelm@16534
    50
val goals_limit = ref 10;       (*max number of goals to print*)
wenzelm@12831
    51
val show_hyps = ref false;      (*false: print meta-hypotheses as dots*)
wenzelm@11883
    52
val show_tags = ref false;      (*false: suppress tags*)
wenzelm@6087
    53
wenzelm@28840
    54
fun pretty_tag (name, arg) = Pretty.strs [name, quote arg];
wenzelm@6087
    55
val pretty_tags = Pretty.list "[" "]" o map pretty_tag;
paulson@1591
    56
wenzelm@14876
    57
fun pretty_flexpair pp (t, u) = Pretty.block
wenzelm@14876
    58
  [Pretty.term pp t, Pretty.str " =?=", Pretty.brk 1, Pretty.term pp u];
berghofe@13658
    59
wenzelm@17447
    60
fun pretty_thm_aux pp quote show_hyps' asms raw_th =
paulson@1591
    61
  let
wenzelm@17447
    62
    val th = Thm.strip_shyps raw_th;
wenzelm@28316
    63
    val {hyps, tpairs, prop, ...} = Thm.rep_thm th;
wenzelm@6087
    64
    val xshyps = Thm.extra_shyps th;
wenzelm@21646
    65
    val tags = Thm.get_tags th;
wenzelm@6087
    66
berghofe@13658
    67
    val q = if quote then Pretty.quote else I;
wenzelm@22878
    68
    val prt_term = q o Pretty.term pp;
wenzelm@6279
    69
wenzelm@19300
    70
    val hyps' = if ! show_hyps then hyps else subtract (op aconv) asms hyps;
wenzelm@28802
    71
(* FIXME
wenzelm@28802
    72
    val ora' = Thm.oracle_of th andalso (! show_hyps orelse not (! quick_and_dirty)); *)
wenzelm@28802
    73
    val ora' = false;
wenzelm@28802
    74
wenzelm@17447
    75
    val hlen = length xshyps + length hyps' + length tpairs;
paulson@1591
    76
    val hsymbs =
wenzelm@17475
    77
      if hlen = 0 andalso not ora' then []
wenzelm@17447
    78
      else if ! show_hyps orelse show_hyps' then
paulson@1591
    79
        [Pretty.brk 2, Pretty.list "[" "]"
wenzelm@17447
    80
          (map (q o pretty_flexpair pp) tpairs @ map prt_term hyps' @
wenzelm@14876
    81
           map (Pretty.sort pp) xshyps @
wenzelm@17475
    82
            (if ora' then [Pretty.str "!"] else []))]
wenzelm@6889
    83
      else [Pretty.brk 2, Pretty.str ("[" ^ implode (replicate hlen ".") ^
wenzelm@17475
    84
        (if ora' then "!" else "") ^ "]")];
wenzelm@6087
    85
    val tsymbs =
wenzelm@6087
    86
      if null tags orelse not (! show_tags) then []
wenzelm@6087
    87
      else [Pretty.brk 1, pretty_tags tags];
wenzelm@6279
    88
  in Pretty.block (prt_term prop :: (hsymbs @ tsymbs)) end;
paulson@1591
    89
wenzelm@20226
    90
fun pretty_thm th =
wenzelm@26939
    91
  pretty_thm_aux (Syntax.pp_global (Thm.theory_of_thm th)) true false [] th;
wenzelm@6889
    92
paulson@1591
    93
val string_of_thm = Pretty.string_of o pretty_thm;
paulson@1591
    94
wenzelm@6087
    95
fun pretty_thms [th] = pretty_thm th
wenzelm@6087
    96
  | pretty_thms ths = Pretty.block (Pretty.fbreaks (map pretty_thm ths));
paulson@1591
    97
wenzelm@16437
    98
val pretty_thm_sg = pretty_thm oo Thm.transfer;
wenzelm@16437
    99
val pretty_thms_sg = pretty_thms oo (map o Thm.transfer);
wenzelm@10010
   100
wenzelm@6087
   101
wenzelm@6087
   102
(* top-level commands for printing theorems *)
wenzelm@6087
   103
wenzelm@6087
   104
val print_thm = Pretty.writeln o pretty_thm;
wenzelm@6087
   105
val print_thms = Pretty.writeln o pretty_thms;
paulson@1591
   106
paulson@1591
   107
fun prth th = (print_thm th; th);
wenzelm@16534
   108
fun prthq thq = (Seq.print (K print_thm) 100000 thq; thq);
wenzelm@16534
   109
fun prths ths = (prthq (Seq.of_list ths); ths);
paulson@1591
   110
paulson@1591
   111
paulson@1591
   112
(* other printing commands *)
paulson@1591
   113
wenzelm@26939
   114
fun pretty_ctyp cT = Syntax.pretty_typ_global (Thm.theory_of_ctyp cT) (Thm.typ_of cT);
wenzelm@26939
   115
fun string_of_ctyp cT = Syntax.string_of_typ_global (Thm.theory_of_ctyp cT) (Thm.typ_of cT);
paulson@1591
   116
val print_ctyp = writeln o string_of_ctyp;
paulson@1591
   117
wenzelm@26939
   118
fun pretty_cterm ct = Syntax.pretty_term_global (Thm.theory_of_cterm ct) (Thm.term_of ct);
wenzelm@26939
   119
fun string_of_cterm ct = Syntax.string_of_term_global (Thm.theory_of_cterm ct) (Thm.term_of ct);
paulson@1591
   120
val print_cterm = writeln o string_of_cterm;
paulson@1591
   121
paulson@1591
   122
wenzelm@4250
   123
wenzelm@4250
   124
(** print theory **)
paulson@1591
   125
wenzelm@16437
   126
val print_syntax = Syntax.print_syntax o Sign.syn_of;
wenzelm@4498
   127
wenzelm@4498
   128
wenzelm@11883
   129
(* pretty_full_theory *)
wenzelm@4250
   130
wenzelm@20629
   131
fun pretty_full_theory verbose thy =
wenzelm@4250
   132
  let
wenzelm@24920
   133
    val ctxt = ProofContext.init thy;
wenzelm@24920
   134
wenzelm@24920
   135
    fun prt_cls c = Syntax.pretty_sort ctxt [c];
wenzelm@24920
   136
    fun prt_sort S = Syntax.pretty_sort ctxt S;
wenzelm@24920
   137
    fun prt_arity t (c, (_, Ss)) = Syntax.pretty_arity ctxt (t, Ss, [c]);
wenzelm@24920
   138
    fun prt_typ ty = Pretty.quote (Syntax.pretty_typ ctxt ty);
wenzelm@19806
   139
    val prt_typ_no_tvars = prt_typ o Logic.unvarifyT;
wenzelm@24920
   140
    fun prt_term t = Pretty.quote (Syntax.pretty_term ctxt t);
wenzelm@18936
   141
    val prt_term_no_vars = prt_term o Logic.unvarify;
wenzelm@19698
   142
    fun prt_const (c, ty) = [Pretty.str c, Pretty.str " ::", Pretty.brk 1, prt_typ_no_tvars ty];
wenzelm@26939
   143
    val prt_const' = Defs.pretty_const (Syntax.pp ctxt);
wenzelm@4250
   144
wenzelm@14794
   145
    fun pretty_classrel (c, []) = prt_cls c
wenzelm@14794
   146
      | pretty_classrel (c, cs) = Pretty.block
wenzelm@14794
   147
          (prt_cls c :: Pretty.str " <" :: Pretty.brk 1 ::
wenzelm@14794
   148
            Pretty.commas (map prt_cls cs));
wenzelm@4250
   149
wenzelm@4250
   150
    fun pretty_default S = Pretty.block
wenzelm@14794
   151
      [Pretty.str "default sort:", Pretty.brk 1, prt_sort S];
wenzelm@4250
   152
wenzelm@14996
   153
    val tfrees = map (fn v => TFree (v, []));
haftmann@27302
   154
    fun pretty_type syn (t, ((Type.LogicalType n, _), _)) =
skalberg@15531
   155
          if syn then NONE
wenzelm@24848
   156
          else SOME (prt_typ (Type (t, tfrees (Name.invents Name.context Name.aT n))))
haftmann@27302
   157
      | pretty_type syn (t, ((Type.Abbreviation (vs, U, syn'), _), _)) =
skalberg@15531
   158
          if syn <> syn' then NONE
skalberg@15531
   159
          else SOME (Pretty.block
wenzelm@14996
   160
            [prt_typ (Type (t, tfrees vs)), Pretty.str " =", Pretty.brk 1, prt_typ U])
haftmann@27302
   161
      | pretty_type syn (t, ((Type.Nonterminal, _), _)) =
skalberg@15531
   162
          if not syn then NONE
skalberg@15531
   163
          else SOME (prt_typ (Type (t, [])));
wenzelm@7635
   164
wenzelm@19482
   165
    val pretty_arities = maps (fn (t, ars) => map (prt_arity t) ars);
skalberg@14223
   166
wenzelm@19698
   167
    fun pretty_abbrev (c, (ty, t)) = Pretty.block
wenzelm@19698
   168
      (prt_const (c, ty) @ [Pretty.str " ==", Pretty.brk 1, prt_term_no_vars t]);
wenzelm@19365
   169
wenzelm@19698
   170
    fun pretty_axm (a, t) = Pretty.block [Pretty.str (a ^ ":"), Pretty.brk 1, prt_term_no_vars t];
wenzelm@4250
   171
wenzelm@19702
   172
    fun pretty_finals reds = Pretty.block
wenzelm@19703
   173
      (Pretty.str "final:" :: Pretty.brk 1 :: Pretty.commas (map (prt_const' o fst) reds));
wenzelm@19702
   174
wenzelm@19698
   175
    fun pretty_reduct (lhs, rhs) = Pretty.block
wenzelm@19702
   176
      ([prt_const' lhs, Pretty.str "  ->", Pretty.brk 2] @
wenzelm@19702
   177
        Pretty.commas (map prt_const' (sort_wrt #1 rhs)));
wenzelm@8720
   178
wenzelm@19698
   179
    fun pretty_restrict (const, name) =
wenzelm@19698
   180
      Pretty.block ([prt_const' const, Pretty.brk 2, Pretty.str ("(from " ^ quote name ^ ")")]);
wenzelm@19698
   181
wenzelm@24665
   182
    val axioms = (Theory.axiom_space thy, Theory.axiom_table thy);
wenzelm@24665
   183
    val defs = Theory.defs_of thy;
wenzelm@19698
   184
    val {restricts, reducts} = Defs.dest defs;
wenzelm@18061
   185
    val {naming, syn = _, tsig, consts} = Sign.rep_sg thy;
wenzelm@18936
   186
    val {constants, constraints} = Consts.dest consts;
wenzelm@19698
   187
    val extern_const = NameSpace.extern (#1 constants);
wenzelm@26637
   188
    val {classes, default, types, ...} = Type.rep_tsig tsig;
wenzelm@19698
   189
    val (class_space, class_algebra) = classes;
wenzelm@19642
   190
    val {classes, arities} = Sorts.rep_algebra class_algebra;
wenzelm@14996
   191
wenzelm@24774
   192
    val clsses = NameSpace.dest_table (class_space, Symtab.make (Graph.dest classes));
wenzelm@24774
   193
    val tdecls = NameSpace.dest_table types;
wenzelm@24774
   194
    val arties = NameSpace.dest_table (Sign.type_space thy, arities);
wenzelm@20629
   195
wenzelm@24774
   196
    fun prune_const c = not verbose andalso
wenzelm@24774
   197
      member (op =) (Consts.the_tags consts c) Markup.property_internal;
wenzelm@24774
   198
    val cnsts = NameSpace.extern_table (#1 constants,
wenzelm@24774
   199
      Symtab.make (filter_out (prune_const o fst) (Symtab.dest (#2 constants))));
wenzelm@24774
   200
wenzelm@19482
   201
    val log_cnsts = map_filter (fn (c, (ty, NONE)) => SOME (c, ty) | _ => NONE) cnsts;
wenzelm@25405
   202
    val abbrevs = map_filter (fn (c, (ty, SOME t)) => SOME (c, (ty, t)) | _ => NONE) cnsts;
wenzelm@24774
   203
    val cnstrs = NameSpace.extern_table constraints;
wenzelm@19698
   204
wenzelm@24774
   205
    val axms = NameSpace.extern_table axioms;
wenzelm@24774
   206
wenzelm@24774
   207
    val (reds0, (reds1, reds2)) = filter_out (prune_const o fst o fst) reducts
wenzelm@24774
   208
      |> map (fn (lhs, rhs) =>
wenzelm@24774
   209
        (apfst extern_const lhs, map (apfst extern_const) (filter_out (prune_const o fst) rhs)))
wenzelm@19702
   210
      |> sort_wrt (#1 o #1)
wenzelm@19702
   211
      |> List.partition (null o #2)
wenzelm@19702
   212
      ||> List.partition (Defs.plain_args o #2 o #1);
wenzelm@19698
   213
    val rests = restricts |> map (apfst (apfst extern_const)) |> sort_wrt (#1 o #1);
wenzelm@4250
   214
  in
wenzelm@29091
   215
    [Pretty.strs ("names:" :: Context.display_names thy)] @
wenzelm@20629
   216
    [Pretty.strs ["name prefix:", NameSpace.path_of naming],
wenzelm@16364
   217
      Pretty.big_list "classes:" (map pretty_classrel clsses),
wenzelm@8720
   218
      pretty_default default,
wenzelm@19482
   219
      Pretty.big_list "syntactic types:" (map_filter (pretty_type true) tdecls),
wenzelm@19482
   220
      Pretty.big_list "logical types:" (map_filter (pretty_type false) tdecls),
wenzelm@16534
   221
      Pretty.big_list "type arities:" (pretty_arities arties),
wenzelm@19698
   222
      Pretty.big_list "logical consts:" (map (Pretty.block o prt_const) log_cnsts),
wenzelm@19365
   223
      Pretty.big_list "abbreviations:" (map pretty_abbrev abbrevs),
wenzelm@19698
   224
      Pretty.big_list "constraints:" (map (Pretty.block o prt_const) cnstrs),
wenzelm@19698
   225
      Pretty.big_list "axioms:" (map pretty_axm axms),
wenzelm@28290
   226
      Pretty.strs ("oracles:" :: Thm.extern_oracles thy),
wenzelm@19698
   227
      Pretty.big_list "definitions:"
wenzelm@19702
   228
        [pretty_finals reds0,
wenzelm@19702
   229
         Pretty.big_list "non-overloaded:" (map pretty_reduct reds1),
wenzelm@19702
   230
         Pretty.big_list "overloaded:" (map pretty_reduct reds2),
wenzelm@19702
   231
         Pretty.big_list "pattern restrictions:" (map pretty_restrict rests)]]
wenzelm@4250
   232
  end;
wenzelm@4250
   233
wenzelm@4250
   234
wenzelm@11883
   235
wenzelm@11883
   236
(** print_goals **)
wenzelm@11883
   237
wenzelm@11883
   238
(* print_goals etc. *)
wenzelm@11883
   239
wenzelm@16534
   240
val show_consts = ref false;  (*true: show consts with types in proof state output*)
wenzelm@3851
   241
paulson@1591
   242
wenzelm@11883
   243
(*print thm A1,...,An/B in "goal style" -- premises as numbered subgoals*)
wenzelm@11883
   244
wenzelm@11883
   245
local
wenzelm@11883
   246
wenzelm@18980
   247
fun ins_entry (x, y) =
wenzelm@18980
   248
  AList.default (op =) (x, []) #>
wenzelm@18980
   249
  AList.map_entry (op =) x (insert (op =) y);
wenzelm@11883
   250
wenzelm@18980
   251
val add_consts = Term.fold_aterms
wenzelm@18980
   252
  (fn Const (c, T) => ins_entry (T, (c, T))
wenzelm@18980
   253
    | _ => I);
wenzelm@11883
   254
wenzelm@18980
   255
val add_vars = Term.fold_aterms
wenzelm@18980
   256
  (fn Free (x, T) => ins_entry (T, (x, ~1))
wenzelm@18980
   257
    | Var (xi, T) => ins_entry (T, xi)
wenzelm@18980
   258
    | _ => I);
wenzelm@11883
   259
wenzelm@18980
   260
val add_varsT = Term.fold_atyps
wenzelm@18980
   261
  (fn TFree (x, S) => ins_entry (S, (x, ~1))
wenzelm@18980
   262
    | TVar (xi, S) => ins_entry (S, xi)
wenzelm@18980
   263
    | _ => I);
wenzelm@11883
   264
wenzelm@16490
   265
fun sort_idxs vs = map (apsnd (sort (prod_ord string_ord int_ord))) vs;
wenzelm@12081
   266
fun sort_cnsts cs = map (apsnd (sort_wrt fst)) cs;
wenzelm@11883
   267
wenzelm@18980
   268
fun consts_of t = sort_cnsts (add_consts t []);
wenzelm@18980
   269
fun vars_of t = sort_idxs (add_vars t []);
wenzelm@18980
   270
fun varsT_of t = rev (sort_idxs (Term.fold_types add_varsT t []));
wenzelm@11883
   271
wenzelm@12081
   272
in
wenzelm@11883
   273
wenzelm@23634
   274
fun pretty_goals_aux pp markup (msg, main) maxgoals state =
wenzelm@12081
   275
  let
wenzelm@12081
   276
    fun prt_atoms prt prtT (X, xs) = Pretty.block
wenzelm@12081
   277
      [Pretty.block (Pretty.commas (map prt xs)), Pretty.str " ::",
wenzelm@12081
   278
        Pretty.brk 1, prtT X];
wenzelm@11883
   279
wenzelm@14876
   280
    fun prt_var (x, ~1) = Pretty.term pp (Syntax.free x)
wenzelm@14876
   281
      | prt_var xi = Pretty.term pp (Syntax.var xi);
wenzelm@11883
   282
wenzelm@14876
   283
    fun prt_varT (x, ~1) = Pretty.typ pp (TFree (x, []))
wenzelm@14876
   284
      | prt_varT xi = Pretty.typ pp (TVar (xi, []));
wenzelm@11883
   285
wenzelm@14876
   286
    val prt_consts = prt_atoms (Pretty.term pp o Const) (Pretty.typ pp);
wenzelm@14876
   287
    val prt_vars = prt_atoms prt_var (Pretty.typ pp);
wenzelm@14876
   288
    val prt_varsT = prt_atoms prt_varT (Pretty.sort pp);
wenzelm@11883
   289
wenzelm@11883
   290
wenzelm@12081
   291
    fun pretty_list _ _ [] = []
wenzelm@12081
   292
      | pretty_list name prt lst = [Pretty.big_list name (map prt lst)];
wenzelm@11883
   293
wenzelm@23634
   294
    fun pretty_subgoal (n, A) = Pretty.markup markup
wenzelm@23634
   295
      [Pretty.str (" " ^ string_of_int n ^ ". "), Pretty.term pp A];
wenzelm@12081
   296
    fun pretty_subgoals As = map pretty_subgoal (1 upto length As ~~ As);
wenzelm@11883
   297
wenzelm@14876
   298
    val pretty_ffpairs = pretty_list "flex-flex pairs:" (pretty_flexpair pp);
wenzelm@11883
   299
wenzelm@12081
   300
    val pretty_consts = pretty_list "constants:" prt_consts o consts_of;
wenzelm@12081
   301
    val pretty_vars = pretty_list "variables:" prt_vars o vars_of;
wenzelm@12081
   302
    val pretty_varsT = pretty_list "type variables:" prt_varsT o varsT_of;
wenzelm@11883
   303
wenzelm@11883
   304
wenzelm@16290
   305
    val {prop, tpairs, ...} = Thm.rep_thm state;
berghofe@13658
   306
    val (As, B) = Logic.strip_horn prop;
wenzelm@12081
   307
    val ngoals = length As;
wenzelm@11883
   308
wenzelm@12081
   309
    fun pretty_gs (types, sorts) =
wenzelm@14876
   310
      (if main then [Pretty.term pp B] else []) @
wenzelm@12081
   311
       (if ngoals = 0 then [Pretty.str "No subgoals!"]
wenzelm@12081
   312
        else if ngoals > maxgoals then
skalberg@15570
   313
          pretty_subgoals (Library.take (maxgoals, As)) @
wenzelm@12081
   314
          (if msg then [Pretty.str ("A total of " ^ string_of_int ngoals ^ " subgoals...")]
wenzelm@12081
   315
           else [])
wenzelm@12081
   316
        else pretty_subgoals As) @
wenzelm@12081
   317
      pretty_ffpairs tpairs @
wenzelm@12081
   318
      (if ! show_consts then pretty_consts prop else []) @
wenzelm@12081
   319
      (if types then pretty_vars prop else []) @
wenzelm@12081
   320
      (if sorts then pretty_varsT prop else []);
wenzelm@12081
   321
  in
wenzelm@12081
   322
    setmp show_no_free_types true
skalberg@14178
   323
      (setmp show_types (! show_types orelse ! show_sorts orelse ! show_all_types)
wenzelm@12081
   324
        (setmp show_sorts false pretty_gs))
skalberg@14178
   325
   (! show_types orelse ! show_sorts orelse ! show_all_types, ! show_sorts)
wenzelm@11883
   326
  end;
wenzelm@11883
   327
wenzelm@23634
   328
fun pretty_goals n th =
wenzelm@26939
   329
  pretty_goals_aux (Syntax.pp_global (Thm.theory_of_thm th)) Markup.none (true, true) n th;
wenzelm@12081
   330
wenzelm@23634
   331
val print_goals = (Pretty.writeln o Pretty.chunks) oo pretty_goals;
wenzelm@12081
   332
paulson@1591
   333
end;
paulson@1591
   334
wenzelm@11883
   335
wenzelm@11883
   336
end;
wenzelm@11883
   337
wenzelm@11883
   338
structure BasicDisplay: BASIC_DISPLAY = Display;
wenzelm@11883
   339
open BasicDisplay;