src/Pure/PIDE/document.ML
author wenzelm
Tue, 05 Jul 2011 11:45:48 +0200
changeset 43666 7be2e51928cb
parent 43642 9ef5479da29f
child 43668 aad4f1956098
permissions -rw-r--r--
clarified cancel_execution/await_cancellation;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     1
(*  Title:      Pure/PIDE/document.ML
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     2
    Author:     Makarius
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     3
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     4
Document as collection of named nodes, each consisting of an editable
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
     5
list of commands, associated with asynchronous execution process.
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     6
*)
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     7
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     8
signature DOCUMENT =
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     9
sig
38363
af7f41a8a0a8 clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents: 38355
diff changeset
    10
  type id = int
38373
wenzelm
parents: 38363
diff changeset
    11
  type version_id = id
38363
af7f41a8a0a8 clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents: 38355
diff changeset
    12
  type command_id = id
38373
wenzelm
parents: 38363
diff changeset
    13
  type exec_id = id
38363
af7f41a8a0a8 clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents: 38355
diff changeset
    14
  val no_id: id
38419
f9dc924e54f8 renamed create_id to new_id;
wenzelm
parents: 38418
diff changeset
    15
  val new_id: unit -> id
38363
af7f41a8a0a8 clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents: 38355
diff changeset
    16
  val parse_id: string -> id
af7f41a8a0a8 clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents: 38355
diff changeset
    17
  val print_id: id -> string
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    18
  type edit = string * ((command_id option * command_id option) list) option
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    19
  type state
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    20
  val init_state: state
43666
7be2e51928cb clarified cancel_execution/await_cancellation;
wenzelm
parents: 43642
diff changeset
    21
  val cancel_execution: state -> unit -> unit
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    22
  val define_command: command_id -> string -> state -> state
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    23
  val edit: version_id -> version_id -> edit list -> state -> (command_id * exec_id) list * state
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    24
  val execute: version_id -> state -> state
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    25
end;
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    26
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    27
structure Document: DOCUMENT =
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    28
struct
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    29
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    30
(* unique identifiers *)
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    31
38363
af7f41a8a0a8 clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents: 38355
diff changeset
    32
type id = int;
38373
wenzelm
parents: 38363
diff changeset
    33
type version_id = id;
38363
af7f41a8a0a8 clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents: 38355
diff changeset
    34
type command_id = id;
38373
wenzelm
parents: 38363
diff changeset
    35
type exec_id = id;
38355
8cb265fb12fe represent document ids by (long) int, to benefit from the somewhat faster Inttab in ML (LinearSet in Scala is invariably indexed by native object ids);
wenzelm
parents: 38150
diff changeset
    36
8cb265fb12fe represent document ids by (long) int, to benefit from the somewhat faster Inttab in ML (LinearSet in Scala is invariably indexed by native object ids);
wenzelm
parents: 38150
diff changeset
    37
val no_id = 0;
40449
9c390868d255 added general Synchronized.counter convenience;
wenzelm
parents: 40398
diff changeset
    38
val new_id = Synchronized.counter ();
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    39
38414
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38373
diff changeset
    40
val parse_id = Markup.parse_int;
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38373
diff changeset
    41
val print_id = Markup.print_int;
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    42
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    43
fun err_dup kind id = error ("Duplicate " ^ kind ^ ": " ^ print_id id);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    44
fun err_undef kind id = error ("Undefined " ^ kind ^ ": " ^ print_id id);
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    45
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    46
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    47
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    48
(** document structure **)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    49
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    50
structure Entries = Linear_Set(type key = command_id val ord = int_ord);
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    51
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    52
abstype node = Node of exec_id option Entries.T  (*command entries with excecutions*)
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    53
  and version = Version of node Graph.T  (*development graph wrt. static imports*)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    54
