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