src/Pure/PIDE/document.ML
author wenzelm
Fri, 26 Aug 2011 15:09:54 +0200
changeset 44479 9a04e7502e22
parent 44478 4fdb1009a370
child 44480 38c5b085fb1c
permissions -rw-r--r--
refined document state assignment: observe perspective, more explicit assignment message; misc tuning and clarification;
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
44478
4fdb1009a370 tuned signature -- emphasize traditional read/eval/print terminology, which is still relevant here;
wenzelm
parents: 44476
diff changeset
     5
list of commands, with asynchronous read/eval/print processes.
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
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
    18
  type node_header = (string * string list * (string * bool) list) Exn.result
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
    19
  datatype node_edit =
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
    20
    Clear |
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
    21
    Edits of (command_id option * command_id option) list |
44384
8f6054a63f96 some support for editor perspective;
wenzelm
parents: 44338
diff changeset
    22
    Header of node_header |
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
    23
    Perspective of command_id list
44156
6aa25b80e1a5 explicit datatypes for document node edits;
wenzelm
parents: 44113
diff changeset
    24
  type edit = string * node_edit
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    25
  type state
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    26
  val init_state: state
44441
fe95e4306b4b misc tuning and simplification;
wenzelm
parents: 44440
diff changeset
    27
  val define_command: command_id -> string -> state -> state
44197
458573968568 refined Document.edit: less stateful update via Graph.schedule;
wenzelm
parents: 44196
diff changeset
    28
  val join_commands: state -> unit
44301
65f60d9ac4bf tuned signature (again);
wenzelm
parents: 44300
diff changeset
    29
  val cancel_execution: state -> Future.task list
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
    30
  val update_perspective: version_id -> version_id -> string -> command_id list -> state -> state
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    31
  val edit: version_id -> version_id -> edit list -> state ->
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
    32
    ((command_id * exec_id option) list * (string * command_id option) list) * state
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    33
  val execute: version_id -> state -> state
43713
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
    34
  val state: unit -> state
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
    35
  val change_state: (state -> state) -> unit
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    36
end;
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    37
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    38
structure Document: DOCUMENT =
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    39
struct
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    40
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    41
(* unique identifiers *)
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    42
38363
af7f41a8a0a8 clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents: 38355
diff changeset
    43
type id = int;
38373
wenzelm
parents: 38363
diff changeset
    44
type version_id = id;
38363
af7f41a8a0a8 clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents: 38355
diff changeset
    45
type command_id = id;
38373
wenzelm
parents: 38363
diff changeset
    46
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
    47
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
    48
val no_id = 0;
40449
9c390868d255 added general Synchronized.counter convenience;
wenzelm
parents: 40398
diff changeset
    49
val new_id = Synchronized.counter ();
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    50
38414
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38373
diff changeset
    51
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
    52
val print_id = Markup.print_int;
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    53
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    54
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
    55
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
    56
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    57
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    58
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    59
(** document structure **)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    60
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
    61
type node_header = (string * string list * (string * bool) list) Exn.result;
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    62
type perspective = (command_id -> bool) * command_id option; (*visible commands, last*)
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    63
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
    64
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
    65
abstype node = Node of
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
    66
 {touched: bool,
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
    67
  header: node_header,
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    68
  perspective: perspective,
44180
a6dc270d3edb maintain node header;
wenzelm
parents: 44160
diff changeset
    69
  entries: exec_id option Entries.T,  (*command entries with excecutions*)
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    70
  last_exec: command_id option,  (*last command with exec state assignment*)
44197
458573968568 refined Document.edit: less stateful update via Graph.schedule;
wenzelm
parents: 44196
diff changeset
    71
  result: Toplevel.state lazy}
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
    72
