src/Pure/PIDE/document.ML
author wenzelm
Mon, 05 Aug 2013 15:29:10 +0200
changeset 52862 930ce8eacb87
parent 52850 9fff9f78240a
child 54509 1f77110c94ef
permissions -rw-r--r--
tuned signature -- more uniform treatment of overlays as command mapping;
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
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
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
52796
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
    10
  val timing: bool Unsynchronized.ref
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
    11
  type node_header = string * Thy_Header.header * string list
52862
930ce8eacb87 tuned signature -- more uniform treatment of overlays as command mapping;
wenzelm
parents: 52850
diff changeset
    12
  type overlay = Document_ID.command * (string * string list)
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
    13
  datatype node_edit =
48755
393a37003851 apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents: 48735
diff changeset
    14
    Clear |    (* FIXME unused !? *)
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
    15
    Edits of (Document_ID.command option * Document_ID.command option) list |
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
    16
    Deps of node_header |
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    17
    Perspective of bool * Document_ID.command list * overlay list
44156
6aa25b80e1a5 explicit datatypes for document node edits;
wenzelm
parents: 44113
diff changeset
    18
  type edit = string * node_edit
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
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
    21
  val define_command: Document_ID.command -> string -> string -> state -> state
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
    22
  val remove_versions: Document_ID.version list -> state -> state
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
    23
  val start_execution: state -> state
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
    24
  val update: Document_ID.version -> Document_ID.version -> edit list -> state ->
52655
3b2b1ef13979 more careful termination of removed execs, leaving running execs undisturbed;
wenzelm
parents: 52607
diff changeset
    25
    Document_ID.exec list * (Document_ID.command * Document_ID.exec list) list * state
43713
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
    26
  val state: unit -> state
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
    27
  val change_state: (state -> state) -> unit
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    28
end;
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
structure Document: DOCUMENT =
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    31
struct
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    32
52796
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
    33
val timing = Unsynchronized.ref false;
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
    34
fun timeit msg e = cond_timeit (! timing) msg e;
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
    35
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
    36
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
    37
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    38
(** document structure **)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    39
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
    40
fun err_dup kind id = error ("Duplicate " ^ kind ^ ": " ^ Document_ID.print id);
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
    41
fun err_undef kind id = error ("Undefined " ^ kind ^ ": " ^ Document_ID.print id);
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
    42
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
    43
type node_header = string * Thy_Header.header * string list;
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    44
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    45
type perspective =
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    46
 {required: bool,  (*required node*)
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    47
  visible: Inttab.set,  (*visible commands*)
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    48
  visible_last: Document_ID.command option,  (*last visible command*)
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    49
  overlays: (string * string list) list Inttab.table};  (*command id -> print function with args*)
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    50
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
    51
structure Entries = Linear_Set(type key = Document_ID.command val ord = int_ord);
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    52
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
    53
abstype node = Node of
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
    54
 {header: node_header,  (*master directory, theory header, errors*)
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    55
  perspective: perspective,  (*command perspective*)
52761
909167fdd367 discontinued notion of "stable" result -- running execution is never canceled;
wenzelm
parents: 52716
diff changeset
    56
  entries: Command.exec option Entries.T,  (*command entries with excecutions*)
52526
d234cb6b60e3 more Command.memo operations;
wenzelm
parents: 52523
diff changeset
    57
  result: Command.eval option}  (*result of last execution*)
50862
5fc8b83322f5 more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents: 50201
diff changeset
    58
and version = Version of node String_Graph.T  (*development graph wrt. static imports*)
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    59
with
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    60
47406
8818f54773cc dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents: 47405
diff changeset
    61
fun make_node (header, perspective, entries, result) =
8818f54773cc dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents: 47405
diff changeset
    62
  Node {header = header, perspective = perspective, entries = entries, result = result};
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
    63
47406
8818f54773cc dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents: 47405
diff changeset
    64
fun map_node f (Node {header, perspective, entries, result}) =
8818f54773cc dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents: 47405
diff changeset
    65
  make_node (f (header, perspective, entries, result));
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    66
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    67
fun make_perspective (required, command_ids, overlays) : perspective =
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    68
 {required = required,
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    69
  visible = Inttab.make_set command_ids,
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    70
  visible_last = try List.last command_ids,
52862
930ce8eacb87 tuned signature -- more uniform treatment of overlays as command mapping;
wenzelm
parents: 52850
diff changeset
    71
  overlays = Inttab.make_list overlays};
44441
fe95e4306b4b misc tuning and simplification;
wenzelm
parents: 44440
diff changeset
    72
51294
0850d43cb355 discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
wenzelm
parents: 51293
diff changeset
    73
val no_header = ("", Thy_Header.make ("", Position.none) [] [], ["Bad theory header"]);
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    74
val no_perspective = make_perspective (false, [], []);
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    75
52761
909167fdd367 discontinued notion of "stable" result -- running execution is never canceled;
wenzelm
parents: 52716
diff changeset
    76
val empty_node = make_node (no_header, no_perspective, Entries.empty, NONE);
909167fdd367 discontinued notion of "stable" result -- running execution is never canceled;
wenzelm
parents: 52716
diff changeset
    77
