author | wenzelm |
Fri, 05 Jul 2013 15:38:03 +0200 | |
changeset 52530 | 99dd8b4ef3fe |
parent 52527 | dbac84eab3bc |
child 52532 | c81d76f7f63d |
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 |
44478
4fdb1009a370
tuned signature -- emphasize traditional read/eval/print terminology, which is still relevant here;
wenzelm
parents:
44476
diff
changeset
|
5 |
list of commands, with asynchronous read/eval/print processes. |
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
6 |
*) |
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
7 |
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
8 |
signature DOCUMENT = |
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
9 |
sig |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
47633
diff
changeset
|
10 |
type node_header = string * Thy_Header.header * string list |
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
11 |
datatype node_edit = |
48755
393a37003851
apply all text edits to each node, before determining the resulting doc_edits -- allow several iterations to consolidate spans etc.;
wenzelm
parents:
48735
diff
changeset
|
12 |
Clear | (* FIXME unused !? *) |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
13 |
Edits of (Document_ID.command option * Document_ID.command option) list | |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
47633
diff
changeset
|
14 |
Deps of node_header | |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
15 |
Perspective of Document_ID.command list |
44156 | 16 |
type edit = string * node_edit |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
17 |
type state |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
18 |
val init_state: state |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
19 |
val define_command: Document_ID.command -> string -> string -> state -> state |
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
20 |
val remove_versions: Document_ID.version list -> state -> state |
47343
b8aeab386414
less aggressive discontinue_execution before document update, to avoid unstable execs that need to be re-assigned;
wenzelm
parents:
47342
diff
changeset
|
21 |
val discontinue_execution: state -> unit |
47404
e6e5750f1311
simplified Future.cancel/cancel_group (again) -- running threads only;
wenzelm
parents:
47395
diff
changeset
|
22 |
val cancel_execution: state -> unit |
47420
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
23 |
val start_execution: state -> unit |
47628 | 24 |
val timing: bool Unsynchronized.ref |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
25 |
val update: Document_ID.version -> Document_ID.version -> edit list -> state -> |
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
26 |
(Document_ID.command * Document_ID.exec list) list * state |
43713
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
27 |
val state: unit -> state |
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
28 |
val change_state: (state -> state) -> unit |
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
29 |
end; |
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
30 |
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
31 |
structure Document: DOCUMENT = |
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
32 |
struct |
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
33 |
|
52526 | 34 |
(* command execution *) |
35 |
||
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
36 |
type exec = Document_ID.exec * (Command.eval * Command.print list); (*eval/print process*) |
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
37 |
val no_exec: exec = (Document_ID.none, (Command.no_eval, [])); |
52526 | 38 |
|
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
39 |
fun exec_ids_of ((exec_id, (_, prints)): exec) = exec_id :: map #exec_id prints; |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
40 |
|
52526 | 41 |
fun exec_result ((_, (eval, _)): exec) = Command.memo_result eval; |
42 |
||
43 |
fun exec_run ((_, (eval, prints)): exec) = |
|
44 |
(Command.memo_eval eval; |
|
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
45 |
prints |> List.app (fn {name, pri, print, ...} => |
52526 | 46 |
Command.memo_fork {name = name, group = NONE, deps = [], pri = pri, interrupts = true} print)); |
47 |
||
48 |
||
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
49 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
50 |
(** document structure **) |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
51 |
|
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
52 |
fun err_dup kind id = error ("Duplicate " ^ kind ^ ": " ^ Document_ID.print id); |
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
53 |
fun err_undef kind id = error ("Undefined " ^ kind ^ ": " ^ Document_ID.print id); |
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
54 |
|
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
47633
diff
changeset
|
55 |
type node_header = string * Thy_Header.header * string list; |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
56 |
type perspective = Inttab.set * Document_ID.command option; |
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
57 |
structure Entries = Linear_Set(type key = Document_ID.command val ord = int_ord); |
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
58 |
|
43668 | 59 |
abstype node = Node of |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
47633
diff
changeset
|
60 |
{header: node_header, (*master directory, theory header, errors*) |
52508 | 61 |
perspective: perspective, (*visible commands, last visible command*) |
52526 | 62 |
entries: exec option Entries.T * bool, (*command entries with excecutions, stable*) |
63 |
result: Command.eval option} (*result of last execution*) |
|
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset
|
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:
38414
diff
changeset
|
65 |
with |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
66 |
|
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
67 |
fun make_node (header, perspective, entries, result) = |
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
68 |
Node {header = header, perspective = perspective, entries = entries, result = result}; |
43668 | 69 |
|
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
70 |
fun map_node f (Node {header, perspective, entries, result}) = |
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
71 |
make_node (f (header, perspective, entries, result)); |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
72 |
|
44476
e8a87398f35d
propagate information about last command with exec state assignment through document model;
wenzelm
parents:
44446
diff
changeset
|
73 |
fun make_perspective command_ids : perspective = |
52526 | 74 |
(Inttab.make_set command_ids, try List.last command_ids); |
44441 | 75 |
|
51294
0850d43cb355
discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
wenzelm
parents:
51293
diff
changeset
|
76 |
val no_header = ("", Thy_Header.make ("", Position.none) [] [], ["Bad theory header"]); |
44441 | 77 |
val no_perspective = make_perspective []; |
44386
4048ca2658b7
some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents:
44385
diff
changeset
|
78 |
|
49064
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
79 |
val empty_node = make_node (no_header, no_perspective, (Entries.empty, true), NONE); |
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
80 |
val clear_node = |
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
81 |
map_node (fn (header, _, _, _) => (header, no_perspective, (Entries.empty, true), NONE)); |
44386
4048ca2658b7
some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents:
44385
diff
changeset
|
82 |
|
4048ca2658b7
some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents:
44385
diff
changeset
|
83 |
|
4048ca2658b7
some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents:
44385
diff
changeset
|
84 |
(* basic components *) |
4048ca2658b7
some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents:
44385
diff
changeset
|
85 |
|
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset
|
86 |
fun set_header header = |
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset
|
87 |
map_node (fn (_, perspective, entries, result) => (header, perspective, entries, result)); |
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset
|
88 |
|
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
47633
diff
changeset
|
89 |
fun get_header (Node {header = (master, header, errors), ...}) = |
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
47633
diff
changeset
|
90 |
if null errors then (master, header) |
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
47633
diff
changeset
|
91 |
else error (cat_lines errors); |
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
47633
diff
changeset
|
92 |
|
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset
|
93 |
fun read_header node span = |
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset
|
94 |
let |
51294
0850d43cb355
discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
wenzelm
parents:
51293
diff
changeset
|
95 |
val (dir, {name = (name, _), imports, keywords}) = get_header node; |
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset
|
96 |
val {name = (_, pos), imports = imports', ...} = Thy_Header.read_tokens span; |
51294
0850d43cb355
discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
wenzelm
parents:
51293
diff
changeset
|
97 |
in (dir, Thy_Header.make (name, pos) (map #1 imports ~~ map #2 imports') keywords) end; |
44180 | 98 |
|
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44384
diff
changeset
|
99 |
fun get_perspective (Node {perspective, ...}) = perspective; |
44441 | 100 |
fun set_perspective ids = |
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
101 |
map_node (fn (header, _, entries, result) => (header, make_perspective ids, entries, result)); |
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44384
diff
changeset
|
102 |
|
52526 | 103 |
val visible_commands = #1 o get_perspective; |
47345
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset
|
104 |
val visible_last = #2 o get_perspective; |
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset
|
105 |
val visible_node = is_some o visible_last |
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset
|
106 |
|
44444
33a5616a7571
tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents:
44441
diff
changeset
|
107 |
fun map_entries f = |
49064
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
108 |
map_node (fn (header, perspective, (entries, stable), result) => |
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
109 |
(header, perspective, (f entries, stable), result)); |
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
110 |
fun get_entries (Node {entries = (entries, _), ...}) = entries; |
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
111 |
|
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
112 |
fun entries_stable stable = |
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
113 |
map_node (fn (header, perspective, (entries, _), result) => |
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
114 |
(header, perspective, (entries, stable), result)); |
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
115 |
fun stable_entries (Node {entries = (_, stable), ...}) = stable; |
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
116 |
|
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
117 |
fun iterate_entries f = Entries.iterate NONE f o get_entries; |
49064
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
118 |
fun iterate_entries_after start f (Node {entries = (entries, _), ...}) = |
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
119 |
(case Entries.get_after entries start of |
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
120 |
NONE => I |
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
121 |
| SOME id => Entries.iterate (SOME id) f entries); |
43668 | 122 |
|
47339
79bd24497ffd
tuned -- NB: get_theory still needs to apply Lazy.force due to interrupt instabilities;
wenzelm
parents:
47336
diff
changeset
|
123 |
fun get_result (Node {result, ...}) = result; |
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44384
diff
changeset
|
124 |
fun set_result result = |
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
125 |
map_node (fn (header, perspective, entries, _) => (header, perspective, entries, result)); |
44180 | 126 |
|
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset
|
127 |
fun get_node nodes name = String_Graph.get_node nodes name |
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset
|
128 |
handle String_Graph.UNDEF _ => empty_node; |
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset
|
129 |
fun default_node name = String_Graph.default_node (name, empty_node); |
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset
|
130 |
fun update_node name f = default_node name #> String_Graph.map_node name f; |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
131 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
132 |
|
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
133 |
(* node edits and associated executions *) |
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
134 |
|
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
135 |
datatype node_edit = |
44185 | 136 |
Clear | |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
137 |
Edits of (Document_ID.command option * Document_ID.command option) list | |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
47633
diff
changeset
|
138 |
Deps of node_header | |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
139 |
Perspective of Document_ID.command list; |
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
140 |
|
44156 | 141 |
type edit = string * node_edit; |
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
142 |
|
49064
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
143 |
val after_entry = Entries.get_after o get_entries; |
44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44478
diff
changeset
|
144 |
|
49064
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
145 |
fun lookup_entry node id = |
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
146 |
(case Entries.lookup (get_entries node) id of |
44480
38c5b085fb1c
improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents:
44479
diff
changeset
|
147 |
NONE => NONE |
38c5b085fb1c
improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents:
44479
diff
changeset
|
148 |
| SOME (exec, _) => exec); |
38c5b085fb1c
improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents:
44479
diff
changeset
|
149 |
|
49064
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
150 |
fun the_entry node id = |
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
151 |
(case Entries.lookup (get_entries node) id of |
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
152 |
NONE => err_undef "command entry" id |
44476
e8a87398f35d
propagate information about last command with exec state assignment through document model;
wenzelm
parents:
44446
diff
changeset
|
153 |
| SOME (exec, _) => exec); |
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
154 |
|
52526 | 155 |
fun the_default_entry node (SOME id) = (id, the_default no_exec (the_entry node id)) |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
156 |
| the_default_entry _ NONE = (Document_ID.none, no_exec); |
44476
e8a87398f35d
propagate information about last command with exec state assignment through document model;
wenzelm
parents:
44446
diff
changeset
|
157 |
|
44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset
|
158 |
fun update_entry id exec = |
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset
|
159 |
map_entries (Entries.update (id, exec)); |
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset
|
160 |
|
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset
|
161 |
fun reset_entry id node = |
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset
|
162 |
if is_some (lookup_entry node id) then update_entry id NONE node else node; |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
163 |
|
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
164 |
fun reset_after id entries = |
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
165 |
(case Entries.get_after entries id of |
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
166 |
NONE => entries |
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
167 |
| SOME next => Entries.update (next, NONE) entries); |
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
168 |
|
43668 | 169 |
val edit_node = map_entries o fold |
170 |
(fn (id, SOME id2) => Entries.insert_after id (id2, NONE) |
|
171 |
| (id, NONE) => Entries.delete_after id #> reset_after id); |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
172 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
173 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
174 |
(* version operations *) |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
175 |
|
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset
|
176 |
val empty_version = Version String_Graph.empty; |
44185 | 177 |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
178 |
fun nodes_of (Version nodes) = nodes; |
44185 | 179 |
val node_of = get_node o nodes_of; |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
180 |
|
44185 | 181 |
fun cycle_msg names = "Cyclic dependency of " ^ space_implode " via " (map quote names); |
44180 | 182 |
|
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
183 |
fun edit_nodes (name, node_edit) (Version nodes) = |
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
184 |
Version |
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44435
diff
changeset
|
185 |
(case node_edit of |
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
186 |
Clear => update_node name clear_node nodes |
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
187 |
| Edits edits => update_node name (edit_node edits) nodes |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
47633
diff
changeset
|
188 |
| Deps (master, header, errors) => |
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44435
diff
changeset
|
189 |
let |
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset
|
190 |
val imports = map fst (#imports header); |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
47633
diff
changeset
|
191 |
val errors1 = |
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
47633
diff
changeset
|
192 |
(Thy_Header.define_keywords header; errors) |
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
47633
diff
changeset
|
193 |
handle ERROR msg => errors @ [msg]; |
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44435
diff
changeset
|
194 |
val nodes1 = nodes |
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44435
diff
changeset
|
195 |
|> default_node name |
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset
|
196 |
|> fold default_node imports; |
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44435
diff
changeset
|
197 |
val nodes2 = nodes1 |
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset
|
198 |
|> String_Graph.Keys.fold |
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset
|
199 |
(fn dep => String_Graph.del_edge (dep, name)) (String_Graph.imm_preds nodes1 name); |
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
47633
diff
changeset
|
200 |
val (nodes3, errors2) = |
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset
|
201 |
(String_Graph.add_deps_acyclic (name, imports) nodes2, errors1) |
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset
|
202 |
handle String_Graph.CYCLES cs => (nodes2, errors1 @ map cycle_msg cs); |
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset
|
203 |
in String_Graph.map_node name (set_header (master, header, errors2)) nodes3 end |
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
204 |
| Perspective perspective => update_node name (set_perspective perspective) nodes); |
44444
33a5616a7571
tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents:
44441
diff
changeset
|
205 |
|
44222
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents:
44202
diff
changeset
|
206 |
fun put_node (name, node) (Version nodes) = |
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents:
44202
diff
changeset
|
207 |
Version (update_node name (K node) nodes); |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
208 |
|
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
209 |
end; |
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
210 |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
211 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
212 |
|
47389
e8552cba702d
explicit checks stable_finished_theory/stable_command allow parallel asynchronous command transactions;
wenzelm
parents:
47388
diff
changeset
|
213 |
(** main state -- document structure and execution process **) |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
214 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
215 |
abstype state = State of |
40398 | 216 |
{versions: version Inttab.table, (*version_id -> document content*) |
47335 | 217 |
commands: (string * Token.T list lazy) Inttab.table, (*command_id -> named span*) |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
218 |
execution: |
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
219 |
Document_ID.version * Future.group * bool Unsynchronized.ref} (*current execution process*) |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
220 |
with |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
221 |
|
44674
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset
|
222 |
fun make_state (versions, commands, execution) = |
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset
|
223 |
State {versions = versions, commands = commands, execution = execution}; |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
224 |
|
44674
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset
|
225 |
fun map_state f (State {versions, commands, execution}) = |
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset
|
226 |
make_state (f (versions, commands, execution)); |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
227 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
228 |
val init_state = |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
229 |
make_state (Inttab.make [(Document_ID.none, empty_version)], Inttab.empty, |
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
230 |
(Document_ID.none, Future.new_group NONE, Unsynchronized.ref false)); |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
231 |
|
47420
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
232 |
fun execution_of (State {execution, ...}) = execution; |
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
233 |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
234 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
235 |
(* document versions *) |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
236 |
|
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
237 |
fun define_version (id: Document_ID.version) version = |
47420
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
238 |
map_state (fn (versions, commands, _) => |
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
239 |
let |
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
240 |
val versions' = Inttab.update_new (id, version) versions |
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
241 |
handle Inttab.DUP dup => err_dup "document version" dup; |
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
242 |
val execution' = (id, Future.new_group NONE, Unsynchronized.ref true); |
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
243 |
in (versions', commands, execution') end); |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
244 |
|
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
245 |
fun the_version (State {versions, ...}) (id: Document_ID.version) = |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
246 |
(case Inttab.lookup versions id of |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
247 |
NONE => err_undef "document version" id |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
248 |
| SOME version => version); |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
249 |
|
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
250 |
fun delete_version (id: Document_ID.version) versions = Inttab.delete id versions |
44673 | 251 |
handle Inttab.UNDEF _ => err_undef "document version" id; |
252 |
||
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
253 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
254 |
(* commands *) |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
255 |
|
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
256 |
fun define_command (id: Document_ID.command) name text = |
44674
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset
|
257 |
map_state (fn (versions, commands, execution) => |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
258 |
let |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
259 |
val id_string = Document_ID.print id; |
47395
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents:
47389
diff
changeset
|
260 |
val span = Lazy.lazy (fn () => |
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents:
47389
diff
changeset
|
261 |
Position.setmp_thread_data (Position.id_only id_string) |
51268
fcc4b89a600d
simplified Outer_Syntax.read_span: internalized Toplevel.is_ignored;
wenzelm
parents:
50862
diff
changeset
|
262 |
(fn () => Thy_Syntax.parse_tokens (Keyword.get_lexicons ()) (Position.id id_string) text) |
fcc4b89a600d
simplified Outer_Syntax.read_span: internalized Toplevel.is_ignored;
wenzelm
parents:
50862
diff
changeset
|
263 |
()); |
47395
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents:
47389
diff
changeset
|
264 |
val _ = |
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents:
47389
diff
changeset
|
265 |
Position.setmp_thread_data (Position.id_only id_string) |
50201
c26369c9eda6
Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents:
49906
diff
changeset
|
266 |
(fn () => Output.status (Markup.markup_only Markup.accepted)) (); |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
267 |
val commands' = |
46945 | 268 |
Inttab.update_new (id, (name, span)) commands |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
269 |
handle Inttab.DUP dup => err_dup "command" dup; |
44674
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset
|
270 |
in (versions, commands', execution) end); |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
271 |
|
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
272 |
fun the_command (State {commands, ...}) (id: Document_ID.command) = |
44660
90bab3febb6c
less agressive parsing of commands (priority ~1);
wenzelm
parents:
44645
diff
changeset
|
273 |
(case Inttab.lookup commands id of |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
274 |
NONE => err_undef "command" id |
44644
317e4962dd0f
clarified define_command: store name as structural information;
wenzelm
parents:
44643
diff
changeset
|
275 |
| SOME command => command); |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
276 |
|
47420
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
277 |
end; |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
278 |
|
47420
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
279 |
fun remove_versions ids state = state |> map_state (fn (versions, _, execution) => |
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
280 |
let |
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
281 |
val _ = member (op =) ids (#1 execution) andalso |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
282 |
error ("Attempt to remove execution version " ^ Document_ID.print (#1 execution)); |
47343
b8aeab386414
less aggressive discontinue_execution before document update, to avoid unstable execs that need to be re-assigned;
wenzelm
parents:
47342
diff
changeset
|
283 |
|
47420
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
284 |
val versions' = fold delete_version ids versions; |
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
285 |
val commands' = |
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
286 |
(versions', Inttab.empty) |-> |
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
287 |
Inttab.fold (fn (_, version) => nodes_of version |> |
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset
|
288 |
String_Graph.fold (fn (_, (node, _)) => node |> |
47420
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
289 |
iterate_entries (fn ((_, id), _) => |
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
290 |
SOME o Inttab.insert (K true) (id, the_command state id)))); |
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
291 |
in (versions', commands', execution) end); |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
292 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
293 |
|
49064
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
294 |
(* consolidated states *) |
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
295 |
|
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
296 |
fun stable_goals exec_id = |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
297 |
not (Par_Exn.is_interrupted (Future.join_results (Goal.peek_futures exec_id))); |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
298 |
|
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
299 |
fun stable_eval ((exec_id, (eval, _)): exec) = |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
300 |
stable_goals exec_id andalso Command.memo_stable eval; |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
301 |
|
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
302 |
fun stable_print ({exec_id, print, ...}: Command.print) = |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
303 |
stable_goals exec_id andalso Command.memo_stable print; |
49064
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
304 |
|
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
305 |
fun finished_theory node = |
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
306 |
(case Exn.capture (Command.memo_result o the) (get_result node) of |
52526 | 307 |
Exn.Res {state = st, ...} => can (Toplevel.end_theory Position.none) st |
49064
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
308 |
| _ => false); |
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
309 |
|
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
310 |
|
38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
311 |
|
47420
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
312 |
(** document execution **) |
47389
e8552cba702d
explicit checks stable_finished_theory/stable_command allow parallel asynchronous command transactions;
wenzelm
parents:
47388
diff
changeset
|
313 |
|
47420
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
314 |
val discontinue_execution = execution_of #> (fn (_, _, running) => running := false); |
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
315 |
val cancel_execution = execution_of #> (fn (_, group, _) => Future.cancel_group group); |
49906 | 316 |
val terminate_execution = execution_of #> (fn (_, group, _) => Future.terminate group); |
47345
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset
|
317 |
|
47420
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
318 |
fun start_execution state = |
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
319 |
let |
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
320 |
val (version_id, group, running) = execution_of state; |
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
321 |
val _ = |
47633
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset
|
322 |
(singleton o Future.forks) |
52508 | 323 |
{name = "Document.execution", group = SOME group, deps = [], pri = ~2, interrupts = true} |
47633
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset
|
324 |
(fn () => |
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset
|
325 |
(OS.Process.sleep (seconds 0.02); |
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset
|
326 |
nodes_of (the_version state version_id) |> String_Graph.schedule |
47633
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset
|
327 |
(fn deps => fn (name, node) => |
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset
|
328 |
if not (visible_node node) andalso finished_theory node then |
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset
|
329 |
Future.value () |
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset
|
330 |
else |
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset
|
331 |
(singleton o Future.forks) |
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset
|
332 |
{name = "theory:" ^ name, group = SOME (Future.new_group (SOME group)), |
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset
|
333 |
deps = map (Future.task_of o #2) deps, pri = ~2, interrupts = false} |
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset
|
334 |
(fn () => |
52515 | 335 |
iterate_entries (fn (_, opt_exec) => fn () => |
47633
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset
|
336 |
(case opt_exec of |
52526 | 337 |
SOME exec => if ! running then SOME (exec_run exec) else NONE |
47633
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset
|
338 |
| NONE => NONE)) node ())))); |
47420
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
339 |
in () end; |
47345
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset
|
340 |
|
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset
|
341 |
|
47420
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
342 |
|
0dbe6c69eda2
just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset
|
343 |
(** document update **) |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
344 |
|
47628 | 345 |
val timing = Unsynchronized.ref false; |
346 |
fun timeit msg e = cond_timeit (! timing) msg e; |
|
347 |
||
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
348 |
local |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
349 |
|
47335 | 350 |
fun make_required nodes = |
351 |
let |
|
352 |
val all_visible = |
|
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset
|
353 |
String_Graph.fold (fn (a, (node, _)) => visible_node node ? cons a) nodes [] |
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset
|
354 |
|> String_Graph.all_preds nodes |
47345
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset
|
355 |
|> map (rpair ()) |> Symtab.make; |
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset
|
356 |
|
47335 | 357 |
val required = |
47345
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset
|
358 |
Symtab.fold (fn (a, ()) => |
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset
|
359 |
exists (Symtab.defined all_visible) (String_Graph.immediate_succs nodes a) ? |
47345
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset
|
360 |
Symtab.update (a, ())) all_visible Symtab.empty; |
47335 | 361 |
in Symtab.defined required end; |
362 |
||
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset
|
363 |
fun init_theory deps node span = |
47335 | 364 |
let |
49173
fa01a202399c
eliminated potentially confusing terminology of Scala "layer";
wenzelm
parents:
49064
diff
changeset
|
365 |
(* FIXME provide files via Isabelle/Scala, not master_dir *) |
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset
|
366 |
val (dir, header) = read_header node span; |
47335 | 367 |
val master_dir = |
48735
35c47932584c
even more permissive approximation of master_dir, which is only required to access external resources ('uses' etc.);
wenzelm
parents:
48707
diff
changeset
|
368 |
(case try Url.explode dir of |
35c47932584c
even more permissive approximation of master_dir, which is only required to access external resources ('uses' etc.);
wenzelm
parents:
48707
diff
changeset
|
369 |
SOME (Url.File path) => path |
47335 | 370 |
| _ => Path.current); |
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset
|
371 |
val imports = #imports header; |
47335 | 372 |
val parents = |
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset
|
373 |
imports |> map (fn (import, _) => |
47407 | 374 |
(case Thy_Info.lookup_theory import of |
47335 | 375 |
SOME thy => thy |
376 |
| NONE => |
|
47339
79bd24497ffd
tuned -- NB: get_theory still needs to apply Lazy.force due to interrupt instabilities;
wenzelm
parents:
47336
diff
changeset
|
377 |
Toplevel.end_theory (Position.file_only import) |
52526 | 378 |
(#state |
47407 | 379 |
(Command.memo_result |
52526 | 380 |
(the_default Command.no_eval |
381 |
(get_result (snd (the (AList.lookup (op =) deps import))))))))); |
|
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset
|
382 |
val _ = Position.reports (map #2 imports ~~ map Theory.get_markup parents); |
47335 | 383 |
in Thy_Load.begin_theory master_dir header parents end; |
384 |
||
47407 | 385 |
fun check_theory full name node = |
386 |
is_some (Thy_Info.lookup_theory name) orelse |
|
48707
ba531af91148
simplified Document.Node.Header -- internalized errors;
wenzelm
parents:
47633
diff
changeset
|
387 |
can get_header node andalso (not full orelse is_some (get_result node)); |
47335 | 388 |
|
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
389 |
fun last_common state last_visible node0 node = |
44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset
|
390 |
let |
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
391 |
fun update_flags prev (visible, initial) = |
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
392 |
let |
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
393 |
val visible' = visible andalso prev <> last_visible; |
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
394 |
val initial' = initial andalso |
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
395 |
(case prev of |
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
396 |
NONE => true |
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
397 |
| SOME id => not (Keyword.is_theory_begin (#1 (the_command state id)))); |
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
398 |
in (visible', initial') end; |
47630 | 399 |
fun get_common ((prev, id), opt_exec) (same, (_, flags)) = |
400 |
if same then |
|
401 |
let |
|
402 |
val flags' = update_flags prev flags; |
|
403 |
val same' = |
|
404 |
(case opt_exec of |
|
405 |
NONE => false |
|
406 |
| SOME (exec_id, exec) => |
|
407 |
(case lookup_entry node0 id of |
|
408 |
NONE => false |
|
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
409 |
| SOME (exec_id0, _) => exec_id = exec_id0 andalso stable_eval (exec_id, exec))); |
47630 | 410 |
in SOME (same', (prev, flags')) end |
411 |
else NONE; |
|
412 |
val (same, (common, flags)) = |
|
413 |
iterate_entries get_common node (true, (NONE, (true, true))); |
|
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
414 |
in |
47630 | 415 |
if same then |
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
416 |
let val last = Entries.get_after (get_entries node) common |
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
417 |
in (last, update_flags last flags) end |
47630 | 418 |
else (common, flags) |
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
419 |
end; |
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
420 |
|
52515 | 421 |
fun new_exec state proper_init command_visible command_id' (execs, command_exec, init) = |
47407 | 422 |
if not proper_init andalso is_none init then NONE |
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
423 |
else |
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
424 |
let |
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
425 |
val (command_name, span) = the_command state command_id' ||> Lazy.force; |
52526 | 426 |
|
52514 | 427 |
fun illegal_init _ = error "Illegal theory header after end of theory"; |
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
428 |
val (modify_init, init') = |
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
429 |
if Keyword.is_theory_begin command_name then |
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset
|
430 |
(Toplevel.modify_init (fn () => the_default illegal_init init span), NONE) |
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
431 |
else (I, init); |
52526 | 432 |
|
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
433 |
val exec_id' = Document_ID.make (); |
52526 | 434 |
val eval' = |
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
435 |
Command.memo (fn () => |
52509 | 436 |
let |
52526 | 437 |
val eval_state = exec_result (snd command_exec); |
438 |
val tr = |
|
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
439 |
Position.setmp_thread_data (Position.id_only (Document_ID.print exec_id')) |
52526 | 440 |
(fn () => |
441 |
Command.read span |
|
442 |
|> modify_init |
|
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
443 |
|> Toplevel.put_id exec_id') (); |
52526 | 444 |
in Command.eval span tr eval_state end); |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
445 |
val prints' = if command_visible then Command.print command_name eval' else []; |
52526 | 446 |
val command_exec' = (command_id', (exec_id', (eval', prints'))); |
44674
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset
|
447 |
in SOME (command_exec' :: execs, command_exec', init') end; |
44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset
|
448 |
|
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
449 |
fun update_prints state node command_id = |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
450 |
(case the_entry node command_id of |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
451 |
SOME (exec_id, (eval, prints)) => |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
452 |
let |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
453 |
val (command_name, _) = the_command state command_id; |
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
454 |
val new_prints = Command.print command_name eval; |
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
455 |
val prints' = |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
456 |
new_prints |> map (fn new_print => |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
457 |
(case find_first (fn {name, ...} => name = #name new_print) prints of |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
458 |
SOME print => if stable_print print then print else new_print |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
459 |
| NONE => new_print)); |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
460 |
in |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
461 |
if eq_list (op = o pairself #exec_id) (prints, prints') then NONE |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
462 |
else SOME (command_id, (exec_id, (eval, prints'))) |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
463 |
end |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
464 |
| NONE => NONE); |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
465 |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
466 |
in |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
467 |
|
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
468 |
fun update (old_id: Document_ID.version) (new_id: Document_ID.version) edits state = |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
469 |
let |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
470 |
val old_version = the_version state old_id; |
47628 | 471 |
val new_version = timeit "Document.edit_nodes" (fn () => fold edit_nodes edits old_version); |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
472 |
|
44544
da5f0af32c1b
more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents:
44483
diff
changeset
|
473 |
val nodes = nodes_of new_version; |
da5f0af32c1b
more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents:
44483
diff
changeset
|
474 |
val is_required = make_required nodes; |
da5f0af32c1b
more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents:
44483
diff
changeset
|
475 |
|
47628 | 476 |
val _ = timeit "Document.terminate_execution" (fn () => terminate_execution state); |
477 |
val updated = timeit "Document.update" (fn () => |
|
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset
|
478 |
nodes |> String_Graph.schedule |
44199
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
wenzelm
parents:
44198
diff
changeset
|
479 |
(fn deps => fn (name, node) => |
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
480 |
(singleton o Future.forks) |
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
481 |
{name = "Document.update", group = NONE, |
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
482 |
deps = map (Future.task_of o #2) deps, pri = 0, interrupts = false} |
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
483 |
(fn () => |
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
484 |
let |
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
485 |
val imports = map (apsnd Future.join) deps; |
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
486 |
val changed_imports = exists (#4 o #1 o #2) imports; |
52514 | 487 |
val node_required = is_required name; |
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
488 |
in |
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
489 |
if changed_imports orelse AList.defined (op =) edits name orelse |
49064
bd6cc0b911a1
maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset
|
490 |
not (stable_entries node) orelse not (finished_theory node) |
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
491 |
then |
44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset
|
492 |
let |
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
493 |
val node0 = node_of old_version name; |
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset
|
494 |
val init = init_theory imports node; |
47407 | 495 |
val proper_init = |
496 |
check_theory false name node andalso |
|
497 |
forall (fn (name, (_, node)) => check_theory true name node) imports; |
|
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
498 |
|
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
499 |
val visible_commands = visible_commands node; |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
500 |
val visible_command = Inttab.defined visible_commands; |
47345
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset
|
501 |
val last_visible = visible_last node; |
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
502 |
|
52514 | 503 |
val (common, (still_visible, initial)) = |
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
504 |
if changed_imports then (NONE, (true, true)) |
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
505 |
else last_common state last_visible node0 node; |
44674
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset
|
506 |
val common_command_exec = the_default_entry node common; |
44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44478
diff
changeset
|
507 |
|
52526 | 508 |
val (new_execs, (command_id', (_, (eval', _))), _) = |
44674
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset
|
509 |
([], common_command_exec, if initial then SOME init else NONE) |> |
52514 | 510 |
(still_visible orelse node_required) ? |
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
511 |
iterate_entries_after common |
44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset
|
512 |
(fn ((prev, id), _) => fn res => |
52514 | 513 |
if not node_required andalso prev = last_visible then NONE |
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
514 |
else new_exec state proper_init (visible_command id) id res) node; |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
515 |
|
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
516 |
val updated_execs = |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
517 |
(visible_commands, new_execs) |-> Inttab.fold (fn (id, ()) => |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
518 |
if exists (fn (_, (id', _)) => id = id') new_execs then I |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
519 |
else append (the_list (update_prints state node id))); |
44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44478
diff
changeset
|
520 |
|
44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset
|
521 |
val no_execs = |
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset
|
522 |
iterate_entries_after common |
44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset
|
523 |
(fn ((_, id0), exec0) => fn res => |
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset
|
524 |
if is_none exec0 then NONE |
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
525 |
else if exists (fn (_, (id, _)) => id0 = id) updated_execs |
52526 | 526 |
then SOME res |
44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset
|
527 |
else SOME (id0 :: res)) node0 []; |
44480
38c5b085fb1c
improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents:
44479
diff
changeset
|
528 |
|
52530
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
529 |
val last_exec = |
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents:
52527
diff
changeset
|
530 |
if command_id' = Document_ID.none then NONE else SOME command_id'; |
44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset
|
531 |
val result = |
47407 | 532 |
if is_some (after_entry node last_exec) then NONE |
52526 | 533 |
else SOME eval'; |
44480
38c5b085fb1c
improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents:
44479
diff
changeset
|
534 |
|
44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset
|
535 |
val node' = node |
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset
|
536 |
|> fold reset_entry no_execs |
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
537 |
|> fold (fn (id, exec) => update_entry id (SOME exec)) updated_execs |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
538 |
|> entries_stable (null updated_execs) |
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
539 |
|> set_result result; |
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
540 |
val updated_node = |
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
541 |
if null no_execs andalso null updated_execs then NONE |
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
542 |
else SOME (name, node'); |
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
543 |
val changed_result = not (null no_execs) orelse not (null new_execs); |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
544 |
in ((no_execs, updated_execs, updated_node, changed_result), node') end |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
545 |
else (([], [], NONE, false), node) |
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
546 |
end)) |
47628 | 547 |
|> Future.joins |> map #1); |
44476
e8a87398f35d
propagate information about last command with exec state assignment through document model;
wenzelm
parents:
44446
diff
changeset
|
548 |
|
44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44478
diff
changeset
|
549 |
val command_execs = |
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
550 |
map (rpair []) (maps #1 updated) @ |
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset
|
551 |
map (fn (command_id, exec) => (command_id, exec_ids_of exec)) (maps #2 updated); |
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and re-assigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset
|
552 |
val updated_nodes = map_filter #3 updated; |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
553 |
|
44197
458573968568
refined Document.edit: less stateful update via Graph.schedule;
wenzelm
parents:
44196
diff
changeset
|
554 |
val state' = state |
44476
e8a87398f35d
propagate information about last command with exec state assignment through document model;
wenzelm
parents:
44446
diff
changeset
|
555 |
|> define_version new_id (fold put_node updated_nodes new_version); |
47388
fe4b245af74c
discontinued obsolete last_execs (cf. cd3ab7625519);
wenzelm
parents:
47347
diff
changeset
|
556 |
in (command_execs, state') end; |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
557 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
558 |
end; |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
559 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
560 |
|
43713
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
561 |
|
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
562 |
(** global state **) |
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
563 |
|
52508 | 564 |
val global_state = Synchronized.var "Document.global_state" init_state; |
43713
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
565 |
|
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
566 |
fun state () = Synchronized.value global_state; |
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
567 |
val change_state = Synchronized.change global_state; |
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
568 |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
569 |
end; |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
570 |