and version = Version of node Graph.T  (*development graph wrt. static imports*)
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    73
with
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    74
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    75
fun make_node (touched, header, perspective, entries, last_exec, result) =
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
    76
  Node {touched = touched, header = header, perspective = perspective,
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    77
    entries = entries, last_exec = last_exec, result = result};
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
    78
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    79
fun map_node f (Node {touched, header, perspective, entries, last_exec, result}) =
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    80
  make_node (f (touched, header, perspective, entries, last_exec, result));
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    81
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    82
fun make_perspective command_ids : perspective =
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    83
  (Inttab.defined (Inttab.make (map (rpair ()) command_ids)), try List.last command_ids);
44441
fe95e4306b4b misc tuning and simplification;
wenzelm
parents: 44440
diff changeset
    84
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    85
val no_header = Exn.Exn (ERROR "Bad theory header");
44441
fe95e4306b4b misc tuning and simplification;
wenzelm
parents: 44440
diff changeset
    86
val no_perspective = make_perspective [];
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    87
val no_print = Lazy.value ();
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    88
val no_result = Lazy.value Toplevel.toplevel;
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    89
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    90
val empty_node = make_node (false, no_header, no_perspective, Entries.empty, NONE, no_result);
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    91
val clear_node = map_node (fn (_, header, _, _, _, _) =>
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    92
  (false, header, no_perspective, Entries.empty, NONE, no_result));
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    93
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    94
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    95
(* basic components *)
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    96
44446
f9334afb6945 misc tuning and simplification;
wenzelm
parents: 44445
diff changeset
    97
fun is_touched (Node {touched, ...}) = touched;
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
    98
fun set_touched touched =
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    99
  map_node (fn (_, header, perspective, entries, last_exec, result) =>
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   100
    (touched, header, perspective, entries, last_exec, result));
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   101
44180
a6dc270d3edb maintain node header;
wenzelm
parents: 44160
diff changeset
   102
fun get_header (Node {header, ...}) = header;
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
   103
fun set_header header =
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   104
  map_node (fn (touched, _, perspective, entries, last_exec, result) =>
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   105
    (touched, header, perspective, entries, last_exec, result));
44180
a6dc270d3edb maintain node header;
wenzelm
parents: 44160
diff changeset
   106
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
   107
fun get_perspective (Node {perspective, ...}) = perspective;
44441
fe95e4306b4b misc tuning and simplification;
wenzelm
parents: 44440
diff changeset
   108
fun set_perspective ids =
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   109
  map_node (fn (touched, header, _, entries, last_exec, result) =>
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   110
    (touched, header, make_perspective ids, entries, last_exec, result));
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
   111
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   112
fun map_entries f =
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   113
  map_node (fn (touched, header, perspective, entries, last_exec, result) =>
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   114
    (touched, header, perspective, f entries, last_exec, result));
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   115
fun fold_entries start f (Node {entries, ...}) = Entries.fold start f entries;
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   116
fun first_entry start P (Node {entries, ...}) = Entries.get_first start P entries;
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   117
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   118
fun get_last_exec (Node {last_exec, ...}) = last_exec;
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   119
fun set_last_exec last_exec =
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   120
  map_node (fn (touched, header, perspective, entries, _, result) =>
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   121
    (touched, header, perspective, entries, last_exec, result));
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   122
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   123
fun get_theory pos (Node {result, ...}) = Toplevel.end_theory pos (Lazy.force result);
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
   124
fun set_result result =
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   125
  map_node (fn (touched, header, perspective, entries, last_exec, _) =>
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   126
    (touched, header, perspective, entries, last_exec, result));
44180
a6dc270d3edb maintain node header;
wenzelm
parents: 44160
diff changeset
   127
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   128
fun get_node nodes name = Graph.get_node nodes name handle Graph.UNDEF _ => empty_node;
44202
44c4ae5c5ce2 touch descendants of edited nodes;
wenzelm
parents: 44201
diff changeset
   129
fun default_node name = Graph.default_node (name, empty_node);
44c4ae5c5ce2 touch descendants of edited nodes;
wenzelm
parents: 44201
diff changeset
   130