val clear_node = map_node (fn (header, _, _, _) => (header, no_perspective, Entries.empty, NONE));
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    78
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    79
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    80
(* basic components *)
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    81
48927
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
    82
fun set_header header =
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
    83
  map_node (fn (_, perspective, entries, result) => (header, perspective, entries, result));
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
    84
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
    85
fun get_header (Node {header = (master, header, errors), ...}) =
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
    86
  if null errors then (master, header)
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
    87
  else error (cat_lines errors);
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
    88
48927
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
    89
fun read_header node span =
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
    90
  let
51294
0850d43cb355 discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
wenzelm
parents: 51293
diff changeset
    91
    val (dir, {name = (name, _), imports, keywords}) = get_header node;
48927
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
    92
    val {name = (_, pos), imports = imports', ...} = Thy_Header.read_tokens span;
51294
0850d43cb355 discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
wenzelm
parents: 51293
diff changeset
    93
  in (dir, Thy_Header.make (name, pos) (map #1 imports ~~ map #2 imports') keywords) end;
44180
a6dc270d3edb maintain node header;
wenzelm
parents: 44160
diff changeset
    94
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
    95
fun get_perspective (Node {perspective, ...}) = perspective;
52808
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
    96
fun set_perspective args =
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
    97
  map_node (fn (header, _, entries, result) => (header, make_perspective args, entries, result));
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
    98
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    99
val required_node = #required o get_perspective;
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
   100
val visible_command = Inttab.defined o #visible o get_perspective;
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
   101
val visible_last = #visible_last o get_perspective;
47345
193251980a73 more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents: 47344
diff changeset
   102
val visible_node = is_some o visible_last
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52849
diff changeset
   103
val overlays = Inttab.lookup_list o #overlays o get_perspective;
47345
193251980a73 more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents: 47344
diff changeset
   104
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   105
fun map_entries f =
52761
909167fdd367 discontinued notion of "stable" result -- running execution is never canceled;
wenzelm
parents: 52716
diff changeset
   106
  map_node (fn (header, perspective, entries, result) => (header, perspective, f entries, result));
909167fdd367 discontinued notion of "stable" result -- running execution is never canceled;
wenzelm
parents: 52716
diff changeset
   107
fun get_entries (Node {entries, ...}) = entries;
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   108
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   109
fun iterate_entries f = Entries.iterate NONE f o get_entries;
52761
909167fdd367 discontinued notion of "stable" result -- running execution is never canceled;
wenzelm
parents: 52716
diff changeset
   110
fun iterate_entries_after start f (Node {entries, ...}) =
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   111
  (case Entries.get_after entries start of
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   112
    NONE => I
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   113
  | SOME id => Entries.iterate (SOME id) f entries);
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   114
47339
79bd24497ffd tuned -- NB: get_theory still needs to apply Lazy.force due to interrupt instabilities;
wenzelm
parents: 47336
diff changeset
   115
fun get_result (Node {result, ...}) = result;
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
   116
fun set_result result =
47406
8818f54773cc dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents: 47405
diff changeset
   117
  map_node (fn (header, perspective, entries, _) => (header, perspective, entries, result));
44180
a6dc270d3edb maintain node header;
wenzelm
parents: 44160
diff changeset
   118
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   119
fun changed_result node node' =
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   120
  (case (get_result node, get_result node') of
52607
33a133d50616 clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents: 52606
diff changeset
   121
    (SOME eval, SOME eval') => not (Command.eval_eq (eval, eval'))
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   122
  | (NONE, NONE) => false
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   123
  | _ => true);
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   124
52772
7764c90680f0 clarified conditions for node traversal;
wenzelm
parents: 52771
diff changeset
   125
fun pending_result node =
7764c90680f0 clarified conditions for node traversal;
wenzelm
parents: 52771
diff changeset
   126
  (case get_result node of
7764c90680f0 clarified conditions for node traversal;
wenzelm
parents: 52771
diff changeset
   127
    SOME eval => not (Command.eval_finished eval)
7764c90680f0 clarified conditions for node traversal;
wenzelm
parents: 52771
diff changeset
   128
  | NONE => false);
52533
a95440dcd59c clarified type Command.eval;
wenzelm
parents: 52532
diff changeset
   129
50862
5fc8b83322f5 more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents: 50201
diff changeset
   130
fun get_node nodes name = String_Graph.get_node nodes name
5fc8b83322f5 more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents: 50201
diff changeset
   131
  handle String_Graph.UNDEF _ => empty_node;
5fc8b83322f5 more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents: 50201
diff changeset
   132
fun default_node name = String_Graph.default_node (name, empty_node);
5fc8b83322f5 more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents: 50201
diff changeset
   133
fun update_node name f = default_node name #> String_Graph.map_node name f;
38418
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
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   136
(* node edits and associated executions *)
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   137
52862
930ce8eacb87 tuned signature -- more uniform treatment of overlays as command mapping;
wenzelm
parents: 52850
diff changeset
   138
type overlay = Document_ID.command * (string * string list);
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
   139
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   140
datatype node_edit =
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   141
  Clear |
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
   142
  Edits of (Document_ID.command option * Document_ID.command option) list |
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
   143
  Deps of node_header |
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
   144
  Perspective of bool * Document_ID.command list * overlay list;
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   145
44156
6aa25b80e1a5 explicit datatypes for document node edits;
wenzelm
parents: 44113
diff changeset
   146
type edit = string * node_edit;
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   147
49064
bd6cc0b911a1 maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents: 49061
diff changeset
   148
val after_entry = Entries.get_after o get_entries;
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   149
49064
bd6cc0b911a1 maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents: 49061
diff changeset
   150
fun lookup_entry node id =
bd6cc0b911a1 maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents: 49061
diff changeset
   151
  (case Entries.lookup (get_entries node) id of
44480
38c5b085fb1c improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents: 44479
diff changeset
   152
    NONE => NONE
38c5b085fb1c improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents: 44479
diff changeset
   153
  | SOME (exec, _) => exec);
38c5b085fb1c improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents: 44479
diff changeset
   154
49064
bd6cc0b911a1 maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents: 49061
diff changeset
   155
fun the_entry node id =
bd6cc0b911a1 maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents: 49061
diff changeset
   156
  (case Entries.lookup (get_entries node) id of
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   157
    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
   158
  | SOME (exec, _) => exec);
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   159
52532
c81d76f7f63d tuned signature;
wenzelm
parents: 52530
diff changeset
   160
fun the_default_entry node (SOME id) = (id, the_default Command.no_exec (the_entry node id))
c81d76f7f63d tuned signature;
wenzelm
parents: 52530
diff changeset
   161
  | the_default_entry _ NONE = (Document_ID.none, Command.no_exec);
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   162
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   163
fun assign_entry (command_id, exec) node =
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   164
  if is_none (Entries.lookup (get_entries node) command_id) then node
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   165
  else map_entries (Entries.update (command_id, exec)) node;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   166
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   167
fun reset_after id entries =
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   168
  (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
   169
    NONE => entries
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   170
  | 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
   171
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   172
val edit_node = map_entries o fold
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   173
  (fn (id, SOME id2) => Entries.insert_after id (id2, NONE)
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   174
    | (id, NONE) => Entries.delete_after id #> reset_after id);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   175
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   176
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   177
(* version operations *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   178
50862
5fc8b83322f5 more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents: 50201
diff changeset
   179
val empty_version = Version String_Graph.empty;
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   180
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   181
fun nodes_of (Version nodes) = nodes;
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   182
val node_of = get_node o nodes_of;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   183
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   184
fun cycle_msg names = "Cyclic dependency of " ^ space_implode " via " (map quote names);
44180
a6dc270d3edb maintain node header;
wenzelm
parents: 44160
diff changeset
   185
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   186
fun edit_nodes (name, node_edit) (Version nodes) =
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   187
  Version
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   188
    (case node_edit of
47406
8818f54773cc dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents: 47405
diff changeset
   189
      Clear => update_node name clear_node nodes
8818f54773cc dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents: 47405
diff changeset
   190
    | Edits edits => update_node name (edit_node edits) nodes
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
   191
    | Deps (master, header, errors) =>
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   192
        let
48927
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
   193
          val imports = map fst (#imports header);
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
   194
          val errors1 =
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
   195
            (Thy_Header.define_keywords header; errors)
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
   196
              handle ERROR msg => errors @ [msg];
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   197
          val nodes1 = nodes
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   198
            |> default_node name
48927
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
   199
            |> fold default_node imports;
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   200
          val nodes2 = nodes1
50862
5fc8b83322f5 more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents: 50201
diff changeset
   201
            |> String_Graph.Keys.fold
5fc8b83322f5 more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents: 50201
diff changeset
   202
                (fn dep => String_Graph.del_edge (dep, name)) (String_Graph.imm_preds nodes1 name);
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
   203
          val (nodes3, errors2) =
50862
5fc8b83322f5 more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents: 50201
diff changeset
   204
            (String_Graph.add_deps_acyclic (name, imports) nodes2, errors1)
5fc8b83322f5 more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents: 50201
diff changeset
   205
              handle String_Graph.CYCLES cs => (nodes2, errors1 @ map cycle_msg cs);
5fc8b83322f5 more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents: 50201
diff changeset
   206
        in String_Graph.map_node name (set_header (master, header, errors2)) nodes3 end
47406
8818f54773cc dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents: 47405
diff changeset
   207
    | Perspective perspective => update_node name (set_perspective perspective) nodes);
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   208
44222
9d5ef6cd4ee1 use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents: 44202
diff changeset
   209
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
   210
  Version (update_node name (K node) nodes);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   211
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   212
end;
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   213
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   214
52595
76883c1e1c53 fully synchronized guard of running execution;
wenzelm
parents: 52588
diff changeset
   215
76883c1e1c53 fully synchronized guard of running execution;
wenzelm
parents: 52588
diff changeset
   216
(** main state -- document structure and execution process **)
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   217
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   218
type execution =
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   219
 {version_id: Document_ID.version,  (*static version id*)
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   220
  execution_id: Document_ID.execution,  (*dynamic execution id*)
52798
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   221
  delay_request: unit future,  (*pending event timer request*)
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   222
  frontier: Future.task Symtab.table};  (*node name -> running execution task*)
52604
ff2f0818aebc more explicit type Exec.context;
wenzelm
parents: 52602
diff changeset
   223
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   224
val no_execution: execution =
52798
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   225
  {version_id = Document_ID.none, execution_id = Document_ID.none,
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   226
   delay_request = Future.value (), frontier = Symtab.empty};
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   227
52798
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   228
fun new_execution version_id delay_request frontier : execution =
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   229
  {version_id = version_id, execution_id = Execution.start (),
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   230
   delay_request = delay_request, frontier = frontier};
52604
ff2f0818aebc more explicit type Exec.context;
wenzelm
parents: 52602
diff changeset
   231
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   232
abstype state = State of
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   233
 {versions: version Inttab.table,  (*version id -> document content*)
52587
067f1f950dc8 tuned -- refrain from odd optimization;
wenzelm
parents: 52586
diff changeset
   234
  commands: (string * Token.T list lazy) Inttab.table,  (*command id -> named command span*)
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   235
  execution: execution}  (*current execution process*)
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   236
with
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   237
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   238
fun make_state (versions, commands, execution) =
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   239
  State {versions = versions, commands = commands, execution = execution};
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   240
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   241
fun map_state f (State {versions, commands, execution}) =
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   242
  make_state (f (versions, commands, execution));
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   243
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   244
val init_state =
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   245
  make_state (Inttab.make [(Document_ID.none, empty_version)], Inttab.empty, no_execution);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   246
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   247
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   248
(* document versions *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   249
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   250
fun define_version version_id version =
52798
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   251
  map_state (fn (versions, commands, {delay_request, frontier, ...}) =>
47420
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   252
    let
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   253
      val versions' = Inttab.update_new (version_id, version) versions
47420
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   254
        handle Inttab.DUP dup => err_dup "document version" dup;
52798
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   255
      val execution' = new_execution version_id delay_request frontier;
47420
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   256
    in (versions', commands, execution') end);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   257
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   258
fun the_version (State {versions, ...}) version_id =
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   259
  (case Inttab.lookup versions version_id of
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   260
    NONE => err_undef "document version" version_id
38418
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
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   263
fun delete_version version_id versions =
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   264
  Inttab.delete version_id versions
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   265
    handle Inttab.UNDEF _ => err_undef "document version" version_id;
44673
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   266
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   267
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   268
(* commands *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   269
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   270
fun define_command command_id name text =
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   271
  map_state (fn (versions, commands, execution) =>
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   272
    let
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   273
      val id = Document_ID.print command_id;
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   274
      val span =
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   275
        Lazy.lazy (fn () =>
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   276
          Position.setmp_thread_data (Position.id_only id)
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   277
            (fn () => Thy_Syntax.parse_tokens (Keyword.get_lexicons ()) (Position.id id) text) ());
47395
e6261a493f04 added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents: 47389
diff changeset
   278
      val _ =
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   279
        Position.setmp_thread_data (Position.id_only id)
50201
c26369c9eda6 Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents: 49906
diff changeset
   280
          (fn () => Output.status (Markup.markup_only Markup.accepted)) ();
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   281
      val commands' =
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   282
        Inttab.update_new (command_id, (name, span)) commands
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   283
          handle Inttab.DUP dup => err_dup "command" dup;
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   284
    in (versions, commands', execution) end);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   285
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   286
fun the_command (State {commands, ...}) command_id =
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   287
  (case Inttab.lookup commands command_id of
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   288
    NONE => err_undef "command" command_id
44644
317e4962dd0f clarified define_command: store name as structural information;
wenzelm
parents: 44643
diff changeset
   289
  | SOME command => command);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   290
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   291
val the_command_name = #1 oo the_command;
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   292
47420
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   293
end;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   294
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   295
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   296
(* remove_versions *)
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   297
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   298
fun remove_versions version_ids state = state |> map_state (fn (versions, _, execution) =>
47420
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   299
  let
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   300
    val _ =
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   301
      member (op =) version_ids (#version_id execution) andalso
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   302
        error ("Attempt to remove execution version " ^ Document_ID.print (#version_id execution));
47343
b8aeab386414 less aggressive discontinue_execution before document update, to avoid unstable execs that need to be re-assigned;
wenzelm
parents: 47342
diff changeset
   303
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   304
    val versions' = fold delete_version version_ids versions;
47420
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   305
    val commands' =
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   306
      (versions', Inttab.empty) |->
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   307
        Inttab.fold (fn (_, version) => nodes_of version |>
50862
5fc8b83322f5 more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents: 50201
diff changeset
   308
          String_Graph.fold (fn (_, (node, _)) => node |>
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   309
            iterate_entries (fn ((_, command_id), _) =>
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   310
              SOME o Inttab.insert (K true) (command_id, the_command state command_id))));
47420
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   311
  in (versions', commands', execution) end);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   312
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   313
52604
ff2f0818aebc more explicit type Exec.context;
wenzelm
parents: 52602
diff changeset
   314
(* document execution *)
47389
e8552cba702d explicit checks stable_finished_theory/stable_command allow parallel asynchronous command transactions;
wenzelm
parents: 47388
diff changeset
   315
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   316
fun start_execution state = state |> map_state (fn (versions, commands, execution) =>
52796
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
   317
  timeit "Document.start_execution" (fn () =>
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
   318
    let
52798
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   319
      val {version_id, execution_id, delay_request, frontier} = execution;
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   320
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   321
      val delay = seconds (Options.default_real "editor_execution_delay");
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   322
52798
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   323
      val _ = Future.cancel delay_request;
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   324
      val delay_request' = Event_Timer.future (Time.+ (Time.now (), delay));
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   325
52796
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
   326
      val new_tasks =
52573
815461c835b9 tuned start_execution: avoid sleep on worker thread;
wenzelm
parents: 52570
diff changeset
   327
        nodes_of (the_version state version_id) |> String_Graph.schedule
815461c835b9 tuned start_execution: avoid sleep on worker thread;
wenzelm
parents: 52570
diff changeset
   328
          (fn deps => fn (name, node) =>
52772
7764c90680f0 clarified conditions for node traversal;
wenzelm
parents: 52771
diff changeset
   329
            if visible_node node orelse pending_result node then
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   330
              let
52798
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   331
                val more_deps =
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   332
                  Future.task_of delay_request' :: the_list (Symtab.lookup frontier name);
52775
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
   333
                fun body () =
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
   334
                  iterate_entries (fn (_, opt_exec) => fn () =>
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
   335
                    (case opt_exec of
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
   336
                      SOME exec =>
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
   337
                        if Execution.is_running execution_id
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
   338
                        then SOME (Command.exec execution_id exec)
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
   339
                        else NONE
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
   340
                    | NONE => NONE)) node ()
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
   341
                  handle exn => if Exn.is_interrupt exn then () (*sic!*) else reraise exn;
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   342
                val future =
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   343
                  (singleton o Future.forks)
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   344
                    {name = "theory:" ^ name, group = SOME (Future.new_group NONE),
52798
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   345
                      deps = more_deps @ map #2 (maps #2 deps),
52810
cd28423ba19f simplified / clarified execution priority: auto prints << 0, proofs < 0, eval = 0, print_state = 1;
wenzelm
parents: 52808
diff changeset
   346
                      pri = 0, interrupts = false} body;
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   347
              in [(name, Future.task_of future)] end
52796
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
   348
            else []);
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
   349
      val frontier' = (fold o fold) Symtab.update new_tasks frontier;
52798
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   350
      val execution' =
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   351
        {version_id = version_id, execution_id = execution_id,
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   352
         delay_request = delay_request', frontier = frontier'};
52796
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
   353
    in (versions, commands, execution') end));
47345
193251980a73 more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents: 47344
diff changeset
   354
193251980a73 more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents: 47344
diff changeset
   355
47420
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   356
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   357
(** document update **)
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   358
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   359
(* exec state assignment *)
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   360
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   361
type assign_update = Command.exec option Inttab.table;  (*command id -> exec*)
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   362
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   363
val assign_update_empty: assign_update = Inttab.empty;
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   364
fun assign_update_defined (tab: assign_update) command_id = Inttab.defined tab command_id;
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   365
fun assign_update_apply (tab: assign_update) node = Inttab.fold assign_entry tab node;
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   366
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   367
fun assign_update_new upd (tab: assign_update) =
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   368
  Inttab.update_new upd tab
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   369
    handle Inttab.DUP dup => err_dup "exec state assignment" dup;
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   370
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   371
fun assign_update_result (tab: assign_update) =
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   372
  Inttab.fold (fn (command_id, exec) => cons (command_id, Command.exec_ids exec)) tab [];
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   373
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   374
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   375
(* update *)
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   376
38418
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
47335
wenzelm
parents: 47051
diff changeset
   379
fun make_required nodes =
wenzelm
parents: 47051
diff changeset
   380
  let
52808
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   381
    fun all_preds P =
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   382
      String_Graph.fold (fn (a, (node, _)) => P node ? cons a) nodes []
50862
5fc8b83322f5 more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents: 50201
diff changeset
   383
      |> String_Graph.all_preds nodes
52808
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   384
      |> Symtab.make_set;
47345
193251980a73 more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents: 47344
diff changeset
   385
52808
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   386
    val all_visible = all_preds visible_node;
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   387
    val all_required = all_preds required_node;
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   388
  in
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   389
    Symtab.fold (fn (a, ()) =>
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   390
      exists (Symtab.defined all_visible) (String_Graph.immediate_succs nodes a) ?
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   391
        Symtab.update (a, ())) all_visible all_required
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   392
  end;
47335
wenzelm
parents: 47051
diff changeset
   393
48927
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
   394
fun init_theory deps node span =
47335
wenzelm
parents: 47051
diff changeset
   395
  let
49173
fa01a202399c eliminated potentially confusing terminology of Scala "layer";
wenzelm
parents: 49064
diff changeset
   396
    (* FIXME provide files via Isabelle/Scala, not master_dir *)
48927
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
   397
    val (dir, header) = read_header node span;
47335
wenzelm
parents: 47051
diff changeset
   398
    val master_dir =
48735
35c47932584c even more permissive approximation of master_dir, which is only required to access external resources ('uses' etc.);
wenzelm
parents: 48707
diff changeset
   399
      (case try Url.explode dir of
35c47932584c even more permissive approximation of master_dir, which is only required to access external resources ('uses' etc.);
wenzelm
parents: 48707
diff changeset
   400
        SOME (Url.File path) => path
47335
wenzelm
parents: 47051
diff changeset
   401
      | _ => Path.current);
48927
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
   402
    val imports = #imports header;
47335
wenzelm
parents: 47051
diff changeset
   403
    val parents =
48927
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
   404
      imports |> map (fn (import, _) =>
47407
8da23ecc70cd more explicit last exec result;
wenzelm
parents: 47406
diff changeset
   405
        (case Thy_Info.lookup_theory import of
47335
wenzelm
parents: 47051
diff changeset
   406
          SOME thy => thy
wenzelm
parents: 47051
diff changeset
   407
        | NONE =>
47339
79bd24497ffd tuned -- NB: get_theory still needs to apply Lazy.force due to interrupt instabilities;
wenzelm
parents: 47336
diff changeset
   408
            Toplevel.end_theory (Position.file_only import)
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   409
              (case get_result (snd (the (AList.lookup (op =) deps import))) of
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   410
                NONE => Toplevel.toplevel
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   411
              | SOME eval => Command.eval_result_state eval)));
48927
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
   412
    val _ = Position.reports (map #2 imports ~~ map Theory.get_markup parents);
47335
wenzelm
parents: 47051
diff changeset
   413
  in Thy_Load.begin_theory master_dir header parents end;
wenzelm
parents: 47051
diff changeset
   414
47407
8da23ecc70cd more explicit last exec result;
wenzelm
parents: 47406
diff changeset
   415
fun check_theory full name node =
8da23ecc70cd more explicit last exec result;
wenzelm
parents: 47406
diff changeset
   416
  is_some (Thy_Info.lookup_theory name) orelse
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
   417
  can get_header node andalso (not full orelse is_some (get_result node));
47335
wenzelm
parents: 47051
diff changeset
   418
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   419
fun last_common state node_required node0 node =
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   420
  let
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   421
    fun update_flags prev (visible, initial) =
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   422
      let
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   423
        val visible' = visible andalso prev <> visible_last node;
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   424
        val initial' = initial andalso
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   425
          (case prev of
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   426
            NONE => true
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   427
          | SOME command_id => not (Keyword.is_theory_begin (the_command_name state command_id)));
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   428
      in (visible', initial') end;
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   429
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   430
    fun get_common ((prev, command_id), opt_exec) (_, ok, flags, assign_update) =
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   431
      if ok then
47630
wenzelm
parents: 47628
diff changeset
   432
        let
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   433
          val flags' as (visible', _) = update_flags prev flags;
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   434
          val ok' =
52586
wenzelm
parents: 52573
diff changeset
   435
            (case (lookup_entry node0 command_id, opt_exec) of
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   436
              (SOME (eval0, _), SOME (eval, _)) =>
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   437
                Command.eval_eq (eval0, eval) andalso
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   438
                  (visible' orelse node_required orelse Command.eval_running eval)
52586
wenzelm
parents: 52573
diff changeset
   439
            | _ => false);
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   440
          val assign_update' = assign_update |> ok' ?
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   441
            (case opt_exec of
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   442
              SOME (eval, prints) =>
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   443
                let
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   444
                  val command_visible = visible_command node command_id;
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52849
diff changeset
   445
                  val command_overlays = overlays node command_id;
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   446
                  val command_name = the_command_name state command_id;
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   447
                in
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52849
diff changeset
   448
                  (case Command.print command_visible command_overlays command_name eval prints of
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   449
                    SOME prints' => assign_update_new (command_id, SOME (eval, prints'))
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   450
                  | NONE => I)
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   451
                end
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   452
            | NONE => I);
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   453
        in SOME (prev, ok', flags', assign_update') end
47630
wenzelm
parents: 47628
diff changeset
   454
      else NONE;
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   455
    val (common, ok, flags, assign_update') =
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   456
      iterate_entries get_common node (NONE, true, (true, true), assign_update_empty);
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   457
    val (common', flags') =
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   458
      if ok then
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   459
        let val last = Entries.get_after (get_entries node) common
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   460
        in (last, update_flags last flags) end
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   461
      else (common, flags);
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   462
  in (assign_update', common', flags') end;
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   463
52534
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   464
fun illegal_init _ = error "Illegal theory header after end of theory";
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   465
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52849
diff changeset
   466
fun new_exec state node proper_init command_id' (assign_update, command_exec, init) =
47407
8da23ecc70cd more explicit last exec result;
wenzelm
parents: 47406
diff changeset
   467
  if not proper_init andalso is_none init then NONE
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   468
  else
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   469
    let
52534
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   470
      val (_, (eval, _)) = command_exec;
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52849
diff changeset
   471
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52849
diff changeset
   472
      val command_visible = visible_command node command_id';
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52849
diff changeset
   473
      val command_overlays = overlays node command_id';
52527
dbac84eab3bc separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents: 52526
diff changeset
   474
      val (command_name, span) = the_command state command_id' ||> Lazy.force;
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   475
52534
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   476
      val eval' = Command.eval (fn () => the_default illegal_init init span) span eval;
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52849
diff changeset
   477
      val prints' = perhaps (Command.print command_visible command_overlays command_name eval') [];
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   478
      val exec' = (eval', prints');
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   479
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   480
      val assign_update' = assign_update_new (command_id', SOME exec') assign_update;
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   481
      val init' = if Keyword.is_theory_begin command_name then NONE else init;
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   482
    in SOME (assign_update', (command_id', (eval', prints')), init') end;
52602
00170ef1dc39 strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
wenzelm
parents: 52600
diff changeset
   483
52655
3b2b1ef13979 more careful termination of removed execs, leaving running execs undisturbed;
wenzelm
parents: 52607
diff changeset
   484
fun removed_execs node0 (command_id, exec_ids) =
3b2b1ef13979 more careful termination of removed execs, leaving running execs undisturbed;
wenzelm
parents: 52607
diff changeset
   485
  subtract (op =) exec_ids (Command.exec_ids (lookup_entry node0 command_id));
52602
00170ef1dc39 strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
wenzelm
parents: 52600
diff changeset
   486
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   487
in
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   488
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   489
fun update old_version_id new_version_id edits state =
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   490
  let
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   491
    val old_version = the_version state old_version_id;
47628
3275758d274e builtin timing for main operations;
wenzelm
parents: 47424
diff changeset
   492
    val new_version = timeit "Document.edit_nodes" (fn () => fold edit_nodes edits old_version);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   493
44544
da5f0af32c1b more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents: 44483
diff changeset
   494
    val nodes = nodes_of new_version;
52776
fd81d51460b7 traverse node on change of "required" state;
wenzelm
parents: 52775
diff changeset
   495
    val required = make_required nodes;
fd81d51460b7 traverse node on change of "required" state;
wenzelm
parents: 52775
diff changeset
   496
    val required0 = make_required (nodes_of old_version);
52772
7764c90680f0 clarified conditions for node traversal;
wenzelm
parents: 52771
diff changeset
   497
    val edited = fold (fn (name, _) => Symtab.update (name, ())) edits Symtab.empty;
44544
da5f0af32c1b more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents: 44483
diff changeset
   498
47628
3275758d274e builtin timing for main operations;
wenzelm
parents: 47424
diff changeset
   499
    val updated = timeit "Document.update" (fn () =>
50862
5fc8b83322f5 more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents: 50201
diff changeset
   500
      nodes |> String_Graph.schedule
44199
e38885e3ea60 retrieve imports from document state, with fall-back on theory loader for preloaded theories;
wenzelm
parents: 44198
diff changeset
   501
        (fn deps => fn (name, node) =>
47406
8818f54773cc dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents: 47405
diff changeset
   502
          (singleton o Future.forks)
8818f54773cc dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents: 47405
diff changeset
   503
            {name = "Document.update", group = NONE,
52716
ecb46f11c366 document update at high priority -- important;
wenzelm
parents: 52715
diff changeset
   504
              deps = map (Future.task_of o #2) deps, pri = 1, interrupts = false}
52797
0d6f2a87d1a5 more timing;
wenzelm
parents: 52796
diff changeset
   505
            (fn () => timeit ("Document.update " ^ name) (fn () =>
47406
8818f54773cc dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents: 47405
diff changeset
   506
              let
8818f54773cc dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents: 47405
diff changeset
   507
                val imports = map (apsnd Future.join) deps;
52772
7764c90680f0 clarified conditions for node traversal;
wenzelm
parents: 52771
diff changeset
   508
                val imports_result_changed = exists (#4 o #1 o #2) imports;
52776
fd81d51460b7 traverse node on change of "required" state;
wenzelm
parents: 52775
diff changeset
   509
                val node_required = Symtab.defined required name;
47406
8818f54773cc dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents: 47405
diff changeset
   510
              in
52776
fd81d51460b7 traverse node on change of "required" state;
wenzelm
parents: 52775
diff changeset
   511
                if Symtab.defined edited name orelse visible_node node orelse
fd81d51460b7 traverse node on change of "required" state;
wenzelm
parents: 52775
diff changeset
   512
                  imports_result_changed orelse Symtab.defined required0 name <> node_required
47406
8818f54773cc dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents: 47405
diff changeset
   513
                then
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   514
                  let
47406
8818f54773cc dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents: 47405
diff changeset
   515
                    val node0 = node_of old_version name;
48927
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
   516
                    val init = init_theory imports node;
47407
8da23ecc70cd more explicit last exec result;
wenzelm
parents: 47406
diff changeset
   517
                    val proper_init =
8da23ecc70cd more explicit last exec result;
wenzelm
parents: 47406
diff changeset
   518
                      check_theory false name node andalso
8da23ecc70cd more explicit last exec result;
wenzelm
parents: 47406
diff changeset
   519
                      forall (fn (name, (_, node)) => check_theory true name node) imports;
47406
8818f54773cc dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents: 47405
diff changeset
   520
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   521
                    val (print_execs, common, (still_visible, initial)) =
52772
7764c90680f0 clarified conditions for node traversal;
wenzelm
parents: 52771
diff changeset
   522
                      if imports_result_changed then (assign_update_empty, NONE, (true, true))
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   523
                      else last_common state node_required node0 node;
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   524
                    val common_command_exec = the_default_entry node common;
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   525
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   526
                    val (updated_execs, (command_id', (eval', _)), _) =
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   527
                      (print_execs, common_command_exec, if initial then SOME init else NONE)
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   528
                      |> (still_visible orelse node_required) ?
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   529
                        iterate_entries_after common
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   530
                          (fn ((prev, id), _) => fn res =>
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   531
                            if not node_required andalso prev = visible_last node then NONE
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52849
diff changeset
   532
                            else new_exec state node proper_init id res) node;
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   533
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   534
                    val assigned_execs =
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   535
                      (node0, updated_execs) |-> iterate_entries_after common
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   536
                        (fn ((_, command_id0), exec0) => fn res =>
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   537
                          if is_none exec0 then NONE
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   538
                          else if assign_update_defined updated_execs command_id0 then SOME res
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   539
                          else SOME (assign_update_new (command_id0, NONE) res));
44480
38c5b085fb1c improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents: 44479
diff changeset
   540
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
   541
                    val last_exec =
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
   542
                      if command_id' = Document_ID.none then NONE else SOME command_id';
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   543
                    val result =
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   544
                      if is_none last_exec orelse is_some (after_entry node last_exec) then NONE
52526
d234cb6b60e3 more Command.memo operations;
wenzelm
parents: 52523
diff changeset
   545
                      else SOME eval';
44480
38c5b085fb1c improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents: 44479
diff changeset
   546
52602
00170ef1dc39 strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
wenzelm
parents: 52600
diff changeset
   547
                    val assign_update = assign_update_result assigned_execs;
52655
3b2b1ef13979 more careful termination of removed execs, leaving running execs undisturbed;
wenzelm
parents: 52607
diff changeset
   548
                    val removed = maps (removed_execs node0) assign_update;
3b2b1ef13979 more careful termination of removed execs, leaving running execs undisturbed;
wenzelm
parents: 52607
diff changeset
   549
                    val _ = List.app Execution.cancel removed;
52602
00170ef1dc39 strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
wenzelm
parents: 52600
diff changeset
   550
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   551
                    val node' = node
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   552
                      |> assign_update_apply assigned_execs
47406
8818f54773cc dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents: 47405
diff changeset
   553
                      |> set_result result;
52587
067f1f950dc8 tuned -- refrain from odd optimization;
wenzelm
parents: 52586
diff changeset
   554
                    val assigned_node = SOME (name, node');
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   555
                    val result_changed = changed_result node0 node';
52655
3b2b1ef13979 more careful termination of removed execs, leaving running execs undisturbed;
wenzelm
parents: 52607
diff changeset
   556
                  in ((removed, assign_update, assigned_node, result_changed), node') end
52602
00170ef1dc39 strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
wenzelm
parents: 52600
diff changeset
   557
                else (([], [], NONE, false), node)
52797
0d6f2a87d1a5 more timing;
wenzelm
parents: 52796
diff changeset
   558
              end)))
47628
3275758d274e builtin timing for main operations;
wenzelm
parents: 47424
diff changeset
   559
      |> Future.joins |> map #1);
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   560
52655
3b2b1ef13979 more careful termination of removed execs, leaving running execs undisturbed;
wenzelm
parents: 52607
diff changeset
   561
    val removed = maps #1 updated;
3b2b1ef13979 more careful termination of removed execs, leaving running execs undisturbed;
wenzelm
parents: 52607
diff changeset
   562
    val assign_update = maps #2 updated;
52602
00170ef1dc39 strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
wenzelm
parents: 52600
diff changeset
   563
    val assigned_nodes = map_filter #3 updated;
00170ef1dc39 strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
wenzelm
parents: 52600
diff changeset
   564
44197
458573968568 refined Document.edit: less stateful update via Graph.schedule;
wenzelm
parents: 44196
diff changeset
   565
    val state' = state
52602
00170ef1dc39 strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
wenzelm
parents: 52600
diff changeset
   566
      |> define_version new_version_id (fold put_node assigned_nodes new_version);
00170ef1dc39 strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
wenzelm
parents: 52600
diff changeset
   567
52655
3b2b1ef13979 more careful termination of removed execs, leaving running execs undisturbed;
wenzelm
parents: 52607
diff changeset
   568
  in (removed, assign_update, state') end;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   569
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   570
end;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   571
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   572
43713
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   573
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   574
(** global state **)
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   575
52508
wenzelm
parents: 51294
diff changeset
   576
val global_state = Synchronized.var "Document.global_state" init_state;
43713
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   577
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   578
fun state () = Synchronized.value global_state;
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   579
val change_state = Synchronized.change global_state;
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   580
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   581
end;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   582