| author | wenzelm | 
| Thu, 28 Mar 2019 21:24:55 +0100 | |
| changeset 70009 | 435fb018e8ee | 
| parent 69886 | 0cb8753bdb50 | 
| child 70282 | 242c50877dd2 | 
| 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 | 
| 59715 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 11 |   type node_header = {master: string, header: Thy_Header.header, errors: 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 | 
| 56458 
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
 wenzelm parents: 
56447diff
changeset | 21 | type blob_digest = (string * string option) Exn.result | 
| 59685 
c043306d2598
clarified markup for embedded files, early before execution;
 wenzelm parents: 
59347diff
changeset | 22 | val define_command: Document_ID.command -> string -> blob_digest list -> int -> | 
| 59085 
08a6901eb035
clarified define_command: send tokens more directly, without requiring keywords in ML;
 wenzelm parents: 
59083diff
changeset | 23 | ((int * int) * string) list -> state -> state | 
| 60880 
fa958e24ff24
set breakpoint state on ML side, relying on stable situation within the PIDE editing queue;
 wenzelm parents: 
60198diff
changeset | 24 | val command_exec: state -> string -> Document_ID.command -> Command.exec option | 
| 52530 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 wenzelm parents: 
52527diff
changeset | 25 | 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 | 26 | val start_execution: state -> state | 
| 68381 
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
 wenzelm parents: 
68380diff
changeset | 27 | val update: Document_ID.version -> Document_ID.version -> edit list -> string list -> state -> | 
| 52655 
3b2b1ef13979
more careful termination of removed execs, leaving running execs undisturbed;
 wenzelm parents: 
52607diff
changeset | 28 | 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 | 29 | val state: unit -> state | 
| 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 30 | val change_state: (state -> state) -> unit | 
| 38150 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 31 | end; | 
| 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 32 | |
| 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 33 | structure Document: DOCUMENT = | 
| 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 34 | struct | 
| 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 35 | |
| 52796 | 36 | val timing = Unsynchronized.ref false; | 
| 37 | fun timeit msg e = cond_timeit (! timing) msg e; | |
| 38 | ||
| 39 | ||
| 40 | ||
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 41 | (** document structure **) | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 42 | |
| 52530 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 wenzelm parents: 
52527diff
changeset | 43 | 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 | 44 | 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 | 45 | |
| 59715 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 46 | type node_header = | 
| 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 47 |   {master: string, header: Thy_Header.header, errors: string list};
 | 
| 52849 | 48 | |
| 49 | type perspective = | |
| 50 |  {required: bool,  (*required node*)
 | |
| 51 | visible: Inttab.set, (*visible commands*) | |
| 52 | visible_last: Document_ID.command option, (*last visible command*) | |
| 57874 | 53 | overlays: (string * string list) list Inttab.table}; (*command id -> print functions with args*) | 
| 52849 | 54 | |
| 52530 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 wenzelm parents: 
52527diff
changeset | 55 | 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 | 56 | |
| 43668 | 57 | abstype node = Node of | 
| 48707 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 wenzelm parents: 
47633diff
changeset | 58 |  {header: node_header,  (*master directory, theory header, errors*)
 | 
| 59086 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 59 | keywords: Keyword.keywords option, (*outer syntax keywords*) | 
| 52849 | 60 | perspective: perspective, (*command perspective*) | 
| 66369 | 61 | entries: Command.exec option Entries.T, (*command entries with executions*) | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 62 | result: (Document_ID.command * Command.eval) option, (*result of last execution*) | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 63 | consolidated: unit lazy} (*consolidated status of eval forks*) | 
| 50862 
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
 wenzelm parents: 
50201diff
changeset | 64 | 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 | 65 | with | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 66 | |
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 67 | fun make_node (header, keywords, perspective, entries, result, consolidated) = | 
| 59086 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 68 |   Node {header = header, keywords = keywords, perspective = perspective,
 | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 69 | entries = entries, result = result, consolidated = consolidated}; | 
| 43668 | 70 | |
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 71 | fun map_node f (Node {header, keywords, perspective, entries, result, consolidated}) =
 | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 72 | make_node (f (header, keywords, perspective, entries, result, consolidated)); | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 73 | |
| 52849 | 74 | fun make_perspective (required, command_ids, overlays) : perspective = | 
| 75 |  {required = required,
 | |
| 76 | visible = Inttab.make_set command_ids, | |
| 77 | visible_last = try List.last command_ids, | |
| 52862 
930ce8eacb87
tuned signature -- more uniform treatment of overlays as command mapping;
 wenzelm parents: 
52850diff
changeset | 78 | overlays = Inttab.make_list overlays}; | 
| 44441 | 79 | |
| 59715 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 80 | val no_header: node_header = | 
| 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 81 |   {master = "", header = Thy_Header.make ("", Position.none) [] [], errors = []};
 | 
| 52849 | 82 | val no_perspective = make_perspective (false, [], []); | 
| 44386 
4048ca2658b7
some support for toplevel printing wrt. editor perspective (still inactive);
 wenzelm parents: 
44385diff
changeset | 83 | |
| 68197 | 84 | val empty_node = | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 85 | make_node (no_header, NONE, no_perspective, Entries.empty, NONE, Lazy.value ()); | 
| 44386 
4048ca2658b7
some support for toplevel printing wrt. editor perspective (still inactive);
 wenzelm parents: 
44385diff
changeset | 86 | |
| 57615 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
56801diff
changeset | 87 | fun is_no_perspective ({required, visible, visible_last, overlays}: perspective) =
 | 
| 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
56801diff
changeset | 88 | not required andalso | 
| 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
56801diff
changeset | 89 | Inttab.is_empty visible andalso | 
| 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
56801diff
changeset | 90 | is_none visible_last andalso | 
| 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
56801diff
changeset | 91 | Inttab.is_empty overlays; | 
| 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
56801diff
changeset | 92 | |
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 93 | fun is_empty_node (Node {header, keywords, perspective, entries, result, consolidated}) =
 | 
| 57615 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
56801diff
changeset | 94 | header = no_header andalso | 
| 59086 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 95 | is_none keywords andalso | 
| 57615 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
56801diff
changeset | 96 | is_no_perspective perspective andalso | 
| 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
56801diff
changeset | 97 | Entries.is_empty entries andalso | 
| 66379 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66369diff
changeset | 98 | is_none result andalso | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 99 | Lazy.is_finished consolidated; | 
| 57615 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
56801diff
changeset | 100 | |
| 44386 
4048ca2658b7
some support for toplevel printing wrt. editor perspective (still inactive);
 wenzelm parents: 
44385diff
changeset | 101 | |
| 
4048ca2658b7
some support for toplevel printing wrt. editor perspective (still inactive);
 wenzelm parents: 
44385diff
changeset | 102 | (* basic components *) | 
| 
4048ca2658b7
some support for toplevel printing wrt. editor perspective (still inactive);
 wenzelm parents: 
44385diff
changeset | 103 | |
| 59715 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 104 | fun master_directory (Node {header = {master, ...}, ...}) =
 | 
| 54558 
31844ca390ad
more total master_directory -- NB: this is used outside command transactions (see also 92961f196d9e);
 wenzelm parents: 
54526diff
changeset | 105 | (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 | 106 | SOME (Url.File path) => path | 
| 
31844ca390ad
more total master_directory -- NB: this is used outside command transactions (see also 92961f196d9e);
 wenzelm parents: 
54526diff
changeset | 107 | | _ => Path.current); | 
| 
31844ca390ad
more total master_directory -- NB: this is used outside command transactions (see also 92961f196d9e);
 wenzelm parents: 
54526diff
changeset | 108 | |
| 59715 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 109 | fun set_header master header errors = | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 110 | map_node (fn (_, keywords, perspective, entries, result, consolidated) => | 
| 66379 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66369diff
changeset | 111 |     ({master = master, header = header, errors = errors},
 | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 112 | keywords, perspective, entries, result, consolidated)); | 
| 59086 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 113 | |
| 59715 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 114 | fun get_header (Node {header, ...}) = header;
 | 
| 48707 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 wenzelm parents: 
47633diff
changeset | 115 | |
| 59086 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 116 | fun set_keywords keywords = | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 117 | map_node (fn (header, _, perspective, entries, result, consolidated) => | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 118 | (header, keywords, perspective, entries, result, consolidated)); | 
| 59086 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 119 | |
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 120 | fun get_keywords (Node {keywords, ...}) = keywords;
 | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 121 | |
| 48927 
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
 wenzelm parents: 
48918diff
changeset | 122 | fun read_header node span = | 
| 
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
 wenzelm parents: 
48918diff
changeset | 123 | let | 
| 59715 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 124 |     val {header, errors, ...} = get_header node;
 | 
| 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 125 | val _ = | 
| 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 126 | if null errors then () | 
| 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 127 | else | 
| 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 128 | cat_lines errors |> | 
| 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 129 | (case Position.get_id (Position.thread_data ()) of | 
| 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 130 | NONE => I | 
| 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 131 | | SOME id => Protocol_Message.command_positions_yxml id) | 
| 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 132 | |> error; | 
| 59934 
b65c4370f831
more position information and PIDE markup for command keywords;
 wenzelm parents: 
59735diff
changeset | 133 |     val {name = (name, _), imports, ...} = header;
 | 
| 67500 
dfde99d59f6e
tuned: prefer list operations over Source.source;
 wenzelm parents: 
67380diff
changeset | 134 |     val {name = (_, pos), imports = imports', keywords} =
 | 
| 
dfde99d59f6e
tuned: prefer list operations over Source.source;
 wenzelm parents: 
67380diff
changeset | 135 | Thy_Header.read_tokens Position.none span; | 
| 63022 | 136 | val imports'' = (map #1 imports ~~ map #2 imports') handle ListPair.UnequalLengths => imports; | 
| 137 | in Thy_Header.make (name, pos) imports'' keywords end; | |
| 54526 | 138 | |
| 44385 
e7fdb008aa7d
propagate editor perspective through document model;
 wenzelm parents: 
44384diff
changeset | 139 | fun get_perspective (Node {perspective, ...}) = perspective;
 | 
| 59086 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 140 | |
| 52808 
143f225e50f5
allow explicit indication of required node: full eval, no prints;
 wenzelm parents: 
52798diff
changeset | 141 | fun set_perspective args = | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 142 | map_node (fn (header, keywords, _, entries, result, consolidated) => | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 143 | (header, keywords, make_perspective args, entries, result, consolidated)); | 
| 44385 
e7fdb008aa7d
propagate editor perspective through document model;
 wenzelm parents: 
44384diff
changeset | 144 | |
| 52849 | 145 | val required_node = #required o get_perspective; | 
| 146 | val visible_command = Inttab.defined o #visible o get_perspective; | |
| 147 | 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 | 148 | val visible_node = is_some o visible_last | 
| 52850 
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
 wenzelm parents: 
52849diff
changeset | 149 | 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 | 150 | |
| 44444 
33a5616a7571
tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
 wenzelm parents: 
44441diff
changeset | 151 | fun map_entries f = | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 152 | map_node (fn (header, keywords, perspective, entries, result, consolidated) => | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 153 | (header, keywords, perspective, f entries, result, consolidated)); | 
| 59086 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 154 | |
| 52761 
909167fdd367
discontinued notion of "stable" result -- running execution is never canceled;
 wenzelm parents: 
52716diff
changeset | 155 | fun get_entries (Node {entries, ...}) = entries;
 | 
| 44645 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
 wenzelm parents: 
44644diff
changeset | 156 | |
| 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
 wenzelm parents: 
44644diff
changeset | 157 | 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 | 158 | 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 | 159 | (case Entries.get_after entries start of | 
| 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
 wenzelm parents: 
44644diff
changeset | 160 | NONE => I | 
| 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
 wenzelm parents: 
44644diff
changeset | 161 | | SOME id => Entries.iterate (SOME id) f entries); | 
| 43668 | 162 | |
| 47339 
79bd24497ffd
tuned -- NB: get_theory still needs to apply Lazy.force due to interrupt instabilities;
 wenzelm parents: 
47336diff
changeset | 163 | fun get_result (Node {result, ...}) = result;
 | 
| 59086 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 164 | |
| 44385 
e7fdb008aa7d
propagate editor perspective through document model;
 wenzelm parents: 
44384diff
changeset | 165 | fun set_result result = | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 166 | map_node (fn (header, keywords, perspective, entries, _, consolidated) => | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 167 | (header, keywords, perspective, entries, result, consolidated)); | 
| 52566 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52536diff
changeset | 168 | |
| 52772 | 169 | fun pending_result node = | 
| 170 | (case get_result node of | |
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 171 | SOME (_, eval) => not (Command.eval_finished eval) | 
| 52772 | 172 | | NONE => false); | 
| 52533 | 173 | |
| 59198 
c73933e07c03
clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
 wenzelm parents: 
59193diff
changeset | 174 | fun finished_result node = | 
| 
c73933e07c03
clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
 wenzelm parents: 
59193diff
changeset | 175 | (case get_result node of | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 176 | SOME (_, eval) => Command.eval_finished eval | 
| 59198 
c73933e07c03
clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
 wenzelm parents: 
59193diff
changeset | 177 | | NONE => false); | 
| 
c73933e07c03
clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
 wenzelm parents: 
59193diff
changeset | 178 | |
| 66379 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66369diff
changeset | 179 | fun finished_result_theory node = | 
| 68184 
6c693b2700b3
support for dynamic document output while editing;
 wenzelm parents: 
67500diff
changeset | 180 | if finished_result node then | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 181 | let | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 182 | val (result_id, eval) = the (get_result node); | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 183 | val st = Command.eval_result_state eval; | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 184 | in SOME (result_id, Toplevel.end_theory Position.none st) handle ERROR _ => NONE end | 
| 68184 
6c693b2700b3
support for dynamic document output while editing;
 wenzelm parents: 
67500diff
changeset | 185 | else NONE; | 
| 66379 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66369diff
changeset | 186 | |
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 187 | val reset_consolidated = | 
| 66379 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66369diff
changeset | 188 | map_node (fn (header, keywords, perspective, entries, result, _) => | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 189 | (header, keywords, perspective, entries, result, Lazy.lazy I)); | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 190 | |
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 191 | fun get_consolidated (Node {consolidated, ...}) = consolidated;
 | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 192 | |
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 193 | val is_consolidated = Lazy.is_finished o get_consolidated; | 
| 66379 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66369diff
changeset | 194 | |
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 195 | fun commit_consolidated node = | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 196 | (Lazy.force (get_consolidated node); Output.status (Markup.markup_only Markup.consolidated)); | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 197 | |
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 198 | fun could_consolidate node = | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 199 | not (is_consolidated node) andalso is_some (finished_result_theory node); | 
| 66379 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66369diff
changeset | 200 | |
| 50862 
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
 wenzelm parents: 
50201diff
changeset | 201 | 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 | 202 | 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 | 203 | 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 | 204 | 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 | 205 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 206 | |
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 207 | (* node edits and associated executions *) | 
| 38150 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 208 | |
| 52862 
930ce8eacb87
tuned signature -- more uniform treatment of overlays as command mapping;
 wenzelm parents: 
52850diff
changeset | 209 | type overlay = Document_ID.command * (string * string list); | 
| 52849 | 210 | |
| 44157 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 wenzelm parents: 
44156diff
changeset | 211 | datatype node_edit = | 
| 52530 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 wenzelm parents: 
52527diff
changeset | 212 | Edits of (Document_ID.command option * Document_ID.command option) list | | 
| 48707 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 wenzelm parents: 
47633diff
changeset | 213 | Deps of node_header | | 
| 52849 | 214 | Perspective of bool * Document_ID.command list * overlay list; | 
| 44157 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 wenzelm parents: 
44156diff
changeset | 215 | |
| 44156 | 216 | type edit = string * node_edit; | 
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 217 | |
| 49064 
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
 wenzelm parents: 
49061diff
changeset | 218 | 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 | 219 | |
| 49064 
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
 wenzelm parents: 
49061diff
changeset | 220 | 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 | 221 | (case Entries.lookup (get_entries node) id of | 
| 44480 
38c5b085fb1c
improved Document.edit: more accurate update_start and no_execs;
 wenzelm parents: 
44479diff
changeset | 222 | NONE => NONE | 
| 
38c5b085fb1c
improved Document.edit: more accurate update_start and no_execs;
 wenzelm parents: 
44479diff
changeset | 223 | | SOME (exec, _) => exec); | 
| 
38c5b085fb1c
improved Document.edit: more accurate update_start and no_execs;
 wenzelm parents: 
44479diff
changeset | 224 | |
| 49064 
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
 wenzelm parents: 
49061diff
changeset | 225 | 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 | 226 | (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 | 227 | NONE => err_undef "command entry" id | 
| 44476 
e8a87398f35d
propagate information about last command with exec state assignment through document model;
 wenzelm parents: 
44446diff
changeset | 228 | | SOME (exec, _) => exec); | 
| 38150 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 229 | |
| 52566 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52536diff
changeset | 230 | 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 | 231 | 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 | 232 | else map_entries (Entries.update (command_id, exec)) node; | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 233 | |
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 234 | fun reset_after id entries = | 
| 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 235 | (case Entries.get_after entries id of | 
| 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 236 | NONE => entries | 
| 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 237 | | SOME next => Entries.update (next, NONE) entries); | 
| 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 238 | |
| 43668 | 239 | val edit_node = map_entries o fold | 
| 240 | (fn (id, SOME id2) => Entries.insert_after id (id2, NONE) | |
| 241 | | (id, NONE) => Entries.delete_after id #> reset_after id); | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 242 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 243 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 244 | (* version operations *) | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 245 | |
| 50862 
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
 wenzelm parents: 
50201diff
changeset | 246 | val empty_version = Version String_Graph.empty; | 
| 44185 | 247 | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 248 | fun nodes_of (Version nodes) = nodes; | 
| 44185 | 249 | val node_of = get_node o nodes_of; | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 250 | |
| 44185 | 251 | fun cycle_msg names = "Cyclic dependency of " ^ space_implode " via " (map quote names); | 
| 44180 | 252 | |
| 44157 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 wenzelm parents: 
44156diff
changeset | 253 | fun edit_nodes (name, node_edit) (Version nodes) = | 
| 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 wenzelm parents: 
44156diff
changeset | 254 | Version | 
| 44436 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 wenzelm parents: 
44435diff
changeset | 255 | (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 | 256 | Edits edits => update_node name (edit_node edits) nodes | 
| 59715 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 257 |     | Deps {master, header, errors} =>
 | 
| 44436 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 wenzelm parents: 
44435diff
changeset | 258 | let | 
| 48927 
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
 wenzelm parents: 
48918diff
changeset | 259 | val imports = map fst (#imports header); | 
| 44436 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 wenzelm parents: 
44435diff
changeset | 260 | val nodes1 = nodes | 
| 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 wenzelm parents: 
44435diff
changeset | 261 | |> default_node name | 
| 48927 
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
 wenzelm parents: 
48918diff
changeset | 262 | |> fold default_node imports; | 
| 44436 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 wenzelm parents: 
44435diff
changeset | 263 | 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 | 264 | |> 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 | 265 | (fn dep => String_Graph.del_edge (dep, name)) (String_Graph.imm_preds nodes1 name); | 
| 59086 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 266 | val (nodes3, errors1) = | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 267 | (String_Graph.add_deps_acyclic (name, imports) nodes2, errors) | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 268 | handle String_Graph.CYCLES cs => (nodes2, errors @ map cycle_msg cs); | 
| 59715 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 269 | in String_Graph.map_node name (set_header master header errors1) 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 | 270 | | 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 | 271 | |
| 59086 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 272 | fun update_keywords name nodes = | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 273 | nodes |> String_Graph.map_node name (fn node => | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 274 | if is_empty_node node then node | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 275 | else | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 276 | let | 
| 59715 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 277 |         val {master, header, errors} = get_header node;
 | 
| 59086 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 278 | val imports_keywords = map_filter (get_keywords o get_node nodes o #1) (#imports header); | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 279 | val keywords = | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 280 | Library.foldl Keyword.merge_keywords (Session.get_keywords (), imports_keywords); | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 281 | val (keywords', errors') = | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 282 | (Keyword.add_keywords (#keywords header) keywords, errors) | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 283 | handle ERROR msg => | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 284 | (keywords, if member (op =) errors msg then errors else errors @ [msg]); | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 285 | in | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 286 | node | 
| 59715 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 287 | |> set_header master header errors' | 
| 59086 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 288 | |> set_keywords (SOME keywords') | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 289 | end); | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 290 | |
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 291 | fun edit_keywords edits (Version nodes) = | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 292 | Version | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 293 | (fold update_keywords | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 294 | (String_Graph.all_succs nodes (map_filter (fn (a, Deps _) => SOME a | _ => NONE) edits)) | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 295 | nodes); | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 296 | |
| 44222 
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
 wenzelm parents: 
44202diff
changeset | 297 | fun put_node (name, node) (Version nodes) = | 
| 57616 | 298 | let | 
| 299 | val nodes1 = update_node name (K node) nodes; | |
| 300 | val nodes2 = | |
| 301 | if String_Graph.is_maximal nodes1 name andalso is_empty_node node | |
| 302 | then String_Graph.del_node name nodes1 | |
| 303 | else nodes1; | |
| 304 | in Version nodes2 end; | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 305 | |
| 38150 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 306 | end; | 
| 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 307 | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 308 | |
| 52595 | 309 | |
| 310 | (** main state -- document structure and execution process **) | |
| 52536 | 311 | |
| 56458 
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
 wenzelm parents: 
56447diff
changeset | 312 | type blob_digest = (string * string option) Exn.result; (*file node name, raw digest*) | 
| 55798 | 313 | |
| 52774 
627fb639a2d9
maintain explicit execution frontier: avoid conflict with former task via static dependency;
 wenzelm parents: 
52772diff
changeset | 314 | type execution = | 
| 
627fb639a2d9
maintain explicit execution frontier: avoid conflict with former task via static dependency;
 wenzelm parents: 
52772diff
changeset | 315 |  {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 | 316 | execution_id: Document_ID.execution, (*dynamic execution id*) | 
| 68366 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 317 | delay_request: unit future, (*pending event timer request*) | 
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 318 | parallel_prints: Command.exec list}; (*parallel prints for early execution*) | 
| 52604 | 319 | |
| 52774 
627fb639a2d9
maintain explicit execution frontier: avoid conflict with former task via static dependency;
 wenzelm parents: 
52772diff
changeset | 320 | val no_execution: execution = | 
| 59193 
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
 wenzelm parents: 
59086diff
changeset | 321 |   {version_id = Document_ID.none,
 | 
| 
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
 wenzelm parents: 
59086diff
changeset | 322 | execution_id = Document_ID.none, | 
| 68366 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 323 | delay_request = Future.value (), | 
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 324 | parallel_prints = []}; | 
| 52774 
627fb639a2d9
maintain explicit execution frontier: avoid conflict with former task via static dependency;
 wenzelm parents: 
52772diff
changeset | 325 | |
| 68366 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 326 | fun new_execution version_id delay_request parallel_prints : execution = | 
| 59193 
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
 wenzelm parents: 
59086diff
changeset | 327 |   {version_id = version_id,
 | 
| 
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
 wenzelm parents: 
59086diff
changeset | 328 | execution_id = Execution.start (), | 
| 68366 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 329 | delay_request = delay_request, | 
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 330 | parallel_prints = parallel_prints}; | 
| 52604 | 331 | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 332 | abstype state = State of | 
| 52536 | 333 |  {versions: version Inttab.table,  (*version id -> document content*)
 | 
| 55798 | 334 | blobs: (SHA1.digest * string list) Symtab.table, (*raw digest -> digest, lines*) | 
| 59689 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59687diff
changeset | 335 | commands: (string * blob_digest list * int * Token.T list lazy) Inttab.table, | 
| 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59687diff
changeset | 336 | (*command id -> name, inlined files, token index of files, command span*) | 
| 52536 | 337 | execution: execution} (*current execution process*) | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 338 | with | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 339 | |
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 340 | 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 | 341 |   State {versions = versions, blobs = blobs, commands = commands, execution = execution};
 | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 342 | |
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 343 | 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 | 344 | make_state (f (versions, blobs, commands, execution)); | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 345 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 346 | val init_state = | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 347 | 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 | 348 | Symtab.empty, Inttab.empty, no_execution); | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 349 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 350 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 351 | (* document versions *) | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 352 | |
| 68366 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 353 | fun parallel_prints_node node = | 
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 354 | iterate_entries (fn (_, opt_exec) => fn rev_result => | 
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 355 | (case opt_exec of | 
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 356 | SOME (eval, prints) => | 
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 357 | (case filter Command.parallel_print prints of | 
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 358 | [] => SOME rev_result | 
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 359 | | prints' => SOME ((eval, prints') :: rev_result)) | 
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 360 | | NONE => NONE)) node [] |> rev; | 
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 361 | |
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 362 | fun define_version version_id version assigned_nodes = | 
| 59193 
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
 wenzelm parents: 
59086diff
changeset | 363 |   map_state (fn (versions, blobs, commands, {delay_request, ...}) =>
 | 
| 47420 
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
 wenzelm parents: 
47415diff
changeset | 364 | let | 
| 68366 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 365 | val version' = fold put_node assigned_nodes version; | 
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 366 | 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 | 367 | handle Inttab.DUP dup => err_dup "document version" dup; | 
| 68366 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 368 | val parallel_prints = maps (parallel_prints_node o #2) assigned_nodes; | 
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 369 | val execution' = new_execution version_id delay_request parallel_prints; | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 370 | in (versions', blobs, commands, execution') end); | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 371 | |
| 52536 | 372 | fun the_version (State {versions, ...}) version_id =
 | 
| 373 | (case Inttab.lookup versions version_id of | |
| 374 | NONE => err_undef "document version" version_id | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 375 | | SOME version => version); | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 376 | |
| 52536 | 377 | fun delete_version version_id versions = | 
| 378 | Inttab.delete version_id versions | |
| 379 | handle Inttab.UNDEF _ => err_undef "document version" version_id; | |
| 44673 | 380 | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 381 | |
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 382 | (* inlined files *) | 
| 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 383 | |
| 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 384 | fun define_blob digest text = | 
| 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 385 | map_state (fn (versions, blobs, commands, execution) => | 
| 57638 
ed58e740a699
less authentic SHA1.digest: trust Scala side on blobs and avoid re-calculation via Foreign Language Interface, which might be a cause of problems;
 wenzelm parents: 
57616diff
changeset | 386 | let val blobs' = Symtab.update (digest, (SHA1.fake digest, split_lines text)) blobs | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 387 | in (versions, blobs', commands, execution) end); | 
| 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 388 | |
| 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 389 | fun the_blob (State {blobs, ...}) digest =
 | 
| 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 390 | (case Symtab.lookup blobs digest of | 
| 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 391 |     NONE => error ("Undefined blob: " ^ digest)
 | 
| 55788 
67699e08e969
store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
 wenzelm parents: 
54562diff
changeset | 392 | | SOME content => content); | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 393 | |
| 56447 
1e77ed11f2f7
separate file_node vs. file_path, e.g. relevant on Windows for hyperlink to the latter;
 wenzelm parents: 
56208diff
changeset | 394 | fun resolve_blob state (blob_digest: blob_digest) = | 
| 61077 
06cca32aa519
thread context for exceptions from forks, e.g. relevant when printing errors;
 wenzelm parents: 
60937diff
changeset | 395 | blob_digest |> Exn.map_res (fn (file_node, raw_digest) => | 
| 56458 
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
 wenzelm parents: 
56447diff
changeset | 396 | (file_node, Option.map (the_blob state) raw_digest)); | 
| 56447 
1e77ed11f2f7
separate file_node vs. file_path, e.g. relevant on Windows for hyperlink to the latter;
 wenzelm parents: 
56208diff
changeset | 397 | |
| 59685 
c043306d2598
clarified markup for embedded files, early before execution;
 wenzelm parents: 
59347diff
changeset | 398 | fun blob_reports pos (blob_digest: blob_digest) = | 
| 
c043306d2598
clarified markup for embedded files, early before execution;
 wenzelm parents: 
59347diff
changeset | 399 | (case blob_digest of Exn.Res (file_node, _) => [(pos, Markup.path file_node)] | _ => []); | 
| 
c043306d2598
clarified markup for embedded files, early before execution;
 wenzelm parents: 
59347diff
changeset | 400 | |
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 401 | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 402 | (* commands *) | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 403 | |
| 59702 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59689diff
changeset | 404 | fun define_command command_id name blobs_digests blobs_index toks = | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 405 | map_state (fn (versions, blobs, commands, execution) => | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 406 | let | 
| 52536 | 407 | val id = Document_ID.print command_id; | 
| 408 | val span = | |
| 66167 | 409 | Lazy.lazy_name "Document.define_command" (fn () => | 
| 52536 | 410 | Position.setmp_thread_data (Position.id_only id) | 
| 59685 
c043306d2598
clarified markup for embedded files, early before execution;
 wenzelm parents: 
59347diff
changeset | 411 | (fn () => | 
| 
c043306d2598
clarified markup for embedded files, early before execution;
 wenzelm parents: 
59347diff
changeset | 412 | let | 
| 
c043306d2598
clarified markup for embedded files, early before execution;
 wenzelm parents: 
59347diff
changeset | 413 | val (tokens, _) = fold_map Token.make toks (Position.id id); | 
| 
c043306d2598
clarified markup for embedded files, early before execution;
 wenzelm parents: 
59347diff
changeset | 414 | val _ = | 
| 59702 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59689diff
changeset | 415 | if blobs_index < 0 | 
| 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59689diff
changeset | 416 | then (*inlined errors*) | 
| 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59689diff
changeset | 417 | map_filter Exn.get_exn blobs_digests | 
| 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59689diff
changeset | 418 | |> List.app (Output.error_message o Runtime.exn_message) | 
| 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59689diff
changeset | 419 | else (*auxiliary files*) | 
| 60027 
c42d65e11b6e
clarified language_path markup (again): exactly once *after* static phase, see also 83071f4c8ae6 and c043306d2598;
 wenzelm parents: 
59934diff
changeset | 420 | let val pos = Token.pos_of (nth tokens blobs_index) | 
| 
c42d65e11b6e
clarified language_path markup (again): exactly once *after* static phase, see also 83071f4c8ae6 and c043306d2598;
 wenzelm parents: 
59934diff
changeset | 421 | in Position.reports (maps (blob_reports pos) blobs_digests) end; | 
| 59685 
c043306d2598
clarified markup for embedded files, early before execution;
 wenzelm parents: 
59347diff
changeset | 422 | in tokens end) ()); | 
| 
c043306d2598
clarified markup for embedded files, early before execution;
 wenzelm parents: 
59347diff
changeset | 423 | val commands' = | 
| 59702 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59689diff
changeset | 424 | Inttab.update_new (command_id, (name, blobs_digests, blobs_index, span)) commands | 
| 59685 
c043306d2598
clarified markup for embedded files, early before execution;
 wenzelm parents: 
59347diff
changeset | 425 | handle Inttab.DUP dup => err_dup "command" dup; | 
| 47395 
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
 wenzelm parents: 
47389diff
changeset | 426 | val _ = | 
| 52536 | 427 | 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 | 428 | (fn () => Output.status (Markup.markup_only Markup.accepted)) (); | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 429 | in (versions, blobs, commands', execution) end); | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 430 | |
| 52536 | 431 | fun the_command (State {commands, ...}) command_id =
 | 
| 432 | (case Inttab.lookup commands command_id of | |
| 433 | NONE => err_undef "command" command_id | |
| 44644 
317e4962dd0f
clarified define_command: store name as structural information;
 wenzelm parents: 
44643diff
changeset | 434 | | SOME command => command); | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 435 | |
| 52569 
18dde2cf7aa7
produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
 wenzelm parents: 
52566diff
changeset | 436 | 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 | 437 | |
| 66379 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66369diff
changeset | 438 | |
| 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66369diff
changeset | 439 | (* execution *) | 
| 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66369diff
changeset | 440 | |
| 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66369diff
changeset | 441 | fun get_execution (State {execution, ...}) = execution;
 | 
| 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66369diff
changeset | 442 | fun get_execution_version state = the_version state (#version_id (get_execution state)); | 
| 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66369diff
changeset | 443 | |
| 60880 
fa958e24ff24
set breakpoint state on ML side, relying on stable situation within the PIDE editing queue;
 wenzelm parents: 
60198diff
changeset | 444 | fun command_exec state node_name command_id = | 
| 
fa958e24ff24
set breakpoint state on ML side, relying on stable situation within the PIDE editing queue;
 wenzelm parents: 
60198diff
changeset | 445 | let | 
| 66379 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66369diff
changeset | 446 | val version = get_execution_version state; | 
| 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66369diff
changeset | 447 | val node = get_node (nodes_of version) node_name; | 
| 60880 
fa958e24ff24
set breakpoint state on ML side, relying on stable situation within the PIDE editing queue;
 wenzelm parents: 
60198diff
changeset | 448 | in the_entry node command_id end; | 
| 
fa958e24ff24
set breakpoint state on ML side, relying on stable situation within the PIDE editing queue;
 wenzelm parents: 
60198diff
changeset | 449 | |
| 47420 
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
 wenzelm parents: 
47415diff
changeset | 450 | end; | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 451 | |
| 52566 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52536diff
changeset | 452 | |
| 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52536diff
changeset | 453 | (* remove_versions *) | 
| 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52536diff
changeset | 454 | |
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 455 | 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 | 456 | let | 
| 52536 | 457 | val _ = | 
| 458 | member (op =) version_ids (#version_id execution) andalso | |
| 459 |         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 | 460 | |
| 52536 | 461 | 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 | 462 | val commands' = | 
| 
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
 wenzelm parents: 
47415diff
changeset | 463 | (versions', Inttab.empty) |-> | 
| 
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
 wenzelm parents: 
47415diff
changeset | 464 | 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 | 465 | String_Graph.fold (fn (_, (node, _)) => node |> | 
| 52536 | 466 | iterate_entries (fn ((_, command_id), _) => | 
| 467 | 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 | 468 | val blobs' = | 
| 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 469 | (commands', Symtab.empty) |-> | 
| 59689 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59687diff
changeset | 470 | Inttab.fold (fn (_, (_, blobs, _, _)) => blobs |> | 
| 56458 
a8d960baa5c2
simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
 wenzelm parents: 
56447diff
changeset | 471 | 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 | 472 | |
| 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 473 | in (versions', blobs', commands', execution) end); | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 474 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 475 | |
| 52604 | 476 | (* document execution *) | 
| 47389 
e8552cba702d
explicit checks stable_finished_theory/stable_command allow parallel asynchronous command transactions;
 wenzelm parents: 
47388diff
changeset | 477 | |
| 60198 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 478 | fun make_required nodes = | 
| 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 479 | let | 
| 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 480 | fun all_preds P = | 
| 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 481 | String_Graph.fold (fn (a, (node, _)) => P node ? cons a) nodes [] | 
| 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 482 | |> String_Graph.all_preds nodes | 
| 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 483 | |> Symtab.make_set; | 
| 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 484 | |
| 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 485 | val all_visible = all_preds visible_node; | 
| 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 486 | val all_required = all_preds required_node; | 
| 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 487 | in | 
| 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 488 | Symtab.fold (fn (a, ()) => | 
| 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 489 | exists (Symtab.defined all_visible) (String_Graph.immediate_succs nodes a) ? | 
| 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 490 | Symtab.update (a, ())) all_visible all_required | 
| 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 491 | end; | 
| 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 492 | |
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 493 | fun start_execution state = state |> map_state (fn (versions, blobs, commands, execution) => | 
| 52796 | 494 | timeit "Document.start_execution" (fn () => | 
| 495 | let | |
| 68366 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 496 |       val {version_id, execution_id, delay_request, parallel_prints} = 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 | 497 | |
| 
9d3c9862d1dd
recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
 wenzelm parents: 
52797diff
changeset | 498 | 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 | 499 | |
| 52798 
9d3c9862d1dd
recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
 wenzelm parents: 
52797diff
changeset | 500 | val _ = Future.cancel delay_request; | 
| 69826 
1bea05713dde
physical vs. logical events, the latter takes GC time into account;
 wenzelm parents: 
68869diff
changeset | 501 |       val delay_request' = Event_Timer.future {physical = true} (Time.now () + delay);
 | 
| 68366 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 502 | val delay = Future.task_of delay_request'; | 
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 503 | |
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 504 | val parallel_prints' = parallel_prints | 
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 505 | |> map_filter (Command.exec_parallel_prints execution_id [delay]); | 
| 52798 
9d3c9862d1dd
recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
 wenzelm parents: 
52797diff
changeset | 506 | |
| 59198 
c73933e07c03
clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
 wenzelm parents: 
59193diff
changeset | 507 | fun finished_import (name, (node, _)) = | 
| 65445 
e9e7f5f5794c
more qualifier treatment, but in the end it is still ignored;
 wenzelm parents: 
65357diff
changeset | 508 | finished_result node orelse is_some (Thy_Info.lookup_theory name); | 
| 60198 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 509 | |
| 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 510 | val nodes = nodes_of (the_version state version_id); | 
| 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 511 | val required = make_required nodes; | 
| 59193 
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
 wenzelm parents: 
59086diff
changeset | 512 | val _ = | 
| 60198 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 513 | nodes |> String_Graph.schedule | 
| 52573 
815461c835b9
tuned start_execution: avoid sleep on worker thread;
 wenzelm parents: 
52570diff
changeset | 514 | (fn deps => fn (name, node) => | 
| 60198 
8483c2883c8c
always traverse required nodes, e.g. relevant for inlined errors of imported theory header;
 wenzelm parents: 
60027diff
changeset | 515 | if Symtab.defined required name orelse 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 | 516 | let | 
| 
627fb639a2d9
maintain explicit execution frontier: avoid conflict with former task via static dependency;
 wenzelm parents: 
52772diff
changeset | 517 | val future = | 
| 
627fb639a2d9
maintain explicit execution frontier: avoid conflict with former task via static dependency;
 wenzelm parents: 
52772diff
changeset | 518 | (singleton o Future.forks) | 
| 59193 
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
 wenzelm parents: 
59086diff
changeset | 519 |                    {name = "theory:" ^ name,
 | 
| 
59f1591a11cb
eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
 wenzelm parents: 
59086diff
changeset | 520 | group = SOME (Future.new_group NONE), | 
| 68366 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 521 | deps = delay :: Execution.active_tasks name @ maps (the_list o #2 o #2) deps, | 
| 68866 | 522 | pri = 0, interrupts = false} | 
| 523 | (fn () => | |
| 524 | (Execution.worker_task_active true name; | |
| 525 | if forall finished_import deps then | |
| 526 | iterate_entries (fn (_, opt_exec) => fn () => | |
| 527 | (case opt_exec of | |
| 528 | SOME exec => | |
| 529 | if Execution.is_running execution_id | |
| 530 | then SOME (Command.exec execution_id exec) | |
| 531 | else NONE | |
| 532 | | NONE => NONE)) node () | |
| 533 | else (); | |
| 534 | Execution.worker_task_active false name) | |
| 535 | handle exn => | |
| 536 | (Output.system_message (Runtime.exn_message exn); | |
| 537 | Execution.worker_task_active false name; | |
| 538 | Exn.reraise exn)); | |
| 59198 
c73933e07c03
clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
 wenzelm parents: 
59193diff
changeset | 539 | in (node, SOME (Future.task_of future)) end | 
| 
c73933e07c03
clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
 wenzelm parents: 
59193diff
changeset | 540 | else (node, 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 | 541 | val execution' = | 
| 68366 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 542 |         {version_id = version_id, execution_id = execution_id,
 | 
| 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 543 | delay_request = delay_request', parallel_prints = parallel_prints'}; | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 544 | in (versions, blobs, commands, execution') end)); | 
| 47345 
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
 wenzelm parents: 
47344diff
changeset | 545 | |
| 
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
 wenzelm parents: 
47344diff
changeset | 546 | |
| 47420 
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
 wenzelm parents: 
47415diff
changeset | 547 | |
| 
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
 wenzelm parents: 
47415diff
changeset | 548 | (** document update **) | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 549 | |
| 52566 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52536diff
changeset | 550 | (* exec state assignment *) | 
| 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52536diff
changeset | 551 | |
| 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52536diff
changeset | 552 | 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 | 553 | |
| 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52536diff
changeset | 554 | 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 | 555 | fun assign_update_defined (tab: assign_update) command_id = Inttab.defined tab command_id; | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 556 | fun assign_update_change entry (tab: assign_update) = Inttab.update entry tab; | 
| 52566 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52536diff
changeset | 557 | 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 | 558 | |
| 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52536diff
changeset | 559 | 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 | 560 | 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 | 561 | 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 | 562 | |
| 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52536diff
changeset | 563 | 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 | 564 | 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 | 565 | |
| 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52536diff
changeset | 566 | |
| 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52536diff
changeset | 567 | (* update *) | 
| 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52536diff
changeset | 568 | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 569 | local | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 570 | |
| 48927 
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
 wenzelm parents: 
48918diff
changeset | 571 | fun init_theory deps node span = | 
| 47335 | 572 | let | 
| 54526 | 573 | val master_dir = master_directory node; | 
| 574 | val header = read_header node span; | |
| 48927 
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
 wenzelm parents: 
48918diff
changeset | 575 | val imports = #imports header; | 
| 59716 | 576 | |
| 68869 | 577 | fun maybe_eval_result eval = Command.eval_result_state eval | 
| 69886 | 578 | handle Fail _ => Toplevel.init_toplevel (); | 
| 68869 | 579 | |
| 580 | fun maybe_end_theory pos st = SOME (Toplevel.end_theory pos st) | |
| 581 | handle ERROR msg => (Output.error_message msg; NONE); | |
| 582 | ||
| 59716 | 583 | val parents_reports = | 
| 584 | imports |> map_filter (fn (import, pos) => | |
| 65445 
e9e7f5f5794c
more qualifier treatment, but in the end it is still ignored;
 wenzelm parents: 
65357diff
changeset | 585 | (case Thy_Info.lookup_theory import of | 
| 59716 | 586 | NONE => | 
| 587 | maybe_end_theory pos | |
| 52536 | 588 | (case get_result (snd (the (AList.lookup (op =) deps import))) of | 
| 69886 | 589 | NONE => Toplevel.init_toplevel () | 
| 68869 | 590 | | SOME (_, eval) => maybe_eval_result eval) | 
| 59716 | 591 | | some => some) | 
| 592 | |> Option.map (fn thy => (thy, (pos, Theory.get_markup thy)))); | |
| 593 | ||
| 594 | val parents = | |
| 67380 | 595 | if null parents_reports then [Theory.get_pure ()] else map #1 parents_reports; | 
| 59716 | 596 | val _ = Position.reports (map #2 parents_reports); | 
| 68323 | 597 | val thy = Resources.begin_theory master_dir header parents; | 
| 598 | val _ = Output.status (Markup.markup_only Markup.initialized); | |
| 599 | in thy end; | |
| 47335 | 600 | |
| 67215 | 601 | fun check_root_theory node = | 
| 602 | let | |
| 603 | val master_dir = master_directory node; | |
| 604 | val header = #header (get_header node); | |
| 605 | val header_name = #1 (#name header); | |
| 606 | val parent = | |
| 607 | if header_name = Sessions.root_name then | |
| 608 | SOME (Thy_Info.get_theory Sessions.theory_name) | |
| 609 | else if member (op =) Thy_Header.ml_roots header_name then | |
| 610 | SOME (Thy_Info.get_theory Thy_Header.ml_bootstrapN) | |
| 611 | else NONE; | |
| 612 | in parent |> Option.map (fn thy => Resources.begin_theory master_dir header [thy]) end; | |
| 62895 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 613 | |
| 47407 | 614 | fun check_theory full name node = | 
| 65445 
e9e7f5f5794c
more qualifier treatment, but in the end it is still ignored;
 wenzelm parents: 
65357diff
changeset | 615 | is_some (Thy_Info.lookup_theory name) orelse | 
| 59715 
4f0d0e4ad68d
avoid duplicate header errors, more precise positions;
 wenzelm parents: 
59702diff
changeset | 616 | null (#errors (get_header node)) andalso (not full orelse is_some (get_result node)); | 
| 47335 | 617 | |
| 58923 | 618 | fun last_common keywords state node_required node0 node = | 
| 44482 
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
 wenzelm parents: 
44481diff
changeset | 619 | let | 
| 44645 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
 wenzelm parents: 
44644diff
changeset | 620 | fun update_flags prev (visible, initial) = | 
| 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
 wenzelm parents: 
44644diff
changeset | 621 | let | 
| 52569 
18dde2cf7aa7
produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
 wenzelm parents: 
52566diff
changeset | 622 | 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 | 623 | val initial' = initial andalso | 
| 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
 wenzelm parents: 
44644diff
changeset | 624 | (case prev of | 
| 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
 wenzelm parents: 
44644diff
changeset | 625 | NONE => true | 
| 59735 | 626 | | SOME command_id => the_command_name state command_id <> Thy_Header.theoryN); | 
| 44645 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
 wenzelm parents: 
44644diff
changeset | 627 | 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 | 628 | |
| 52784 
4ba2e8b9972f
de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
 wenzelm parents: 
52776diff
changeset | 629 | 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 | 630 | if ok then | 
| 47630 | 631 | let | 
| 52784 
4ba2e8b9972f
de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
 wenzelm parents: 
52776diff
changeset | 632 | 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 | 633 | val ok' = | 
| 52586 | 634 | (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 | 635 | (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 | 636 | 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 | 637 | (visible' orelse node_required orelse Command.eval_running eval) | 
| 52586 | 638 | | _ => false); | 
| 52784 
4ba2e8b9972f
de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
 wenzelm parents: 
52776diff
changeset | 639 | 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 | 640 | (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 | 641 | SOME (eval, prints) => | 
| 
18dde2cf7aa7
produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
 wenzelm parents: 
52566diff
changeset | 642 | let | 
| 
18dde2cf7aa7
produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
 wenzelm parents: 
52566diff
changeset | 643 | val command_visible = visible_command node command_id; | 
| 52850 
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
 wenzelm parents: 
52849diff
changeset | 644 | 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 | 645 | 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 | 646 | in | 
| 58923 | 647 | (case | 
| 648 | Command.print command_visible command_overlays keywords command_name eval prints | |
| 649 | of | |
| 52569 
18dde2cf7aa7
produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
 wenzelm parents: 
52566diff
changeset | 650 | 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 | 651 | | NONE => I) | 
| 
18dde2cf7aa7
produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
 wenzelm parents: 
52566diff
changeset | 652 | end | 
| 
18dde2cf7aa7
produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
 wenzelm parents: 
52566diff
changeset | 653 | | NONE => I); | 
| 52784 
4ba2e8b9972f
de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
 wenzelm parents: 
52776diff
changeset | 654 | in SOME (prev, ok', flags', assign_update') end | 
| 47630 | 655 | else NONE; | 
| 52784 
4ba2e8b9972f
de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
 wenzelm parents: 
52776diff
changeset | 656 | 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 | 657 | 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 | 658 | 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 | 659 | 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 | 660 | 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 | 661 | 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 | 662 | else (common, flags); | 
| 
18dde2cf7aa7
produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
 wenzelm parents: 
52566diff
changeset | 663 | in (assign_update', common', flags') end; | 
| 44645 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
 wenzelm parents: 
44644diff
changeset | 664 | |
| 62895 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 665 | fun illegal_init _ = error "Illegal theory header"; | 
| 52534 | 666 | |
| 58923 | 667 | fun new_exec keywords state node proper_init command_id' (assign_update, command_exec, init) = | 
| 47407 | 668 | 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 | 669 | else | 
| 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
 wenzelm parents: 
44644diff
changeset | 670 | let | 
| 52850 
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
 wenzelm parents: 
52849diff
changeset | 671 | val command_visible = visible_command node command_id'; | 
| 
9fff9f78240a
support print functions with explicit arguments, as provided by overlays;
 wenzelm parents: 
52849diff
changeset | 672 | val command_overlays = overlays node command_id'; | 
| 59689 
7968c57ea240
simplified Command.resolve_files in ML, using blobs_index from Scala;
 wenzelm parents: 
59687diff
changeset | 673 | val (command_name, blob_digests, blobs_index, span0) = the_command state command_id'; | 
| 56447 
1e77ed11f2f7
separate file_node vs. file_path, e.g. relevant on Windows for hyperlink to the latter;
 wenzelm parents: 
56208diff
changeset | 674 | val blobs = map (resolve_blob state) blob_digests; | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 675 | 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 | 676 | |
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54516diff
changeset | 677 | val eval' = | 
| 66367 | 678 | Command.eval keywords (master_directory node) (fn () => the_default illegal_init init span) | 
| 68184 
6c693b2700b3
support for dynamic document output while editing;
 wenzelm parents: 
67500diff
changeset | 679 | (blobs, blobs_index) command_id' span (#1 (#2 command_exec)); | 
| 58923 | 680 | val prints' = | 
| 681 | perhaps (Command.print command_visible command_overlays keywords command_name eval') []; | |
| 52566 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52536diff
changeset | 682 | val exec' = (eval', prints'); | 
| 44482 
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
 wenzelm parents: 
44481diff
changeset | 683 | |
| 52566 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52536diff
changeset | 684 | val assign_update' = assign_update_new (command_id', SOME exec') assign_update; | 
| 59735 | 685 | val init' = if command_name = Thy_Header.theoryN then NONE else init; | 
| 66367 | 686 | in SOME (assign_update', (command_id', exec'), 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 | 687 | |
| 52655 
3b2b1ef13979
more careful termination of removed execs, leaving running execs undisturbed;
 wenzelm parents: 
52607diff
changeset | 688 | fun removed_execs node0 (command_id, exec_ids) = | 
| 
3b2b1ef13979
more careful termination of removed execs, leaving running execs undisturbed;
 wenzelm parents: 
52607diff
changeset | 689 | 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 | 690 | |
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 691 | fun print_consolidation options the_command_span node_name (assign_update, node) = | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 692 | (case finished_result_theory node of | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 693 | SOME (result_id, thy) => | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 694 | let | 
| 68380 | 695 | val active_tasks = | 
| 696 | (node, false) |-> iterate_entries (fn (_, opt_exec) => fn active => | |
| 697 | if active then NONE | |
| 698 | else | |
| 699 | (case opt_exec of | |
| 700 | NONE => NONE | |
| 701 | | SOME (eval, _) => | |
| 702 | SOME (not (null (Execution.snapshot [Command.eval_exec_id eval]))))); | |
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 703 | in | 
| 68380 | 704 | if not active_tasks then | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 705 | let | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 706 | val consolidation = | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 707 | if Options.bool options "editor_presentation" then | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 708 | let | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 709 | val (_, offsets, rev_segments) = | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 710 | iterate_entries (fn (_, opt_exec) => fn (offset, offsets, segments) => | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 711 | (case opt_exec of | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 712 | SOME (eval, _) => | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 713 | let | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 714 | val command_id = Command.eval_command_id eval; | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 715 | val span = the_command_span command_id; | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 716 | |
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 717 | val exec_id = Command.eval_exec_id eval; | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 718 | val tr = Command.eval_result_command eval; | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 719 | val st' = Command.eval_result_state eval; | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 720 | |
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 721 | val offset' = offset + the_default 0 (Command_Span.symbol_length span); | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 722 | val offsets' = offsets | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 723 | |> Inttab.update (command_id, offset) | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 724 | |> Inttab.update (exec_id, offset); | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 725 | val segments' = (span, tr, st') :: segments; | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 726 | in SOME (offset', offsets', segments') end | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 727 | | NONE => NONE)) node (0, Inttab.empty, []); | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 728 | |
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 729 | val adjust = Inttab.lookup offsets; | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 730 | val segments = | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 731 | rev rev_segments |> map (fn (span, tr, st') => | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 732 |                       {span = Command_Span.adjust_offsets adjust span, command = tr, state = st'});
 | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 733 | |
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 734 | val presentation_context: Thy_Info.presentation_context = | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 735 |                    {options = options,
 | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 736 | file_pos = Position.file node_name, | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 737 | adjust_pos = Position.adjust_offsets adjust, | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 738 | segments = segments}; | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 739 | in | 
| 68344 | 740 | fn _ => | 
| 68538 
0903c4c8b455
always consolidate: allow errors in presentation;
 wenzelm parents: 
68381diff
changeset | 741 | Exn.release | 
| 
0903c4c8b455
always consolidate: allow errors in presentation;
 wenzelm parents: 
68381diff
changeset | 742 | (Exn.capture (Thy_Info.apply_presentation presentation_context) thy | 
| 
0903c4c8b455
always consolidate: allow errors in presentation;
 wenzelm parents: 
68381diff
changeset | 743 | before commit_consolidated node) | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 744 | end | 
| 68344 | 745 | else fn _ => commit_consolidated node; | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 746 | |
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 747 | val result_entry = | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 748 | (case lookup_entry node result_id of | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 749 | NONE => err_undef "result command entry" result_id | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 750 | | SOME (eval, prints) => | 
| 68344 | 751 | let | 
| 752 | val print = eval |> Command.print0 | |
| 753 |                       {pri = Task_Queue.urgent_pri + 1, print_fn = K consolidation};
 | |
| 754 | in (result_id, SOME (eval, print :: prints)) end); | |
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 755 | |
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 756 | val assign_update' = assign_update |> assign_update_change result_entry; | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 757 | val node' = node |> assign_entry result_entry; | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 758 | in (assign_update', node') end | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 759 | else (assign_update, node) | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 760 | end | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 761 | | NONE => (assign_update, node)); | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 762 | in | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 763 | |
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 764 | fun update old_version_id new_version_id edits consolidate state = | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 765 | Runtime.exn_trace_system (fn () => | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 766 | let | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 767 | val options = Options.default (); | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 768 | val the_command_span = Outer_Syntax.make_span o Lazy.force o #4 o the_command state; | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 769 | |
| 52536 | 770 | val old_version = the_version state old_version_id; | 
| 59086 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 771 | val new_version = | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 772 | timeit "Document.edit_nodes" | 
| 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 773 | (fn () => old_version |> fold edit_nodes edits |> edit_keywords edits); | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 774 | |
| 68381 
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
 wenzelm parents: 
68380diff
changeset | 775 | val consolidate = Symtab.defined (Symtab.make_set consolidate); | 
| 44544 
da5f0af32c1b
more precise treatment of nodes that are fully required for partially visible ones;
 wenzelm parents: 
44483diff
changeset | 776 | val nodes = nodes_of new_version; | 
| 52776 | 777 | val required = make_required nodes; | 
| 778 | val required0 = make_required (nodes_of old_version); | |
| 52772 | 779 | 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 | 780 | |
| 47628 | 781 | 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 | 782 | nodes |> String_Graph.schedule | 
| 44199 
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
 wenzelm parents: 
44198diff
changeset | 783 | (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 | 784 | (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 | 785 |             {name = "Document.update", group = NONE,
 | 
| 52716 | 786 | deps = map (Future.task_of o #2) deps, pri = 1, interrupts = false} | 
| 59056 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 787 | (fn () => | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 788 |               timeit ("Document.update " ^ name) (fn () =>
 | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 789 | Runtime.exn_trace_system (fn () => | 
| 44482 
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
 wenzelm parents: 
44481diff
changeset | 790 | let | 
| 67215 | 791 | val root_theory = check_root_theory node; | 
| 59086 
94b2690ad494
node-specific keywords, with session base syntax as default;
 wenzelm parents: 
59085diff
changeset | 792 | val keywords = the_default (Session.get_keywords ()) (get_keywords node); | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 793 | |
| 68381 
2fd3a6d6ba2e
less wasteful consolidation, based on PIDE front-end state and recent changes;
 wenzelm parents: 
68380diff
changeset | 794 | val maybe_consolidate = consolidate name andalso could_consolidate node; | 
| 59056 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 795 | val imports = map (apsnd Future.join) deps; | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 796 | val imports_result_changed = exists (#4 o #1 o #2) imports; | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 797 | val node_required = Symtab.defined required name; | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 798 | in | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 799 | if Symtab.defined edited name orelse maybe_consolidate orelse | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 800 | visible_node node orelse imports_result_changed orelse | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 801 | Symtab.defined required0 name <> node_required | 
| 59056 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 802 | then | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 803 | let | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 804 | val node0 = node_of old_version name; | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 805 | val init = init_theory imports node; | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 806 | val proper_init = | 
| 67215 | 807 | is_some root_theory orelse | 
| 62895 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 808 | check_theory false name node andalso | 
| 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 809 | 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 | 810 | |
| 59056 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 811 | val (print_execs, common, (still_visible, initial)) = | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 812 | if imports_result_changed then (assign_update_empty, NONE, (true, true)) | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 813 | else last_common keywords state node_required node0 node; | 
| 62895 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 814 | |
| 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 815 | val common_command_exec = | 
| 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 816 | (case common of | 
| 
54c2abe7e9a4
treat ROOT.ML as theory with header "theory ML_Root imports ML_Bootstrap begin";
 wenzelm parents: 
62826diff
changeset | 817 | SOME id => (id, the_default Command.no_exec (the_entry node id)) | 
| 67215 | 818 | | NONE => (Document_ID.none, Command.init_exec root_theory)); | 
| 44479 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 wenzelm parents: 
44478diff
changeset | 819 | |
| 66367 | 820 | val (updated_execs, (command_id', exec'), _) = | 
| 59056 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 821 | (print_execs, common_command_exec, if initial then SOME init else NONE) | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 822 | |> (still_visible orelse node_required) ? | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 823 | iterate_entries_after common | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 824 | (fn ((prev, id), _) => fn res => | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 825 | if not node_required andalso prev = visible_last node then NONE | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 826 | else new_exec keywords state node proper_init id res) node; | 
| 44479 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 wenzelm parents: 
44478diff
changeset | 827 | |
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 828 | val assign_update = | 
| 59056 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 829 | (node0, updated_execs) |-> iterate_entries_after common | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 830 | (fn ((_, command_id0), exec0) => fn res => | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 831 | if is_none exec0 then NONE | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 832 | else if assign_update_defined updated_execs command_id0 then SOME res | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 833 | 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 | 834 | |
| 59056 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 835 | val last_exec = | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 836 | if command_id' = Document_ID.none then NONE else SOME command_id'; | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 837 | val result = | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 838 | if is_none last_exec orelse is_some (after_entry node last_exec) then NONE | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 839 | else SOME (command_id', #1 exec'); | 
| 52602 
00170ef1dc39
strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
 wenzelm parents: 
52600diff
changeset | 840 | |
| 66379 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66369diff
changeset | 841 | val result_changed = | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 842 | not (eq_option (Command.eval_eq o apply2 #2) (get_result node0, result)); | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 843 | val (assign_update', node') = node | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 844 | |> assign_update_apply assign_update | 
| 66379 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66369diff
changeset | 845 | |> set_result result | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 846 | |> result_changed ? reset_consolidated | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 847 | |> pair assign_update | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 848 | |> (not result_changed andalso maybe_consolidate) ? | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 849 | print_consolidation options the_command_span name; | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 850 | |
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 851 | val assign_result = assign_update_result assign_update'; | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 852 | val removed = maps (removed_execs node0) assign_result; | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 853 | val _ = List.app Execution.cancel removed; | 
| 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 854 | |
| 59056 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 855 | val assigned_node = SOME (name, node'); | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 856 | in ((removed, assign_result, assigned_node, result_changed), node') end | 
| 59056 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 857 | else (([], [], NONE, false), node) | 
| 
cbe9563c03d1
even more exception traces for Document.update, which goes through additional execution wrappers;
 wenzelm parents: 
58934diff
changeset | 858 | end)))) | 
| 47628 | 859 | |> Future.joins |> map #1); | 
| 44476 
e8a87398f35d
propagate information about last command with exec state assignment through document model;
 wenzelm parents: 
44446diff
changeset | 860 | |
| 52655 
3b2b1ef13979
more careful termination of removed execs, leaving running execs undisturbed;
 wenzelm parents: 
52607diff
changeset | 861 | val removed = maps #1 updated; | 
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 862 | val assign_result = 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 | 863 | 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 | 864 | |
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 865 | val state' = state | 
| 68366 
cd387c55e085
fork parallel prints early in execution: avoid degradation of priority due to main eval task;
 wenzelm parents: 
68354diff
changeset | 866 | |> define_version new_version_id new_version assigned_nodes; | 
| 52602 
00170ef1dc39
strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
 wenzelm parents: 
52600diff
changeset | 867 | |
| 68336 
09ac56914b29
Document.update includes node consolidation / presentation as regular print operation: avoid user operations on protocol thread;
 wenzelm parents: 
68323diff
changeset | 868 | in (removed, assign_result, state') end); | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 869 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 870 | end; | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 871 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 872 | |
| 43713 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 873 | |
| 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 874 | (** global state **) | 
| 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 875 | |
| 52508 | 876 | val global_state = Synchronized.var "Document.global_state" init_state; | 
| 43713 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 877 | |
| 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 878 | fun state () = Synchronized.value global_state; | 
| 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 879 | val change_state = Synchronized.change global_state; | 
| 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 880 | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 881 | end; |