with
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    55
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    56
val empty_node = Node Entries.empty;
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    57
val empty_version = Version Graph.empty;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    58
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    59
fun fold_entries start f (Node entries) = Entries.fold start f entries;
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    60
fun first_entry start P (Node entries) = Entries.get_first start P entries;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    61
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    62
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    63
(* node edits and associated executions *)
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    64
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    65
type edit =
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    66
  string *
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    67
  (*NONE: remove node, SOME: insert/remove commands*)
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    68
  ((command_id option * command_id option) list) option;
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    69
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    70
fun the_entry (Node entries) id =
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    71
  (case Entries.lookup entries id of
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    72
    NONE => err_undef "command entry" id
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    73
  | SOME entry => entry);
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    74
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    75
fun update_entry (id, exec_id) (Node entries) =
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    76
  Node (Entries.update (id, SOME exec_id) entries);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    77
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    78
fun reset_after id entries =
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    79
  (case Entries.get_after entries id of
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    80
    NONE => entries
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    81
  | SOME next => Entries.update (next, NONE) entries);
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    82
43642
wenzelm
parents: 42328
diff changeset
    83
fun edit_node (id, SOME id2) (Node entries) =
wenzelm
parents: 42328
diff changeset
    84
      Node (Entries.insert_after id (id2, NONE) entries)
wenzelm
parents: 42328
diff changeset
    85
  | edit_node (id, NONE) (Node entries) =
