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