src/Pure/PIDE/command.ML
author wenzelm
Fri, 02 Aug 2013 16:00:14 +0200
changeset 52850 9fff9f78240a
parent 52785 ecc7d8de4f94
child 52853 4ab66773a41f
permissions -rw-r--r--
support print functions with explicit arguments, as provided by overlays;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
47336
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
     1
(*  Title:      Pure/PIDE/command.ML
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
     2
    Author:     Makarius
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
     3
52534
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
     4
Prover command execution: read -- eval -- print.
47336
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
     5
*)
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
     6
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
     7
signature COMMAND =
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
     8
sig
52600
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
     9
  val read: (unit -> theory) -> Token.T list -> Toplevel.transition
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
    10
  type eval
52607
33a133d50616 clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents: 52606
diff changeset
    11
  val eval_eq: eval * eval -> bool
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52775
diff changeset
    12
  val eval_running: eval -> bool
52772
7764c90680f0 clarified conditions for node traversal;
wenzelm
parents: 52762
diff changeset
    13
  val eval_finished: eval -> bool
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52535
diff changeset
    14
  val eval_result_state: eval -> Toplevel.state
52535
b7badd371e4d tuned signature -- eliminated pointless type synonym;
wenzelm
parents: 52534
diff changeset
    15
  val eval: (unit -> theory) -> Token.T list -> eval -> eval
52600
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
    16
  type print
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
    17
  val print: bool -> (string * string list) list -> string ->
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
    18
    eval -> print list -> print list option
52526
d234cb6b60e3 more Command.memo operations;
wenzelm
parents: 52516
diff changeset
    19
  type print_fn = Toplevel.transition -> Toplevel.state -> unit
52647
45ce95b8bf69 determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents: 52619
diff changeset
    20
  val print_function: string ->
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
    21
    ({command_name: string, args: string list} ->
52762
c2a6e220f157 tuned signature;
wenzelm
parents: 52761
diff changeset
    22
      {delay: Time.time option, pri: int, persistent: bool, print_fn: print_fn} option) -> unit
52571
344527354323 allow to remove print functions;
wenzelm
parents: 52570
diff changeset
    23
  val no_print_function: string -> unit
52600
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
    24
  type exec = eval * print list
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
    25
  val no_exec: exec
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
    26
  val exec_ids: exec option -> Document_ID.exec list
52606
0d68d108d7e0 tuned signature;
wenzelm
parents: 52605
diff changeset
    27
  val exec: Document_ID.execution -> exec -> unit
47336
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
    28
end;
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
    29
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
    30
structure Command: COMMAND =
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
    31
struct
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
    32
52775
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
    33
(** memo results **)
47341
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47336
diff changeset
    34
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47336
diff changeset
    35