fun update_node name f = default_node name #> Graph.map_node name f;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   131
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   132
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   133
(* node edits and associated executions *)
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   134
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   135
datatype node_edit =
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   136
  Clear |
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   137
  Edits of (command_id option * command_id option) list |
44384
8f6054a63f96 some support for editor perspective;
wenzelm
parents: 44338
diff changeset
   138
  Header of node_header |
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
   139
  Perspective of command_id list;
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   140
44156
6aa25b80e1a5 explicit datatypes for document node edits;
wenzelm
parents: 44113
diff changeset
   141
type edit = string * node_edit;
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   142
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   143
fun next_entry (Node {entries, ...}) id =
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   144
  (case Entries.lookup entries id of
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   145
    NONE => err_undef "command entry" id
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   146
  | SOME (_, next) => next);
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   147
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   148
fun the_entry (Node {entries, ...}) id =
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   149
  (case Entries.lookup entries id of
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   150
    NONE => err_undef "command entry" id
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   151
  | SOME (exec, _) => exec);
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   152
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   153
fun the_default_entry node (SOME id) = the_default no_id (the_entry node id)
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   154
  | the_default_entry _ NONE = no_id;
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   155
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   156
fun update_entry id exec_id =
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   157
  map_entries (Entries.update (id, SOME exec_id));
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   158
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   159
fun reset_after id entries =
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   160
  (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
   161
    NONE => entries
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   162
  | 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
   163
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   164
val edit_node = map_entries o fold
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   165
  (fn (id, SOME id2) => Entries.insert_after id (id2, NONE)
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   166
    | (id, NONE) => Entries.delete_after id #> reset_after id);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   167
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   168
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   169
(* version operations *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   170
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   171
val empty_version = Version Graph.empty;
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   172
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   173
fun nodes_of (Version nodes) = nodes;
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   174
val node_of = get_node o nodes_of;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   175
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   176
local
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   177
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   178
fun cycle_msg names = "Cyclic dependency of " ^ space_implode " via " (map quote names);
44180
a6dc270d3edb maintain node header;
wenzelm
parents: 44160
diff changeset
   179
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   180
fun touch_node name nodes =
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   181
  fold (fn desc =>
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   182
      update_node desc (set_touched true) #>
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   183
      desc <> name ? update_node desc (map_entries (reset_after NONE)))
44202
44c4ae5c5ce2 touch descendants of edited nodes;
wenzelm
parents: 44201
diff changeset
   184
    (Graph.all_succs nodes [name]) nodes;
44c4ae5c5ce2 touch descendants of edited nodes;
wenzelm
parents: 44201
diff changeset
   185
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   186
in
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   187
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   188
fun edit_nodes (name, node_edit) (Version nodes) =
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   189
  Version
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   190
    (case node_edit of
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   191
      Clear =>
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   192
        nodes
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   193
        |> update_node name clear_node
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   194
        |> touch_node name
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   195
    | Edits edits =>
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   196
        nodes
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   197
        |> update_node name (edit_node edits)
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   198
        |> touch_node name
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   199
    | Header header =>
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   200
        let
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   201
          val parents = (case header of Exn.Res (_, parents, _) => parents | _ => []);
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   202
          val nodes1 = nodes
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   203
            |> default_node name
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   204
            |> fold default_node parents;
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   205
          val nodes2 = nodes1
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   206
            |> Graph.Keys.fold
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   207
                (fn dep => Graph.del_edge (dep, name)) (Graph.imm_preds nodes1 name);
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   208
          val (header', nodes3) =
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   209
            (header, Graph.add_deps_acyclic (name, parents) nodes2)
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   210
              handle Graph.CYCLES cs => (Exn.Exn (ERROR (cat_lines (map cycle_msg cs))), nodes2);
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   211
        in Graph.map_node name (set_header header') nodes3 end
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   212
        |> touch_node name
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   213
    | Perspective perspective =>
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   214
        nodes
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   215
        |> update_node name (set_perspective perspective)
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   216
        |> touch_node name (* FIXME more precise!?! *));
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   217
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   218
end;
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   219
44222
9d5ef6cd4ee1 use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents: 44202
diff changeset
   220
fun put_node (name, node) (Version nodes) =
9d5ef6cd4ee1 use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents: 44202
diff changeset
   221
  Version (update_node name (K node) nodes);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   222
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   223
end;
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   224
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   225
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   226
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   227
(** global state -- document structure and execution process **)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   228
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   229
abstype state = State of
40398
cdda2847a91e continue after failed commands;
wenzelm
parents: 40391
diff changeset
   230
 {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
   231
  commands: Toplevel.transition future Inttab.table,  (*command_id -> transition (future parsing)*)
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   232
  execs: (command_id * (Toplevel.state * unit lazy) lazy) Inttab.table,
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   233
    (*exec_id -> command_id with eval/print process*)
44300
349cc426d929 tuned signature -- treat structure Task_Queue as private to implementation;
wenzelm
parents: 44299
diff changeset
   234
  execution: Future.group}  (*global execution process*)
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   235
with
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   236
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   237
fun make_state (versions, commands, execs, execution) =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   238
  State {versions = versions, commands = commands, execs = execs, execution = execution};
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   239
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   240
fun map_state f (State {versions, commands, execs, execution}) =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   241
  make_state (f (versions, commands, execs, execution));
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   242
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   243
val init_state =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   244
  make_state (Inttab.make [(no_id, empty_version)],
38449
wenzelm
parents: 38448
diff changeset
   245
    Inttab.make [(no_id, Future.value Toplevel.empty)],
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   246
    Inttab.make [(no_id, (no_id, Lazy.value (Toplevel.toplevel, no_print)))],
44300
349cc426d929 tuned signature -- treat structure Task_Queue as private to implementation;
wenzelm
parents: 44299
diff changeset
   247
    Future.new_group NONE);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   248
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   249
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   250
(* document versions *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   251
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   252
fun define_version (id: version_id) version =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   253
  map_state (fn (versions, commands, execs, execution) =>
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   254
    let val versions' = Inttab.update_new (id, version) versions
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   255
      handle Inttab.DUP dup => err_dup "document version" dup
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   256
    in (versions', commands, execs, execution) end);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   257
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   258
fun the_version (State {versions, ...}) (id: version_id) =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   259
  (case Inttab.lookup versions id of
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   260
    NONE => err_undef "document version" id
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   261
  | SOME version => version);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   262
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   263
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   264
(* commands *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   265
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   266
fun define_command (id: command_id) text =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   267
  map_state (fn (versions, commands, execs, execution) =>
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   268
    let
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   269
      val id_string = print_id id;
44302
wenzelm
parents: 44301
diff changeset
   270
      val tr =
wenzelm
parents: 44301
diff changeset
   271
        Future.fork_pri 2 (fn () =>
wenzelm
parents: 44301
diff changeset
   272
          Position.setmp_thread_data (Position.id_only id_string)
44478
4fdb1009a370 tuned signature -- emphasize traditional read/eval/print terminology, which is still relevant here;
wenzelm
parents: 44476
diff changeset
   273
            (fn () => Outer_Syntax.read_command (Position.id id_string) text) ());
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   274
      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
   275
        Inttab.update_new (id, tr) commands
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   276
          handle Inttab.DUP dup => err_dup "command" dup;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   277
    in (versions, commands', execs, execution) end);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   278
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   279
fun the_command (State {commands, ...}) (id: command_id) =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   280
  (case Inttab.lookup commands id of
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   281
    NONE => err_undef "command" id
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   282
  | SOME tr => tr);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   283
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
   284
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
   285
  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
   286
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   287
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   288
(* command executions *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   289
44197
458573968568 refined Document.edit: less stateful update via Graph.schedule;
wenzelm
parents: 44196
diff changeset
   290
fun define_exec (exec_id, exec) =
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   291
  map_state (fn (versions, commands, execs, execution) =>
44197
458573968568 refined Document.edit: less stateful update via Graph.schedule;
wenzelm
parents: 44196
diff changeset
   292
    let val execs' = Inttab.update_new (exec_id, exec) execs
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   293
      handle Inttab.DUP dup => err_dup "command execution" dup
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   294
    in (versions, commands, execs', execution) end);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   295
44197
458573968568 refined Document.edit: less stateful update via Graph.schedule;
wenzelm
parents: 44196
diff changeset
   296
fun the_exec (State {execs, ...}) exec_id =
458573968568 refined Document.edit: less stateful update via Graph.schedule;
wenzelm
parents: 44196
diff changeset
   297
  (case Inttab.lookup execs exec_id of
458573968568 refined Document.edit: less stateful update via Graph.schedule;
wenzelm
parents: 44196
diff changeset
   298
    NONE => err_undef "command execution" exec_id
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   299
  | SOME exec => exec);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   300
41634
28d94383249c cancel document execution before editing, to improve reactivity on systems with few cores;
wenzelm
parents: 41630
diff changeset
   301
28d94383249c cancel document execution before editing, to improve reactivity on systems with few cores;
wenzelm
parents: 41630
diff changeset
   302
(* document execution *)
28d94383249c cancel document execution before editing, to improve reactivity on systems with few cores;
wenzelm
parents: 41630
diff changeset
   303
44299
061599cb6eb0 refined Future.cancel: explicit future allows to join actual cancellation;
wenzelm
parents: 44271
diff changeset
   304
fun cancel_execution (State {execution, ...}) = Future.cancel_group execution;
41634
28d94383249c cancel document execution before editing, to improve reactivity on systems with few cores;
wenzelm
parents: 41630
diff changeset
   305
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   306
end;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   307
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   308
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   309
38888
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   310
(* toplevel transactions *)
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   311
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   312
local
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   313
44440
aa2abd81f460 ignore irrelevant timings;
wenzelm
parents: 44439
diff changeset
   314
fun timing tr t =
aa2abd81f460 ignore irrelevant timings;
wenzelm
parents: 44439
diff changeset
   315
  if Timing.is_relevant t then Toplevel.status tr (Markup.timing t) else ();
40391
b0dafbfc05b7 explicit "timing" status for toplevel transactions;
wenzelm
parents: 40390
diff changeset
   316
38888
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   317
fun proof_status tr st =
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   318
  (case try Toplevel.proof_of st of
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   319
    SOME prf => Toplevel.status tr (Proof.status_markup prf)
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   320
  | NONE => ());
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   321
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   322
fun print_state tr st =
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   323
  (Lazy.lazy o Toplevel.setmp_thread_position tr)
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   324
    (fn () => Toplevel.print_state false st);
38888
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   325
40390
wenzelm
parents: 39391
diff changeset
   326
fun run int tr st =
wenzelm
parents: 39391
diff changeset
   327
  (case Toplevel.transition int tr st of
wenzelm
parents: 39391
diff changeset
   328
    SOME (st', NONE) => ([], SOME st')
44271
89f40a5939b2 more precise treatment of exception nesting and serial numbers;
wenzelm
parents: 44270
diff changeset
   329
  | SOME (_, SOME (exn, _)) =>
89f40a5939b2 more precise treatment of exception nesting and serial numbers;
wenzelm
parents: 44270
diff changeset
   330
      (case ML_Compiler.exn_messages exn of
40390
wenzelm
parents: 39391
diff changeset
   331
        [] => Exn.interrupt ()
wenzelm
parents: 39391
diff changeset
   332
      | errs => (errs, NONE))
44270
3eaad39e520c more careful treatment of exception serial numbers, with propagation to message channel;
wenzelm
parents: 44247
diff changeset
   333
  | NONE => ([(serial (), ML_Compiler.exn_message Runtime.TERMINATE)], NONE));
40390
wenzelm
parents: 39391
diff changeset
   334
38888
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   335
in
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   336
44199
e38885e3ea60 retrieve imports from document state, with fall-back on theory loader for preloaded theories;
wenzelm
parents: 44198
diff changeset
   337
fun run_command tr st =
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   338
  let
44199
e38885e3ea60 retrieve imports from document state, with fall-back on theory loader for preloaded theories;
wenzelm
parents: 44198
diff changeset
   339
    val is_init = Toplevel.is_init tr;
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   340
    val is_proof = Keyword.is_proof (Toplevel.name_of tr);
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   341
    val do_print = not is_init andalso (Toplevel.print_of tr orelse is_proof);
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   342
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   343
    val start = Timing.start ();
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   344
    val (errs, result) =
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   345
      if Toplevel.is_toplevel st andalso not is_init then ([], SOME st)
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   346
      else run (is_init orelse is_proof) (Toplevel.set_print false tr) st;
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   347
    val _ = timing tr (Timing.result start);
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   348
    val _ = List.app (Toplevel.error_msg tr) errs;
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   349
  in
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   350
    (case result of
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   351
      NONE => (Toplevel.status tr Markup.failed; (st, no_print))
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   352
    | SOME st' =>
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   353
       (Toplevel.status tr Markup.finished;
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   354
        proof_status tr st';
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   355
        (st', if do_print then print_state tr st' else no_print)))
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   356
  end;
38888
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   357
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   358
end;
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   359
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   360
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   361
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   362
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   363
(** editing **)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   364
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   365
(* perspective *)
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   366
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   367
fun update_perspective (old_id: version_id) (new_id: version_id) name perspective state =
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   368
  let
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   369
    val old_version = the_version state old_id;
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   370
    val _ = Time.now ();  (* FIXME odd workaround for polyml-5.4.0/x86_64 -- needed? *)
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   371
    val new_version = edit_nodes (name, Perspective perspective) old_version;
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   372
  in define_version new_id new_version state end;
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   373
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   374
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   375
(* edit *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   376
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   377
local
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   378
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   379
fun after_perspective node ((prev, _), _) = #2 (get_perspective node) = prev;
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   380
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   381
fun needs_update node0 ((_, id), SOME exec) =
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   382
      (case try (the_entry node0) id of
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   383
        SOME (SOME exec0) => exec0 <> exec
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   384
      | _ => true)
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   385
  | needs_update _ _ = true;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   386
44441
fe95e4306b4b misc tuning and simplification;
wenzelm
parents: 44440
diff changeset
   387
fun init_theory deps name node =
44435
wenzelm
parents: 44386
diff changeset
   388
  let
wenzelm
parents: 44386
diff changeset
   389
    val (thy_name, imports, uses) = Exn.release (get_header node);
wenzelm
parents: 44386
diff changeset
   390
    (* FIXME provide files via Scala layer *)
wenzelm
parents: 44386
diff changeset
   391
    val (dir, files) =
wenzelm
parents: 44386
diff changeset
   392
      if ML_System.platform_is_cygwin then (Path.current, [])
wenzelm
parents: 44386
diff changeset
   393
      else (Path.dir (Path.explode name), map (apfst Path.explode) uses);
wenzelm
parents: 44386
diff changeset
   394
wenzelm
parents: 44386
diff changeset
   395
    val parents =
wenzelm
parents: 44386
diff changeset
   396
      imports |> map (fn import =>
44441
fe95e4306b4b misc tuning and simplification;
wenzelm
parents: 44440
diff changeset
   397
        (case Thy_Info.lookup_theory import of  (* FIXME more robust!? *)
44435
wenzelm
parents: 44386
diff changeset
   398
          SOME thy => thy
wenzelm
parents: 44386
diff changeset
   399
        | NONE =>
wenzelm
parents: 44386
diff changeset
   400
            get_theory (Position.file_only import)
wenzelm
parents: 44386
diff changeset
   401
              (#2 (Future.join (the (AList.lookup (op =) deps import))))));
wenzelm
parents: 44386
diff changeset
   402
  in Thy_Load.begin_theory dir thy_name imports files parents end;
wenzelm
parents: 44386
diff changeset
   403
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   404
fun new_exec state init command_id' (execs, exec) =
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   405
  let
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   406
    val command' = the_command state command_id';
38419
f9dc924e54f8 renamed create_id to new_id;
wenzelm
parents: 38418
diff changeset
   407
    val exec_id' = new_id ();
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   408
    val exec' =
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   409
      snd exec |> Lazy.map (fn (st, _) =>
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   410
        let val tr =
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   411
          Future.join command'
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   412
          |> Toplevel.modify_init init
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   413
          |> Toplevel.put_id (print_id exec_id');
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   414
        in run_command tr st end)
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   415
      |> pair command_id';
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   416
  in ((exec_id', exec') :: execs, exec') end;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   417
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   418
in
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   419
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   420
fun edit (old_id: version_id) (new_id: version_id) edits state =
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   421
  let
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   422
    val old_version = the_version state old_id;
44180
a6dc270d3edb maintain node header;
wenzelm
parents: 44160
diff changeset
   423
    val _ = Time.now ();  (* FIXME odd workaround for polyml-5.4.0/x86_64 *)
44222
9d5ef6cd4ee1 use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents: 44202
diff changeset
   424
    val new_version = fold edit_nodes edits old_version;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   425
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   426
    val updated =
44197
458573968568 refined Document.edit: less stateful update via Graph.schedule;
wenzelm
parents: 44196
diff changeset
   427
      nodes_of new_version |> Graph.schedule
44199
e38885e3ea60 retrieve imports from document state, with fall-back on theory loader for preloaded theories;
wenzelm
parents: 44198
diff changeset
   428
        (fn deps => fn (name, node) =>
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   429
          if not (is_touched node) then Future.value (([], [], []), node)
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   430
          else
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   431
            let
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   432
              val node0 = node_of old_version name;
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   433
              fun init () = init_theory deps name node;
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   434
            in
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   435
              (case first_entry NONE (after_perspective node orf needs_update node0) node of
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   436
                NONE => Future.value (([], [], []), set_touched false node)
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   437
              | SOME ((prev, id), _) =>
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   438
                  (singleton o Future.forks)
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   439
                    {name = "Document.edit", group = NONE,
44445
364fd07398f5 tuned pri: prefer purging of canceled execution;
wenzelm
parents: 44444
diff changeset
   440
                      deps = map (Future.task_of o #2) deps, pri = 0, interrupts = false}
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   441
                    (fn () =>
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   442
                      let
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   443
                        val (execs, exec) =
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   444
                          fold_entries (SOME id)
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   445
                            (fn entry1 as ((_, id1), _) => fn res =>
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   446
                              if after_perspective node entry1 then NONE
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   447
                              else SOME (new_exec state init id1 res))
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   448
                            node ([], the_exec state (the_default_entry node prev));
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   449
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   450
                        val no_execs =
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   451
                          if can (the_entry node0) id then
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   452
                            fold_entries (SOME id)
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   453
                              (fn ((_, id0), exec0) => fn res =>
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   454
                                if is_none exec0 then NONE
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   455
                                else if exists (fn (_, (id1, _)) => id0 = id1) execs then SOME res
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   456
                                else SOME (id0 :: res)) node0 []
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   457
                          else [];
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   458
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   459
                        val node1 =
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   460
                          fold (fn (exec_id, (command_id, _)) => update_entry command_id exec_id)
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   461
                            execs node;
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   462
                        val last_exec = if #1 exec = no_id then NONE else SOME (#1 exec);
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   463
                        val result =
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   464
                          if is_some last_exec andalso is_none (next_entry node1 (the last_exec))
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   465
                          then Lazy.map #1 (#2 exec)
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   466
                          else no_result;
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   467
                        val node2 = node1
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   468
                          |> set_last_exec last_exec
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   469
                          |> set_result result
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   470
                          |> set_touched false;
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   471
                      in ((no_execs, execs, [(name, node2)]), node2) end))
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   472
            end)
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   473
      |> Future.joins |> map #1;
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   474
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   475
    val command_execs =
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   476
      map (rpair NONE) (maps #1 updated) @
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   477
      map (fn (exec_id, (command_id, _)) => (command_id, SOME exec_id)) (maps #2 updated);
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   478
    val updated_nodes = maps #3 updated;
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   479
    val last_execs = map (fn (name, node) => (name, get_last_exec node)) updated_nodes;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   480
44197
458573968568 refined Document.edit: less stateful update via Graph.schedule;
wenzelm
parents: 44196
diff changeset
   481
    val state' = state
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   482
      |> fold (fold define_exec o #2) updated
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   483
      |> define_version new_id (fold put_node updated_nodes new_version);
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   484
  in ((command_execs, last_execs), state') end;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   485
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   486
end;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   487
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   488
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   489
(* execute *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   490
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   491
fun execute version_id state =
41673
1c191a39549f support named tasks, for improved tracing;
wenzelm
parents: 41672
diff changeset
   492
  state |> map_state (fn (versions, commands, execs, _) =>
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   493
    let
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   494
      val version = the_version state version_id;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   495
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   496
      fun force_exec _ NONE = ()
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   497
        | force_exec node (SOME exec_id) =
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   498
            let
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   499
              val (command_id, exec) = the_exec state exec_id;
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   500
              val (_, print) = Lazy.force exec;
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   501
              val _ =
44439
2bcd2aefaf7f print state only for visible command, to avoid wasting resources for the larger part of the text;
wenzelm
parents: 44436
diff changeset
   502
                if #1 (get_perspective node) command_id
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   503
                then ignore (Lazy.future Future.default_params print)
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   504
                else ();
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   505
            in () end;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   506
44300
349cc426d929 tuned signature -- treat structure Task_Queue as private to implementation;
wenzelm
parents: 44299
diff changeset
   507
      val execution = Future.new_group NONE;
44299
061599cb6eb0 refined Future.cancel: explicit future allows to join actual cancellation;
wenzelm
parents: 44271
diff changeset
   508
      val _ =
44201
6429ab1b6883 parellel scheduling of node edits and execution;
wenzelm
parents: 44200
diff changeset
   509
        nodes_of version |> Graph.schedule
6429ab1b6883 parellel scheduling of node edits and execution;
wenzelm
parents: 44200
diff changeset
   510
          (fn deps => fn (name, node) =>
44302
wenzelm
parents: 44301
diff changeset
   511
            (singleton o Future.forks)
wenzelm
parents: 44301
diff changeset
   512
              {name = "theory:" ^ name, group = SOME (Future.new_group (SOME execution)),
wenzelm
parents: 44301
diff changeset
   513
                deps = map (Future.task_of o #2) deps, pri = 1, interrupts = true}
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   514
              (fold_entries NONE
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   515
                (fn entry as (_, exec) => fn () => SOME (force_exec node exec)) node));
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
   516
44299
061599cb6eb0 refined Future.cancel: explicit future allows to join actual cancellation;
wenzelm
parents: 44271
diff changeset
   517
    in (versions, commands, execs, execution) end);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   518
43713
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   519
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   520
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   521
(** global state **)
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   522
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   523
val global_state = Synchronized.var "Document" init_state;
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   524
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   525
fun state () = Synchronized.value global_state;
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   526
val change_state = Synchronized.change global_state;
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   527
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   528
end;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   529