wenzelm
parents: 42328
diff changeset
    86
      Node (entries |> Entries.delete_after id |> reset_after id);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    87
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    88
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    89
(* version operations *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    90
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    91
fun nodes_of (Version nodes) = nodes;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    92
val node_names_of = Graph.keys o nodes_of;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    93
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    94
fun get_node version name = Graph.get_node (nodes_of version) name
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    95
  handle Graph.UNDEF _ => empty_node;
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    96
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    97
fun edit_nodes (name, SOME edits) (Version nodes) =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    98
      Version (nodes
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    99
        |> Graph.default_node (name, empty_node)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   100
        |> Graph.map_node name (fold edit_node edits))
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   101
  | edit_nodes (name, NONE) (Version nodes) =
40481
da2c56aaaa68 more precise treatment of deleted nodes;
wenzelm
parents: 40449
diff changeset
   102
      Version (perhaps (try (Graph.del_node name)) nodes);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   103
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   104
fun put_node name node (Version nodes) =
40481
da2c56aaaa68 more precise treatment of deleted nodes;
wenzelm
parents: 40449
diff changeset
   105
  Version (nodes
da2c56aaaa68 more precise treatment of deleted nodes;
wenzelm
parents: 40449
diff changeset
   106
    |> Graph.default_node (name, empty_node)
da2c56aaaa68 more precise treatment of deleted nodes;
wenzelm
parents: 40449
diff changeset
   107
    |> Graph.map_node name (K node));
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   108
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   109
end;
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   110
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   111
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   112
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   113
(** global state -- document structure and execution process **)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   114
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   115
abstype state = State of
40398
cdda2847a91e continue after failed commands;
wenzelm
parents: 40391
diff changeset
   116
 {versions: version Inttab.table,  (*version_id -> document content*)
38421
6cfc6fce7bfb document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents: 38419
diff changeset
   117
  commands: Toplevel.transition future Inttab.table,  (*command_id -> transition (future parsing)*)
40398
cdda2847a91e continue after failed commands;
wenzelm
parents: 40391
diff changeset
   118
  execs: (bool * Toplevel.state) lazy Inttab.table,  (*exec_id -> execution process*)
cdda2847a91e continue after failed commands;
wenzelm
parents: 40391
diff changeset
   119
  execution: unit future list}  (*global execution process*)
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   120
with
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   121
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   122
fun make_state (versions, commands, execs, execution) =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   123
  State {versions = versions, commands = commands, execs = execs, execution = execution};
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   124
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   125
fun map_state f (State {versions, commands, execs, execution}) =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   126
  make_state (f (versions, commands, execs, execution));
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   127
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   128
val init_state =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   129
  make_state (Inttab.make [(no_id, empty_version)],
38449
wenzelm
parents: 38448
diff changeset
   130
    Inttab.make [(no_id, Future.value Toplevel.empty)],
40398
cdda2847a91e continue after failed commands;
wenzelm
parents: 40391
diff changeset
   131
    Inttab.make [(no_id, Lazy.value (true, Toplevel.toplevel))],
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   132
    []);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   133
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   134
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   135
(* document versions *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   136
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   137
fun define_version (id: version_id) version =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   138
  map_state (fn (versions, commands, execs, execution) =>
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   139
    let val versions' = Inttab.update_new (id, version) versions
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   140
      handle Inttab.DUP dup => err_dup "document version" dup
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   141
    in (versions', commands, execs, execution) end);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   142
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   143
fun the_version (State {versions, ...}) (id: version_id) =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   144
  (case Inttab.lookup versions id of
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   145
    NONE => err_undef "document version" id
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   146
  | SOME version => version);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   147
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   148
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   149
(* commands *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   150
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   151
fun define_command (id: command_id) text =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   152
  map_state (fn (versions, commands, execs, execution) =>
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   153
    let
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   154
      val id_string = print_id id;
38421
6cfc6fce7bfb document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents: 38419
diff changeset
   155
      val tr = Future.fork_pri 2 (fn () =>
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   156
        Position.setmp_thread_data (Position.id_only id_string)
38421
6cfc6fce7bfb document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents: 38419
diff changeset
   157
          (fn () => Outer_Syntax.prepare_command (Position.id id_string) text) ());
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   158
      val commands' =
38421
6cfc6fce7bfb document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents: 38419
diff changeset
   159
        Inttab.update_new (id, tr) commands
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   160
          handle Inttab.DUP dup => err_dup "command" dup;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   161
    in (versions, commands', execs, execution) end);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   162
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   163
fun the_command (State {commands, ...}) (id: command_id) =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   164
  (case Inttab.lookup commands id of
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   165
    NONE => err_undef "command" id
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   166
  | SOME tr => tr);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   167
38421
6cfc6fce7bfb document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents: 38419
diff changeset
   168
fun join_commands (State {commands, ...}) =
6cfc6fce7bfb document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents: 38419
diff changeset
   169
  Inttab.fold (fn (_, tr) => fn () => ignore (Future.join_result tr)) commands ();
6cfc6fce7bfb document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents: 38419
diff changeset
   170
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   171
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   172
(* command executions *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   173
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   174
fun define_exec (id: exec_id) exec =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   175
  map_state (fn (versions, commands, execs, execution) =>
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   176
    let val execs' = Inttab.update_new (id, exec) execs
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   177
      handle Inttab.DUP dup => err_dup "command execution" dup
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   178
    in (versions, commands, execs', execution) end);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   179
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   180
fun the_exec (State {execs, ...}) (id: exec_id) =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   181
  (case Inttab.lookup execs id of
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   182
    NONE => err_undef "command execution" id
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   183
  | SOME exec => exec);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   184
41634
28d94383249c cancel document execution before editing, to improve reactivity on systems with few cores;
wenzelm
parents: 41630
diff changeset
   185
28d94383249c cancel document execution before editing, to improve reactivity on systems with few cores;
wenzelm
parents: 41630
diff changeset
   186
(* document execution *)
28d94383249c cancel document execution before editing, to improve reactivity on systems with few cores;
wenzelm
parents: 41630
diff changeset
   187
43666
7be2e51928cb clarified cancel_execution/await_cancellation;
wenzelm
parents: 43642
diff changeset
   188
fun cancel_execution (State {execution, ...}) =
7be2e51928cb clarified cancel_execution/await_cancellation;
wenzelm
parents: 43642
diff changeset
   189
  (List.app Future.cancel execution;
7be2e51928cb clarified cancel_execution/await_cancellation;
wenzelm
parents: 43642
diff changeset
   190
    fn () => ignore (Future.join_results execution));
41634
28d94383249c cancel document execution before editing, to improve reactivity on systems with few cores;
wenzelm
parents: 41630
diff changeset
   191
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   192
end;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   193
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   194
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   195
38888
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   196
(* toplevel transactions *)
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   197
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   198
local
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   199
40391
b0dafbfc05b7 explicit "timing" status for toplevel transactions;
wenzelm
parents: 40390
diff changeset
   200
fun timing tr t = Toplevel.status tr (Markup.timing t);
b0dafbfc05b7 explicit "timing" status for toplevel transactions;
wenzelm
parents: 40390
diff changeset
   201
38888
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   202
fun proof_status tr st =
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   203
  (case try Toplevel.proof_of st of
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   204
    SOME prf => Toplevel.status tr (Proof.status_markup prf)
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   205
  | NONE => ());
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   206
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   207
fun async_state tr st =
40534
9e196062bf88 clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents: 40532
diff changeset
   208
  ignore
41673
1c191a39549f support named tasks, for improved tracing;
wenzelm
parents: 41672
diff changeset
   209
    (singleton
41674
7da257539a8d tuned signature;
wenzelm
parents: 41673
diff changeset
   210
      (Future.forks {name = "Document.async_state",
41673
1c191a39549f support named tasks, for improved tracing;
wenzelm
parents: 41672
diff changeset
   211
        group = SOME (Task_Queue.new_group NONE), deps = [], pri = 0})
40534
9e196062bf88 clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents: 40532
diff changeset
   212
      (fn () =>
9e196062bf88 clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents: 40532
diff changeset
   213
        Toplevel.setmp_thread_position tr
9e196062bf88 clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents: 40532
diff changeset
   214
          (fn () => Toplevel.print_state false st) ()));
38888
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   215
40390
wenzelm
parents: 39391
diff changeset
   216
fun run int tr st =
wenzelm
parents: 39391
diff changeset
   217
  (case Toplevel.transition int tr st of
wenzelm
parents: 39391
diff changeset
   218
    SOME (st', NONE) => ([], SOME st')
wenzelm
parents: 39391
diff changeset
   219
  | SOME (_, SOME exn_info) =>
wenzelm
parents: 39391
diff changeset
   220
      (case ML_Compiler.exn_messages (Runtime.EXCURSION_FAIL exn_info) of
wenzelm
parents: 39391
diff changeset
   221
        [] => Exn.interrupt ()
wenzelm
parents: 39391
diff changeset
   222
      | errs => (errs, NONE))
wenzelm
parents: 39391
diff changeset
   223
  | NONE => ([ML_Compiler.exn_message Runtime.TERMINATE], NONE));
wenzelm
parents: 39391
diff changeset
   224
38888
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   225
in
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   226
41537
3837045cc8a1 full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents: 40534
diff changeset
   227
fun run_command thy_name raw_tr st =
38888
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   228
  (case
41537
3837045cc8a1 full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents: 40534
diff changeset
   229
      (case Toplevel.init_of raw_tr of
3837045cc8a1 full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents: 40534
diff changeset
   230
        SOME name => Exn.capture (fn () =>
3837045cc8a1 full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents: 40534
diff changeset
   231
          let
3837045cc8a1 full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents: 40534
diff changeset
   232
            val path = Path.explode thy_name;
3837045cc8a1 full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents: 40534
diff changeset
   233
            val _ = Thy_Header.consistent_name (Path.implode (Path.base path)) name;
3837045cc8a1 full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents: 40534
diff changeset
   234
          in Toplevel.modify_master (SOME (Path.dir path)) raw_tr end) ()
3837045cc8a1 full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents: 40534
diff changeset
   235
      | NONE => Exn.Result raw_tr) of
3837045cc8a1 full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents: 40534
diff changeset
   236
    Exn.Result tr =>
38888
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   237
      let
40534
9e196062bf88 clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents: 40532
diff changeset
   238
        val is_init = is_some (Toplevel.init_of tr);
9e196062bf88 clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents: 40532
diff changeset
   239
        val is_proof = Keyword.is_proof (Toplevel.name_of tr);
9e196062bf88 clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents: 40532
diff changeset
   240
        val do_print = not is_init andalso (Toplevel.print_of tr orelse is_proof);
9e196062bf88 clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents: 40532
diff changeset
   241
42012
2c3fe3cbebae structure Timing: covers former start_timing/end_timing and Output.timeit etc;
wenzelm
parents: 41674
diff changeset
   242
        val start = Timing.start ();
42328
61879dc97e72 more permissive run_command: identity execution for empty toplevel, e.g. after malformed theory header;
wenzelm
parents: 42012
diff changeset
   243
        val (errs, result) =
61879dc97e72 more permissive run_command: identity execution for empty toplevel, e.g. after malformed theory header;
wenzelm
parents: 42012
diff changeset
   244
          if Toplevel.is_toplevel st andalso not is_init then ([], SOME st)
61879dc97e72 more permissive run_command: identity execution for empty toplevel, e.g. after malformed theory header;
wenzelm
parents: 42012
diff changeset
   245
          else run (is_init orelse is_proof) (Toplevel.set_print false tr) st;
42012
2c3fe3cbebae structure Timing: covers former start_timing/end_timing and Output.timeit etc;
wenzelm
parents: 41674
diff changeset
   246
        val _ = timing tr (Timing.result start);
38888
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   247
        val _ = List.app (Toplevel.error_msg tr) errs;
40398
cdda2847a91e continue after failed commands;
wenzelm
parents: 40391
diff changeset
   248
        val res =
38888
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   249
          (case result of
40398
cdda2847a91e continue after failed commands;
wenzelm
parents: 40391
diff changeset
   250
            NONE => (Toplevel.status tr Markup.failed; (false, st))
38888
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   251
          | SOME st' =>
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   252
             (Toplevel.status tr Markup.finished;
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   253
              proof_status tr st';
40534
9e196062bf88 clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents: 40532
diff changeset
   254
              if do_print then async_state tr st' else ();
40398
cdda2847a91e continue after failed commands;
wenzelm
parents: 40391
diff changeset
   255
              (true, st')));
cdda2847a91e continue after failed commands;
wenzelm
parents: 40391
diff changeset
   256
      in res end
38888
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   257
  | Exn.Exn exn =>
39238
7189a138dd6c refined Runtime.toplevel_error/Document.run_command: let interrupts pass unhindered;
wenzelm
parents: 39232
diff changeset
   258
      if Exn.is_interrupt exn then reraise exn
7189a138dd6c refined Runtime.toplevel_error/Document.run_command: let interrupts pass unhindered;
wenzelm
parents: 39232
diff changeset
   259
      else
41537
3837045cc8a1 full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents: 40534
diff changeset
   260
       (Toplevel.error_msg raw_tr (ML_Compiler.exn_message exn);
3837045cc8a1 full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents: 40534
diff changeset
   261
        Toplevel.status raw_tr Markup.failed;
40398
cdda2847a91e continue after failed commands;
wenzelm
parents: 40391
diff changeset
   262
        (false, Toplevel.toplevel)));
38888
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   263
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   264
end;
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   265
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   266
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   267
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   268
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   269
(** editing **)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   270
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   271
(* edit *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   272
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   273
local
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   274
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   275
fun is_changed node' ((_, id), exec) =
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   276
  (case try (the_entry node') id of
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   277
    NONE => true
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   278
  | SOME exec' => exec' <> exec);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   279
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   280
fun new_exec name (id: command_id) (exec_id, updates, state) =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   281
  let
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   282
    val exec = the_exec state exec_id;
38419
f9dc924e54f8 renamed create_id to new_id;
wenzelm
parents: 38418
diff changeset
   283
    val exec_id' = new_id ();
38449
wenzelm
parents: 38448
diff changeset
   284
    val future_tr = the_command state id;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   285
    val exec' =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   286
      Lazy.lazy (fn () =>
40398
cdda2847a91e continue after failed commands;
wenzelm
parents: 40391
diff changeset
   287
        let
cdda2847a91e continue after failed commands;
wenzelm
parents: 40391
diff changeset
   288
          val st = #2 (Lazy.force exec);
cdda2847a91e continue after failed commands;
wenzelm
parents: 40391
diff changeset
   289
          val exec_tr = Toplevel.put_id (print_id exec_id') (Future.join future_tr);
cdda2847a91e continue after failed commands;
wenzelm
parents: 40391
diff changeset
   290
        in run_command name exec_tr st end);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   291
    val state' = define_exec exec_id' exec' state;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   292
  in (exec_id', (id, exec_id') :: updates, state') end;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   293
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   294
in
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   295
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   296
fun edit (old_id: version_id) (new_id: version_id) edits state =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   297
  let
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   298
    val old_version = the_version state old_id;
41629
5490dc4d999d workaround for odd x86_64 problem in Poly/ML 5.4.0 (actually SVN 1151?), which causes unexpected nontermination of Isabelle/Scala document editing;
wenzelm
parents: 41537
diff changeset
   299
    val _ = Time.now ();  (* FIXME odd workaround *)
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   300
    val new_version = fold edit_nodes edits old_version;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   301
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   302
    fun update_node name (rev_updates, version, st) =
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   303
      let val node = get_node version name in
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   304
        (case first_entry NONE (is_changed (get_node old_version name)) node of
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   305
          NONE => (rev_updates, version, st)
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   306
        | SOME ((prev, id), _) =>
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   307
            let
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   308
              val prev_exec =
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   309
                (case prev of
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   310
                  NONE => no_id
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   311
                | SOME prev_id => the_default no_id (the_entry node prev_id));
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   312
              val (_, rev_upds, st') =
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   313
                fold_entries (SOME id) (new_exec name o #2 o #1) node (prev_exec, [], st);
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   314
              val node' = fold update_entry rev_upds node;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   315
            in (rev_upds @ rev_updates, put_node name node' version, st') end)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   316
      end;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   317
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   318
    (* FIXME proper node deps *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   319
    val (rev_updates, new_version', state') =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   320
      fold update_node (node_names_of new_version) ([], new_version, state);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   321
    val state'' = define_version new_id new_version' state';
38421
6cfc6fce7bfb document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents: 38419
diff changeset
   322
6cfc6fce7bfb document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents: 38419
diff changeset
   323
    val _ = join_commands state'';  (* FIXME async!? *)
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   324
  in (rev rev_updates, state'') end;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   325
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   326
end;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   327
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   328
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   329
(* execute *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   330
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   331
fun execute version_id state =
41673
1c191a39549f support named tasks, for improved tracing;
wenzelm
parents: 41672
diff changeset
   332
  state |> map_state (fn (versions, commands, execs, _) =>
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   333
    let
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   334
      val version = the_version state version_id;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   335
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   336
      fun force_exec NONE = ()
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   337
        | force_exec (SOME exec_id) = ignore (Lazy.force (the_exec state exec_id));
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   338
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   339
      val execution' = (* FIXME proper node deps *)
41674
7da257539a8d tuned signature;
wenzelm
parents: 41673
diff changeset
   340
        Future.forks {name = "Document.execute", group = NONE, deps = [], pri = 1}
41673
1c191a39549f support named tasks, for improved tracing;
wenzelm
parents: 41672
diff changeset
   341
          [fn () =>
43666
7be2e51928cb clarified cancel_execution/await_cancellation;
wenzelm
parents: 43642
diff changeset
   342
            node_names_of version |> List.app (fn name =>
7be2e51928cb clarified cancel_execution/await_cancellation;
wenzelm
parents: 43642
diff changeset
   343
              fold_entries NONE (fn (_, exec) => fn () => force_exec exec)
7be2e51928cb clarified cancel_execution/await_cancellation;
wenzelm
parents: 43642
diff changeset
   344
                  (get_node version name) ())];
40520
77a7b0a7d4b1 await_cancellation in the main thread, independently of the execution futures, which might get interrupted or be absent after node deletetion;
wenzelm
parents: 40481
diff changeset
   345
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   346
    in (versions, commands, execs, execution') end);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   347
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   348
end;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   349