datatype 'a expr =
52596
40298d383463 global management of command execution fragments;
wenzelm
parents: 52586
diff changeset
    36
  Expr of Document_ID.exec * (unit -> 'a) |
47341
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47336
diff changeset
    37
  Result of 'a Exn.result;
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47336
diff changeset
    38
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47336
diff changeset
    39
abstype 'a memo = Memo of 'a expr Synchronized.var
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47336
diff changeset
    40
with
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47336
diff changeset
    41
52596
40298d383463 global management of command execution fragments;
wenzelm
parents: 52586
diff changeset
    42
fun memo exec_id e = Memo (Synchronized.var "Command.memo" (Expr (exec_id, e)));
47341
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47336
diff changeset
    43
fun memo_value a = Memo (Synchronized.var "Command.memo" (Result (Exn.Res a)));
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47336
diff changeset
    44
47342
7828c7b3c143 more explicit memo_eval vs. memo_result, to enforce bottom-up execution;
wenzelm
parents: 47341
diff changeset
    45
fun memo_result (Memo v) =
7828c7b3c143 more explicit memo_eval vs. memo_result, to enforce bottom-up execution;
wenzelm
parents: 47341
diff changeset
    46
  (case Synchronized.value v of
52607
33a133d50616 clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents: 52606
diff changeset
    47
    Expr (exec_id, _) => error ("Unfinished execution result: " ^ Document_ID.print exec_id)
33a133d50616 clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents: 52606
diff changeset
    48
  | Result res => Exn.release res);
47341
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47336
diff changeset
    49
52656
9437f440ef3f keep persistent prints only if actually finished;
wenzelm
parents: 52651
diff changeset
    50
fun memo_finished (Memo v) =
52785
wenzelm
parents: 52784
diff changeset
    51
  (case Synchronized.value v of Expr _ => false | Result _ => true);
52656
9437f440ef3f keep persistent prints only if actually finished;
wenzelm
parents: 52651
diff changeset
    52
52607
33a133d50616 clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents: 52606
diff changeset
    53
fun memo_exec execution_id (Memo v) =
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
    54
  Synchronized.timed_access v (K (SOME Time.zeroTime))
52609
c8f8c29193de clarified memo_exec: plain synchronized access without any special tricks;
wenzelm
parents: 52607
diff changeset
    55
    (fn expr =>
c8f8c29193de clarified memo_exec: plain synchronized access without any special tricks;
wenzelm
parents: 52607
diff changeset
    56
      (case expr of
52775
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
    57
        Expr (exec_id, body) =>
52609
c8f8c29193de clarified memo_exec: plain synchronized access without any special tricks;
wenzelm
parents: 52607
diff changeset
    58
          uninterruptible (fn restore_attributes => fn () =>
c8f8c29193de clarified memo_exec: plain synchronized access without any special tricks;
wenzelm
parents: 52607
diff changeset
    59
            if Execution.running execution_id exec_id then
c8f8c29193de clarified memo_exec: plain synchronized access without any special tricks;
wenzelm
parents: 52607
diff changeset
    60
              let
52775
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
    61
                val res =
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
    62
                  (body
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
    63
                    |> restore_attributes
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
    64
                    |> Future.worker_nest "Command.memo_exec"
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
    65
                    |> Exn.interruptible_capture) ();
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
    66
              in SOME ((), Result res) end
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
    67
            else SOME ((), expr)) ()
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
    68
      | Result _ => SOME ((), expr)))
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
    69
  |> (fn NONE => error "Conflicting command execution" | _ => ());
52596
40298d383463 global management of command execution fragments;
wenzelm
parents: 52586
diff changeset
    70
52607
33a133d50616 clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents: 52606
diff changeset
    71
fun memo_fork params execution_id (Memo v) =
52596
40298d383463 global management of command execution fragments;
wenzelm
parents: 52586
diff changeset
    72
  (case Synchronized.value v of
40298d383463 global management of command execution fragments;
wenzelm
parents: 52586
diff changeset
    73
    Result _ => ()
52607
33a133d50616 clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents: 52606
diff changeset
    74
  | _ => ignore ((singleton o Future.forks) params (fn () => memo_exec execution_id (Memo v))));
52526
d234cb6b60e3 more Command.memo operations;
wenzelm
parents: 52516
diff changeset
    75
47341
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47336
diff changeset
    76
end;
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47336
diff changeset
    77
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47336
diff changeset
    78
52607
33a133d50616 clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents: 52606
diff changeset
    79
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52535
diff changeset
    80
(** main phases of execution **)
3a35ce87a55c tuned signature;
wenzelm
parents: 52535
diff changeset
    81
52510
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
    82
(* read *)
52509
2193d2c7f586 tuned signature;
wenzelm
parents: 51605
diff changeset
    83
52534
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
    84
fun read init span =
52510
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
    85
  let
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
    86
    val outer_syntax = #2 (Outer_Syntax.get_syntax ());
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
    87
    val command_reports = Outer_Syntax.command_reports outer_syntax;
52509
2193d2c7f586 tuned signature;
wenzelm
parents: 51605
diff changeset
    88
52534
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
    89
    val proper_range =
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
    90
      Position.set_range (Token.position_range_of (#1 (take_suffix Token.is_improper span)));
52510
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
    91
    val pos =
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
    92
      (case find_first Token.is_command span of
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
    93
        SOME tok => Token.position_of tok
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
    94
      | NONE => proper_range);
52509
2193d2c7f586 tuned signature;
wenzelm
parents: 51605
diff changeset
    95
52510
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
    96
    val (is_malformed, token_reports) = Thy_Syntax.reports_of_tokens span;
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
    97
    val _ = Position.reports_text (token_reports @ maps command_reports span);
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
    98
  in
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
    99
    if is_malformed then Toplevel.malformed pos "Malformed command syntax"
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
   100
    else
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
   101
      (case Outer_Syntax.read_spans outer_syntax span of
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
   102
        [tr] =>
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
   103
          if Keyword.is_control (Toplevel.name_of tr) then
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
   104
            Toplevel.malformed pos "Illegal control command"
52534
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   105
          else Toplevel.modify_init init tr
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   106
      | [] => Toplevel.ignored (Position.set_range (Token.position_range_of span))
52510
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
   107
      | _ => Toplevel.malformed proper_range "Exactly one command expected")
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
   108
      handle ERROR msg => Toplevel.malformed proper_range msg
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
   109
  end;
52509
2193d2c7f586 tuned signature;
wenzelm
parents: 51605
diff changeset
   110
2193d2c7f586 tuned signature;
wenzelm
parents: 51605
diff changeset
   111
2193d2c7f586 tuned signature;
wenzelm
parents: 51605
diff changeset
   112
(* eval *)
47336
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
   113
52600
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   114
type eval_state =
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   115
  {failed: bool, malformed: bool, command: Toplevel.transition, state: Toplevel.state};
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   116
val init_eval_state =
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   117
  {failed = false, malformed = false, command = Toplevel.empty, state = Toplevel.toplevel};
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   118
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   119
datatype eval = Eval of {exec_id: Document_ID.exec, eval_process: eval_state memo};
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   120
52607
33a133d50616 clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents: 52606
diff changeset
   121
fun eval_eq (Eval {exec_id, ...}, Eval {exec_id = exec_id', ...}) = exec_id = exec_id';
33a133d50616 clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents: 52606
diff changeset
   122
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52775
diff changeset
   123
fun eval_running (Eval {exec_id, ...}) = Execution.is_running_exec exec_id;
52772
7764c90680f0 clarified conditions for node traversal;
wenzelm
parents: 52762
diff changeset
   124
fun eval_finished (Eval {eval_process, ...}) = memo_finished eval_process;
7764c90680f0 clarified conditions for node traversal;
wenzelm
parents: 52762
diff changeset
   125
52600
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   126
fun eval_result (Eval {eval_process, ...}) = memo_result eval_process;
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   127
val eval_result_state = #state o eval_result;
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   128
47336
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
   129
local
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
   130
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
   131
fun run int tr st =
51284
59a03019f3bf fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents: 51266
diff changeset
   132
  if Goal.future_enabled () andalso Keyword.is_diag (Toplevel.name_of tr) then
51605
eca8acb42e4a more explicit Goal.fork_params -- avoid implicit arguments via thread data;
wenzelm
parents: 51603
diff changeset
   133
    (Goal.fork_params {name = "Toplevel.diag", pos = Toplevel.pos_of tr, pri = ~1}
eca8acb42e4a more explicit Goal.fork_params -- avoid implicit arguments via thread data;
wenzelm
parents: 51603
diff changeset
   134
      (fn () => Toplevel.command_exception int tr st); ([], SOME st))
51284
59a03019f3bf fork diagnostic commands (theory loader and PIDE interaction);
wenzelm
parents: 51266
diff changeset
   135
  else Toplevel.command_errors int tr st;
47336
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
   136
52510
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
   137
fun check_cmts span tr st' =
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
   138
  Toplevel.setmp_thread_position tr
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
   139
    (fn () =>
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
   140
      Outer_Syntax.side_comments span |> maps (fn cmt =>
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
   141
        (Thy_Output.check_text (Token.source_position_of cmt) st'; [])
52619
70d5f2f7d27f reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents: 52609
diff changeset
   142
          handle exn =>
70d5f2f7d27f reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents: 52609
diff changeset
   143
            if Exn.is_interrupt exn then reraise exn
70d5f2f7d27f reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents: 52609
diff changeset
   144
            else ML_Compiler.exn_messages_ids exn)) ();
52510
a4a102237ded tuned signature;
wenzelm
parents: 52509
diff changeset
   145
47336
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
   146
fun proof_status tr st =
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
   147
  (case try Toplevel.proof_of st of
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
   148
    SOME prf => Toplevel.status tr (Proof.status_markup prf)
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
   149
  | NONE => ());
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
   150
52534
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   151
fun eval_state span tr ({malformed, state = st, ...}: eval_state) =
52509
2193d2c7f586 tuned signature;
wenzelm
parents: 51605
diff changeset
   152
  if malformed then
52526
d234cb6b60e3 more Command.memo operations;
wenzelm
parents: 52516
diff changeset
   153
    {failed = true, malformed = malformed, command = tr, state = Toplevel.toplevel}
48772
e46cd0d26481 vacuous execution after first malformed command;
wenzelm
parents: 48771
diff changeset
   154
  else
e46cd0d26481 vacuous execution after first malformed command;
wenzelm
parents: 48771
diff changeset
   155
    let
e46cd0d26481 vacuous execution after first malformed command;
wenzelm
parents: 48771
diff changeset
   156
      val malformed' = Toplevel.is_malformed tr;
e46cd0d26481 vacuous execution after first malformed command;
wenzelm
parents: 48771
diff changeset
   157
      val is_init = Toplevel.is_init tr;
e46cd0d26481 vacuous execution after first malformed command;
wenzelm
parents: 48771
diff changeset
   158
      val is_proof = Keyword.is_proof (Toplevel.name_of tr);
47336
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
   159
48772
e46cd0d26481 vacuous execution after first malformed command;
wenzelm
parents: 48771
diff changeset
   160
      val _ = Multithreading.interrupted ();
50201
c26369c9eda6 Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents: 49866
diff changeset
   161
      val _ = Toplevel.status tr Markup.running;
48918
6e5fd4585512 check side-comments of command spans (normally filtered out in Outer_Syntax.toplevel_source);
wenzelm
parents: 48772
diff changeset
   162
      val (errs1, result) = run (is_init orelse is_proof) (Toplevel.set_print false tr) st;
52509
2193d2c7f586 tuned signature;
wenzelm
parents: 51605
diff changeset
   163
      val errs2 = (case result of NONE => [] | SOME st' => check_cmts span tr st');
48918
6e5fd4585512 check side-comments of command spans (normally filtered out in Outer_Syntax.toplevel_source);
wenzelm
parents: 48772
diff changeset
   164
      val errs = errs1 @ errs2;
50201
c26369c9eda6 Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents: 49866
diff changeset
   165
      val _ = Toplevel.status tr Markup.finished;
50914
fe4714886d92 identify future results more carefully, to avoid odd duplication of error messages, notably from forked goals;
wenzelm
parents: 50911
diff changeset
   166
      val _ = List.app (Future.error_msg (Toplevel.pos_of tr)) errs;
48772
e46cd0d26481 vacuous execution after first malformed command;
wenzelm
parents: 48771
diff changeset
   167
    in
e46cd0d26481 vacuous execution after first malformed command;
wenzelm
parents: 48771
diff changeset
   168
      (case result of
e46cd0d26481 vacuous execution after first malformed command;
wenzelm
parents: 48771
diff changeset
   169
        NONE =>
e46cd0d26481 vacuous execution after first malformed command;
wenzelm
parents: 48771
diff changeset
   170
          let
e46cd0d26481 vacuous execution after first malformed command;
wenzelm
parents: 48771
diff changeset
   171
            val _ = if null errs then Exn.interrupt () else ();
50201
c26369c9eda6 Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents: 49866
diff changeset
   172
            val _ = Toplevel.status tr Markup.failed;
52526
d234cb6b60e3 more Command.memo operations;
wenzelm
parents: 52516
diff changeset
   173
          in {failed = true, malformed = malformed', command = tr, state = st} end
48772
e46cd0d26481 vacuous execution after first malformed command;
wenzelm
parents: 48771
diff changeset
   174
      | SOME st' =>
e46cd0d26481 vacuous execution after first malformed command;
wenzelm
parents: 48771
diff changeset
   175
          let
e46cd0d26481 vacuous execution after first malformed command;
wenzelm
parents: 48771
diff changeset
   176
            val _ = proof_status tr st';
52526
d234cb6b60e3 more Command.memo operations;
wenzelm
parents: 52516
diff changeset
   177
          in {failed = false, malformed = malformed', command = tr, state = st'} end)
48772
e46cd0d26481 vacuous execution after first malformed command;
wenzelm
parents: 48771
diff changeset
   178
    end;
47336
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
   179
52534
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   180
in
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   181
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   182
fun eval init span eval0 =
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   183
  let
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   184
    val exec_id = Document_ID.make ();
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   185
    fun process () =
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   186
      let
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   187
        val tr =
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   188
          Position.setmp_thread_data (Position.id_only (Document_ID.print exec_id))
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52535
diff changeset
   189
            (fn () => read init span |> Toplevel.exec_id exec_id) ();
52534
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   190
      in eval_state span tr (eval_result eval0) end;
52600
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   191
  in Eval {exec_id = exec_id, eval_process = memo exec_id process} end;
52534
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   192
47336
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
   193
end;
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
   194
52509
2193d2c7f586 tuned signature;
wenzelm
parents: 51605
diff changeset
   195
2193d2c7f586 tuned signature;
wenzelm
parents: 51605
diff changeset
   196
(* print *)
2193d2c7f586 tuned signature;
wenzelm
parents: 51605
diff changeset
   197
52600
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   198
datatype print = Print of
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   199
 {name: string, args: string list, delay: Time.time option, pri: int, persistent: bool,
52600
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   200
  exec_id: Document_ID.exec, print_process: unit memo};
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   201
52526
d234cb6b60e3 more Command.memo operations;
wenzelm
parents: 52516
diff changeset
   202
type print_fn = Toplevel.transition -> Toplevel.state -> unit;
52515
0dcadc90550b more print function parameters;
wenzelm
parents: 52511
diff changeset
   203
52647
45ce95b8bf69 determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents: 52619
diff changeset
   204
type print_function =
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   205
  {command_name: string, args: string list} ->
52762
c2a6e220f157 tuned signature;
wenzelm
parents: 52761
diff changeset
   206
    {delay: Time.time option, pri: int, persistent: bool, print_fn: print_fn} option;
52647
45ce95b8bf69 determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents: 52619
diff changeset
   207
52511
d5d2093ff224 allow multiple print functions;
wenzelm
parents: 52510
diff changeset
   208
local
d5d2093ff224 allow multiple print functions;
wenzelm
parents: 52510
diff changeset
   209
52647
45ce95b8bf69 determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents: 52619
diff changeset
   210
val print_functions =
45ce95b8bf69 determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents: 52619
diff changeset
   211
  Synchronized.var "Command.print_functions" ([]: (string * print_function) list);
52511
d5d2093ff224 allow multiple print functions;
wenzelm
parents: 52510
diff changeset
   212
52570
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   213
fun print_error tr e =
52619
70d5f2f7d27f reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents: 52609
diff changeset
   214
  (Toplevel.setmp_thread_position tr o Runtime.controlled_execution) e ()
70d5f2f7d27f reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents: 52609
diff changeset
   215
    handle exn =>
70d5f2f7d27f reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents: 52609
diff changeset
   216
      if Exn.is_interrupt exn then reraise exn
70d5f2f7d27f reraise interrupts outside command regular transactions -- relevant for memo_stable;
wenzelm
parents: 52609
diff changeset
   217
      else List.app (Future.error_msg (Toplevel.pos_of tr)) (ML_Compiler.exn_messages_ids exn);
52516
b5b3c888df9f more exception handling -- make print functions total;
wenzelm
parents: 52515
diff changeset
   218
52607
33a133d50616 clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents: 52606
diff changeset
   219
fun print_eq (Print {exec_id, ...}, Print {exec_id = exec_id', ...}) = exec_id = exec_id';
33a133d50616 clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents: 52606
diff changeset
   220
52775
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
   221
fun print_finished (Print {print_process, ...}) = memo_finished print_process;
52656
9437f440ef3f keep persistent prints only if actually finished;
wenzelm
parents: 52651
diff changeset
   222
52600
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   223
fun print_persistent (Print {persistent, ...}) = persistent;
52596
40298d383463 global management of command execution fragments;
wenzelm
parents: 52586
diff changeset
   224
52511
d5d2093ff224 allow multiple print functions;
wenzelm
parents: 52510
diff changeset
   225
in
52509
2193d2c7f586 tuned signature;
wenzelm
parents: 51605
diff changeset
   226
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   227
fun print command_visible command_overlays command_name eval old_prints =
52570
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   228
  let
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   229
    val print_functions = Synchronized.value print_functions;
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   230
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   231
    fun new_print name args get_pr =
52570
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   232
      let
52651
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   233
        fun make_print strict {delay, pri, persistent, print_fn} =
52570
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   234
          let
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   235
            val exec_id = Document_ID.make ();
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   236
            fun process () =
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   237
              let
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   238
                val {failed, command, state = st', ...} = eval_result eval;
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   239
                val tr = Toplevel.exec_id exec_id command;
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   240
              in
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   241
                if failed andalso not strict then ()
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   242
                else print_error tr (fn () => print_fn tr st')
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   243
              end;
52572
2fb1f9cf80d3 print "persistent" flag allows to adjust tradeoff of ML run-time vs. JVM heap-space;
wenzelm
parents: 52571
diff changeset
   244
          in
52600
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   245
           Print {
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   246
             name = name, args = args, delay = delay, pri = pri, persistent = persistent,
52600
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   247
             exec_id = exec_id, print_process = memo exec_id process}
52572
2fb1f9cf80d3 print "persistent" flag allows to adjust tradeoff of ML run-time vs. JVM heap-space;
wenzelm
parents: 52571
diff changeset
   248
          end;
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   249
        val params = {command_name = command_name, args = args};
52570
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   250
      in
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   251
        (case Exn.capture (Runtime.controlled_execution get_pr) params of
52570
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   252
          Exn.Res NONE => NONE
52647
45ce95b8bf69 determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents: 52619
diff changeset
   253
        | Exn.Res (SOME pr) => SOME (make_print false pr)
45ce95b8bf69 determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents: 52619
diff changeset
   254
        | Exn.Exn exn =>
45ce95b8bf69 determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents: 52619
diff changeset
   255
            SOME (make_print true
52762
c2a6e220f157 tuned signature;
wenzelm
parents: 52761
diff changeset
   256
              {delay = NONE, pri = 0, persistent = false, print_fn = fn _ => fn _ => reraise exn}))
52570
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   257
      end;
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   258
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   259
    fun get_print (a, b) =
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   260
      (case find_first (fn Print {name, args, ...} => name = a andalso args = b) old_prints of
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   261
        NONE =>
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   262
          (case AList.lookup (op =) print_functions a of
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   263
            NONE => NONE
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   264
          | SOME get_pr => new_print a b get_pr)
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   265
      | some => some);
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   266
52570
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   267
    val new_prints =
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   268
      if command_visible then
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   269
        distinct (op =) (fold (fn (a, _) => cons (a, [])) print_functions command_overlays)
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   270
        |> map_filter get_print
52656
9437f440ef3f keep persistent prints only if actually finished;
wenzelm
parents: 52651
diff changeset
   271
      else filter (fn print => print_finished print andalso print_persistent print) old_prints;
52570
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   272
  in
52600
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   273
    if eq_list print_eq (old_prints, new_prints) then NONE else SOME new_prints
52570
26d84a0b9209 clarified Command.print: update old prints here;
wenzelm
parents: 52566
diff changeset
   274
  end;
52511
d5d2093ff224 allow multiple print functions;
wenzelm
parents: 52510
diff changeset
   275
52647
45ce95b8bf69 determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents: 52619
diff changeset
   276
fun print_function name f =
52511
d5d2093ff224 allow multiple print functions;
wenzelm
parents: 52510
diff changeset
   277
  Synchronized.change print_functions (fn funs =>
d5d2093ff224 allow multiple print functions;
wenzelm
parents: 52510
diff changeset
   278
   (if not (AList.defined (op =) funs name) then ()
d5d2093ff224 allow multiple print functions;
wenzelm
parents: 52510
diff changeset
   279
    else warning ("Redefining command print function: " ^ quote name);
52647
45ce95b8bf69 determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents: 52619
diff changeset
   280
    AList.update (op =) (name, f) funs));
52511
d5d2093ff224 allow multiple print functions;
wenzelm
parents: 52510
diff changeset
   281
52571
344527354323 allow to remove print functions;
wenzelm
parents: 52570
diff changeset
   282
fun no_print_function name =
344527354323 allow to remove print functions;
wenzelm
parents: 52570
diff changeset
   283
  Synchronized.change print_functions (filter_out (equal name o #1));
344527354323 allow to remove print functions;
wenzelm
parents: 52570
diff changeset
   284
52511
d5d2093ff224 allow multiple print functions;
wenzelm
parents: 52510
diff changeset
   285
end;
d5d2093ff224 allow multiple print functions;
wenzelm
parents: 52510
diff changeset
   286
52526
d234cb6b60e3 more Command.memo operations;
wenzelm
parents: 52516
diff changeset
   287
val _ =
52647
45ce95b8bf69 determine print function parameters dynamically, e.g. depending on runtime options;
wenzelm
parents: 52619
diff changeset
   288
  print_function "print_state"
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52785
diff changeset
   289
    (fn {command_name, ...} =>
52762
c2a6e220f157 tuned signature;
wenzelm
parents: 52761
diff changeset
   290
      SOME {delay = NONE, pri = 1, persistent = true,
52651
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   291
        print_fn = fn tr => fn st' =>
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   292
          let
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   293
            val is_init = Keyword.is_theory_begin command_name;
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   294
            val is_proof = Keyword.is_proof command_name;
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   295
            val do_print =
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   296
              not is_init andalso
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   297
                (Toplevel.print_of tr orelse (is_proof andalso Toplevel.is_proof st'));
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   298
          in if do_print then Toplevel.print_state false st' else () end});
52509
2193d2c7f586 tuned signature;
wenzelm
parents: 51605
diff changeset
   299
52532
c81d76f7f63d tuned signature;
wenzelm
parents: 52530
diff changeset
   300
52600
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   301
(* combined execution *)
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   302
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   303
type exec = eval * print list;
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   304
val no_exec: exec =
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   305
  (Eval {exec_id = Document_ID.none, eval_process = memo_value init_eval_state}, []);
52532
c81d76f7f63d tuned signature;
wenzelm
parents: 52530
diff changeset
   306
52600
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   307
fun exec_ids NONE = []
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   308
  | exec_ids (SOME (Eval {exec_id, ...}, prints)) =
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   309
      exec_id :: map (fn Print {exec_id, ...} => exec_id) prints;
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   310
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   311
local
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   312
52651
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   313
fun run_print execution_id (Print {name, delay, pri, print_process, ...}) =
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   314
  if Multithreading.enabled () then
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   315
    let
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   316
      val group = Future.worker_subgroup ();
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   317
      fun fork () =
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   318
        memo_fork {name = name, group = SOME group, deps = [], pri = pri, interrupts = true}
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   319
          execution_id print_process;
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   320
    in
52762
c2a6e220f157 tuned signature;
wenzelm
parents: 52761
diff changeset
   321
      (case delay of
c2a6e220f157 tuned signature;
wenzelm
parents: 52761
diff changeset
   322
        NONE => fork ()
c2a6e220f157 tuned signature;
wenzelm
parents: 52761
diff changeset
   323
      | SOME d => ignore (Event_Timer.request (Time.+ (Time.now (), d)) fork))
52651
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   324
    end
5adb5c69af97 initial delay for automatically tried tools;
wenzelm
parents: 52647
diff changeset
   325
  else memo_exec execution_id print_process;
52559
ddaf277e0d8c more direct interleaving of eval/print and update/execution -- refrain from crude manipulation of max_threads;
wenzelm
parents: 52536
diff changeset
   326
52600
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   327
in
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   328
52607
33a133d50616 clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents: 52606
diff changeset
   329
fun exec execution_id (Eval {eval_process, ...}, prints) =
33a133d50616 clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents: 52606
diff changeset
   330
  (memo_exec execution_id eval_process; List.app (run_print execution_id) prints);
52532
c81d76f7f63d tuned signature;
wenzelm
parents: 52530
diff changeset
   331
47336
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
   332
end;
bed4b2738d8a separate module for prover command execution;
wenzelm
parents:
diff changeset
   333
52600
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   334
end;
75afb82daf5c more abstract types;
wenzelm
parents: 52598
diff changeset
   335