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