author | wenzelm |
Thu, 11 Aug 2011 20:32:44 +0200 | |
changeset 44157 | a21d3e1e64fd |
parent 44156 | 6aa25b80e1a5 |
child 44160 | 8848867501fb |
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 |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
5 |
list of commands, associated with asynchronous execution process. |
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
6 |
*) |
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
7 |
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
8 |
signature DOCUMENT = |
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
9 |
sig |
38363
af7f41a8a0a8
clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents:
38355
diff
changeset
|
10 |
type id = int |
38373 | 11 |
type version_id = id |
38363
af7f41a8a0a8
clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents:
38355
diff
changeset
|
12 |
type command_id = id |
38373 | 13 |
type exec_id = id |
38363
af7f41a8a0a8
clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents:
38355
diff
changeset
|
14 |
val no_id: id |
38419 | 15 |
val new_id: unit -> id |
38363
af7f41a8a0a8
clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents:
38355
diff
changeset
|
16 |
val parse_id: string -> id |
af7f41a8a0a8
clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents:
38355
diff
changeset
|
17 |
val print_id: id -> string |
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
18 |
datatype node_edit = |
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
19 |
Remove | |
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
20 |
Edits of (command_id option * command_id option) list | |
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
21 |
Update_Header of (string * string list * string list) Exn.result |
44156 | 22 |
type edit = string * node_edit |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
23 |
type state |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
24 |
val init_state: state |
43668 | 25 |
val get_theory: state -> version_id -> Position.T -> string -> theory |
43666 | 26 |
val cancel_execution: state -> unit -> unit |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
27 |
val define_command: command_id -> string -> state -> state |
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
28 |
val edit: version_id -> version_id -> edit list -> state -> (command_id * exec_id) list * state |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
29 |
val execute: version_id -> state -> state |
43713
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
30 |
val state: unit -> state |
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
31 |
val change_state: (state -> state) -> unit |
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
32 |
end; |
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
33 |
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
34 |
structure Document: DOCUMENT = |
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
35 |
struct |
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
36 |
|
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
37 |
(* unique identifiers *) |
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
38 |
|
38363
af7f41a8a0a8
clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents:
38355
diff
changeset
|
39 |
type id = int; |
38373 | 40 |
type version_id = id; |
38363
af7f41a8a0a8
clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents:
38355
diff
changeset
|
41 |
type command_id = id; |
38373 | 42 |
type exec_id = id; |
38355
8cb265fb12fe
represent document ids by (long) int, to benefit from the somewhat faster Inttab in ML (LinearSet in Scala is invariably indexed by native object ids);
wenzelm
parents:
38150
diff
changeset
|
43 |
|
8cb265fb12fe
represent document ids by (long) int, to benefit from the somewhat faster Inttab in ML (LinearSet in Scala is invariably indexed by native object ids);
wenzelm
parents:
38150
diff
changeset
|
44 |
val no_id = 0; |
40449 | 45 |
val new_id = Synchronized.counter (); |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
46 |
|
38414
49f1f657adc2
more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents:
38373
diff
changeset
|
47 |
val parse_id = Markup.parse_int; |
49f1f657adc2
more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents:
38373
diff
changeset
|
48 |
val print_id = Markup.print_int; |
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
49 |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
50 |
fun err_dup kind id = error ("Duplicate " ^ kind ^ ": " ^ print_id id); |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
51 |
fun err_undef kind id = error ("Undefined " ^ kind ^ ": " ^ print_id id); |
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
52 |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
53 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
54 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
55 |
(** document structure **) |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
56 |
|
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
57 |
structure Entries = Linear_Set(type key = command_id val ord = int_ord); |
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
58 |
|
43668 | 59 |
abstype node = Node of |
60 |
{last: exec_id, entries: exec_id option Entries.T} (*command entries with excecutions*) |
|
61 |
and version = Version of node Graph.T (*development graph wrt. static imports*) |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
62 |
with |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
63 |
|
43668 | 64 |
fun make_node (last, entries) = |
65 |
Node {last = last, entries = entries}; |
|
66 |
||
67 |
fun get_last (Node {last, ...}) = last; |
|
68 |
fun set_last last (Node {entries, ...}) = make_node (last, entries); |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
69 |
|
43668 | 70 |
fun map_entries f (Node {last, entries}) = make_node (last, f entries); |
71 |
fun fold_entries start f (Node {entries, ...}) = Entries.fold start f entries; |
|
72 |
fun first_entry start P (Node {entries, ...}) = Entries.get_first start P entries; |
|
73 |
||
74 |
val empty_node = make_node (no_id, Entries.empty); |
|
75 |
val empty_version = Version Graph.empty; |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
76 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
77 |
|
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
78 |
(* node edits and associated executions *) |
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
79 |
|
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
80 |
datatype node_edit = |
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
81 |
Remove | |
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
82 |
Edits of (command_id option * command_id option) list | |
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
83 |
Update_Header of (string * string list * string list) Exn.result; |
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
84 |
|
44156 | 85 |
type edit = string * node_edit; |
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
86 |
|
43668 | 87 |
fun the_entry (Node {entries, ...}) id = |
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
88 |
(case Entries.lookup entries id of |
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
89 |
NONE => err_undef "command entry" id |
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
90 |
| SOME entry => entry); |
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
91 |
|
43668 | 92 |
fun update_entry (id, exec_id) = |
93 |
map_entries (Entries.update (id, SOME exec_id)); |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
94 |
|
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
95 |
fun reset_after id entries = |
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
96 |
(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
|
97 |
NONE => entries |
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
98 |
| 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
|
99 |
|
43668 | 100 |
val edit_node = map_entries o fold |
101 |
(fn (id, SOME id2) => Entries.insert_after id (id2, NONE) |
|
102 |
| (id, NONE) => Entries.delete_after id #> reset_after id); |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
103 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
104 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
105 |
(* version operations *) |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
106 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
107 |
fun nodes_of (Version nodes) = nodes; |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
108 |
val node_names_of = Graph.keys o nodes_of; |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
109 |
|
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
110 |
fun get_node version name = Graph.get_node (nodes_of version) name |
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
111 |
handle Graph.UNDEF _ => empty_node; |
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
112 |
|
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
113 |
fun edit_nodes (name, node_edit) (Version nodes) = |
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
114 |
Version |
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
115 |
(case node_edit of |
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
116 |
Remove => perhaps (try (Graph.del_node name)) nodes |
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
117 |
| Edits edits => |
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
118 |
nodes |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
119 |
|> Graph.default_node (name, empty_node) |
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
120 |
|> Graph.map_node name (edit_node edits) |
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
121 |
| Update_Header _ => nodes); (* FIXME *) |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
122 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
123 |
fun put_node name node (Version nodes) = |
40481 | 124 |
Version (nodes |
125 |
|> Graph.default_node (name, empty_node) |
|
126 |
|> Graph.map_node name (K node)); |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
127 |
|
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
128 |
end; |
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset
|
129 |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
130 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
131 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
132 |
(** global state -- document structure and execution process **) |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
133 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
134 |
abstype state = State of |
40398 | 135 |
{versions: version Inttab.table, (*version_id -> document content*) |
38421
6cfc6fce7bfb
document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents:
38419
diff
changeset
|
136 |
commands: Toplevel.transition future Inttab.table, (*command_id -> transition (future parsing)*) |
40398 | 137 |
execs: (bool * Toplevel.state) lazy Inttab.table, (*exec_id -> execution process*) |
138 |
execution: unit future list} (*global execution process*) |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
139 |
with |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
140 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
141 |
fun make_state (versions, commands, execs, execution) = |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
142 |
State {versions = versions, commands = commands, execs = execs, execution = execution}; |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
143 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
144 |
fun map_state f (State {versions, commands, execs, execution}) = |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
145 |
make_state (f (versions, commands, execs, execution)); |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
146 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
147 |
val init_state = |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
148 |
make_state (Inttab.make [(no_id, empty_version)], |
38449 | 149 |
Inttab.make [(no_id, Future.value Toplevel.empty)], |
40398 | 150 |
Inttab.make [(no_id, Lazy.value (true, Toplevel.toplevel))], |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
151 |
[]); |
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 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
154 |
(* document versions *) |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
155 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
156 |
fun define_version (id: version_id) version = |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
157 |
map_state (fn (versions, commands, execs, execution) => |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
158 |
let val versions' = Inttab.update_new (id, version) versions |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
159 |
handle Inttab.DUP dup => err_dup "document version" dup |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
160 |
in (versions', commands, execs, execution) end); |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
161 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
162 |
fun the_version (State {versions, ...}) (id: version_id) = |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
163 |
(case Inttab.lookup versions id of |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
164 |
NONE => err_undef "document version" id |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
165 |
| SOME version => version); |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
166 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
167 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
168 |
(* commands *) |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
169 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
170 |
fun define_command (id: command_id) text = |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
171 |
map_state (fn (versions, commands, execs, execution) => |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
172 |
let |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
173 |
val id_string = print_id id; |
38421
6cfc6fce7bfb
document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents:
38419
diff
changeset
|
174 |
val tr = Future.fork_pri 2 (fn () => |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
175 |
Position.setmp_thread_data (Position.id_only id_string) |
38421
6cfc6fce7bfb
document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents:
38419
diff
changeset
|
176 |
(fn () => Outer_Syntax.prepare_command (Position.id id_string) text) ()); |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
177 |
val commands' = |
38421
6cfc6fce7bfb
document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents:
38419
diff
changeset
|
178 |
Inttab.update_new (id, tr) commands |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
179 |
handle Inttab.DUP dup => err_dup "command" dup; |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
180 |
in (versions, commands', execs, execution) end); |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
181 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
182 |
fun the_command (State {commands, ...}) (id: command_id) = |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
183 |
(case Inttab.lookup commands id of |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
184 |
NONE => err_undef "command" id |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
185 |
| SOME tr => tr); |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
186 |
|
38421
6cfc6fce7bfb
document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents:
38419
diff
changeset
|
187 |
fun join_commands (State {commands, ...}) = |
6cfc6fce7bfb
document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents:
38419
diff
changeset
|
188 |
Inttab.fold (fn (_, tr) => fn () => ignore (Future.join_result tr)) commands (); |
6cfc6fce7bfb
document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents:
38419
diff
changeset
|
189 |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
190 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
191 |
(* command executions *) |
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 |
fun define_exec (id: exec_id) exec = |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
194 |
map_state (fn (versions, commands, execs, execution) => |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
195 |
let val execs' = Inttab.update_new (id, exec) execs |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
196 |
handle Inttab.DUP dup => err_dup "command execution" dup |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
197 |
in (versions, commands, execs', execution) end); |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
198 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
199 |
fun the_exec (State {execs, ...}) (id: exec_id) = |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
200 |
(case Inttab.lookup execs id of |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
201 |
NONE => err_undef "command execution" id |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
202 |
| SOME exec => exec); |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
203 |
|
43668 | 204 |
fun get_theory state version_id pos name = |
205 |
let |
|
206 |
val last = get_last (get_node (the_version state version_id) name); |
|
207 |
val st = #2 (Lazy.force (the_exec state last)); |
|
208 |
in Toplevel.end_theory pos st end; |
|
209 |
||
41634
28d94383249c
cancel document execution before editing, to improve reactivity on systems with few cores;
wenzelm
parents:
41630
diff
changeset
|
210 |
|
28d94383249c
cancel document execution before editing, to improve reactivity on systems with few cores;
wenzelm
parents:
41630
diff
changeset
|
211 |
(* document execution *) |
28d94383249c
cancel document execution before editing, to improve reactivity on systems with few cores;
wenzelm
parents:
41630
diff
changeset
|
212 |
|
43666 | 213 |
fun cancel_execution (State {execution, ...}) = |
214 |
(List.app Future.cancel execution; |
|
215 |
fn () => ignore (Future.join_results execution)); |
|
41634
28d94383249c
cancel document execution before editing, to improve reactivity on systems with few cores;
wenzelm
parents:
41630
diff
changeset
|
216 |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
217 |
end; |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
218 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
219 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
220 |
|
38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
221 |
(* toplevel transactions *) |
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
222 |
|
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
223 |
local |
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
224 |
|
40391
b0dafbfc05b7
explicit "timing" status for toplevel transactions;
wenzelm
parents:
40390
diff
changeset
|
225 |
fun timing tr t = Toplevel.status tr (Markup.timing t); |
b0dafbfc05b7
explicit "timing" status for toplevel transactions;
wenzelm
parents:
40390
diff
changeset
|
226 |
|
38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
227 |
fun proof_status tr st = |
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
228 |
(case try Toplevel.proof_of st of |
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
229 |
SOME prf => Toplevel.status tr (Proof.status_markup prf) |
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
230 |
| NONE => ()); |
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
231 |
|
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
232 |
fun async_state tr st = |
40534
9e196062bf88
clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents:
40532
diff
changeset
|
233 |
ignore |
41673 | 234 |
(singleton |
41674 | 235 |
(Future.forks {name = "Document.async_state", |
44113 | 236 |
group = SOME (Task_Queue.new_group NONE), deps = [], pri = 0, interrupts = true}) |
40534
9e196062bf88
clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents:
40532
diff
changeset
|
237 |
(fn () => |
9e196062bf88
clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents:
40532
diff
changeset
|
238 |
Toplevel.setmp_thread_position tr |
9e196062bf88
clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents:
40532
diff
changeset
|
239 |
(fn () => Toplevel.print_state false st) ())); |
38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
240 |
|
40390 | 241 |
fun run int tr st = |
242 |
(case Toplevel.transition int tr st of |
|
243 |
SOME (st', NONE) => ([], SOME st') |
|
244 |
| SOME (_, SOME exn_info) => |
|
245 |
(case ML_Compiler.exn_messages (Runtime.EXCURSION_FAIL exn_info) of |
|
246 |
[] => Exn.interrupt () |
|
247 |
| errs => (errs, NONE)) |
|
248 |
| NONE => ([ML_Compiler.exn_message Runtime.TERMINATE], NONE)); |
|
249 |
||
38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
250 |
in |
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
251 |
|
41537
3837045cc8a1
full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents:
40534
diff
changeset
|
252 |
fun run_command thy_name raw_tr st = |
38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
253 |
(case |
41537
3837045cc8a1
full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents:
40534
diff
changeset
|
254 |
(case Toplevel.init_of raw_tr of |
3837045cc8a1
full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents:
40534
diff
changeset
|
255 |
SOME name => Exn.capture (fn () => |
3837045cc8a1
full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents:
40534
diff
changeset
|
256 |
let |
3837045cc8a1
full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents:
40534
diff
changeset
|
257 |
val path = Path.explode thy_name; |
3837045cc8a1
full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents:
40534
diff
changeset
|
258 |
val _ = Thy_Header.consistent_name (Path.implode (Path.base path)) name; |
3837045cc8a1
full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents:
40534
diff
changeset
|
259 |
in Toplevel.modify_master (SOME (Path.dir path)) raw_tr end) () |
43761
e72ba84ae58f
tuned signature -- corresponding to Scala version;
wenzelm
parents:
43722
diff
changeset
|
260 |
| NONE => Exn.Res raw_tr) of |
e72ba84ae58f
tuned signature -- corresponding to Scala version;
wenzelm
parents:
43722
diff
changeset
|
261 |
Exn.Res tr => |
38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
262 |
let |
40534
9e196062bf88
clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents:
40532
diff
changeset
|
263 |
val is_init = is_some (Toplevel.init_of tr); |
9e196062bf88
clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents:
40532
diff
changeset
|
264 |
val is_proof = Keyword.is_proof (Toplevel.name_of tr); |
9e196062bf88
clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents:
40532
diff
changeset
|
265 |
val do_print = not is_init andalso (Toplevel.print_of tr orelse is_proof); |
9e196062bf88
clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents:
40532
diff
changeset
|
266 |
|
42012
2c3fe3cbebae
structure Timing: covers former start_timing/end_timing and Output.timeit etc;
wenzelm
parents:
41674
diff
changeset
|
267 |
val start = Timing.start (); |
42328
61879dc97e72
more permissive run_command: identity execution for empty toplevel, e.g. after malformed theory header;
wenzelm
parents:
42012
diff
changeset
|
268 |
val (errs, result) = |
61879dc97e72
more permissive run_command: identity execution for empty toplevel, e.g. after malformed theory header;
wenzelm
parents:
42012
diff
changeset
|
269 |
if Toplevel.is_toplevel st andalso not is_init then ([], SOME st) |
61879dc97e72
more permissive run_command: identity execution for empty toplevel, e.g. after malformed theory header;
wenzelm
parents:
42012
diff
changeset
|
270 |
else run (is_init orelse is_proof) (Toplevel.set_print false tr) st; |
42012
2c3fe3cbebae
structure Timing: covers former start_timing/end_timing and Output.timeit etc;
wenzelm
parents:
41674
diff
changeset
|
271 |
val _ = timing tr (Timing.result start); |
38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
272 |
val _ = List.app (Toplevel.error_msg tr) errs; |
40398 | 273 |
val res = |
38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
274 |
(case result of |
40398 | 275 |
NONE => (Toplevel.status tr Markup.failed; (false, st)) |
38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
276 |
| SOME st' => |
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
277 |
(Toplevel.status tr Markup.finished; |
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
278 |
proof_status tr st'; |
40534
9e196062bf88
clarified interact/print state: proof commands are treated as in TTY mode to get full response;
wenzelm
parents:
40532
diff
changeset
|
279 |
if do_print then async_state tr st' else (); |
40398 | 280 |
(true, st'))); |
281 |
in res end |
|
38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
282 |
| Exn.Exn exn => |
39238
7189a138dd6c
refined Runtime.toplevel_error/Document.run_command: let interrupts pass unhindered;
wenzelm
parents:
39232
diff
changeset
|
283 |
if Exn.is_interrupt exn then reraise exn |
7189a138dd6c
refined Runtime.toplevel_error/Document.run_command: let interrupts pass unhindered;
wenzelm
parents:
39232
diff
changeset
|
284 |
else |
41537
3837045cc8a1
full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents:
40534
diff
changeset
|
285 |
(Toplevel.error_msg raw_tr (ML_Compiler.exn_message exn); |
3837045cc8a1
full theory path enables loading parents via master directory and keeps files strictly separate;
wenzelm
parents:
40534
diff
changeset
|
286 |
Toplevel.status raw_tr Markup.failed; |
40398 | 287 |
(false, Toplevel.toplevel))); |
38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
288 |
|
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
289 |
end; |
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
290 |
|
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
291 |
|
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
292 |
|
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset
|
293 |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
294 |
(** editing **) |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
295 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
296 |
(* edit *) |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
297 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
298 |
local |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
299 |
|
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
300 |
fun is_changed node' ((_, id), exec) = |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
301 |
(case try (the_entry node') id of |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
302 |
NONE => true |
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
303 |
| SOME exec' => exec' <> exec); |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
304 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
305 |
fun new_exec name (id: command_id) (exec_id, updates, state) = |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
306 |
let |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
307 |
val exec = the_exec state exec_id; |
38419 | 308 |
val exec_id' = new_id (); |
38449 | 309 |
val future_tr = the_command state id; |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
310 |
val exec' = |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
311 |
Lazy.lazy (fn () => |
40398 | 312 |
let |
313 |
val st = #2 (Lazy.force exec); |
|
314 |
val exec_tr = Toplevel.put_id (print_id exec_id') (Future.join future_tr); |
|
315 |
in run_command name exec_tr st end); |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
316 |
val state' = define_exec exec_id' exec' state; |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
317 |
in (exec_id', (id, exec_id') :: updates, state') end; |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
318 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
319 |
in |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
320 |
|
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset
|
321 |
fun edit (old_id: version_id) (new_id: version_id) edits state = |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
322 |
let |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
323 |
val old_version = the_version state old_id; |
41629
5490dc4d999d
workaround for odd x86_64 problem in Poly/ML 5.4.0 (actually SVN 1151?), which causes unexpected nontermination of Isabelle/Scala document editing;
wenzelm
parents:
41537
diff
changeset
|
324 |
val _ = Time.now (); (* FIXME odd workaround *) |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
325 |
val new_version = fold edit_nodes edits old_version; |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
326 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
327 |
fun update_node name (rev_updates, version, st) = |
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
328 |
let val node = get_node version name in |
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
329 |
(case first_entry NONE (is_changed (get_node old_version name)) node of |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
330 |
NONE => (rev_updates, version, st) |
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
331 |
| SOME ((prev, id), _) => |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
332 |
let |
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
333 |
val prev_exec = |
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
334 |
(case prev of |
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
335 |
NONE => no_id |
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
336 |
| SOME prev_id => the_default no_id (the_entry node prev_id)); |
43668 | 337 |
val (last, rev_upds, st') = |
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset
|
338 |
fold_entries (SOME id) (new_exec name o #2 o #1) node (prev_exec, [], st); |
43668 | 339 |
val node' = node |> fold update_entry rev_upds |> set_last last; |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
340 |
in (rev_upds @ rev_updates, put_node name node' version, st') end) |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
341 |
end; |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
342 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
343 |
(* FIXME proper node deps *) |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
344 |
val (rev_updates, new_version', state') = |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
345 |
fold update_node (node_names_of new_version) ([], new_version, state); |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
346 |
val state'' = define_version new_id new_version' state'; |
38421
6cfc6fce7bfb
document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents:
38419
diff
changeset
|
347 |
|
6cfc6fce7bfb
document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
wenzelm
parents:
38419
diff
changeset
|
348 |
val _ = join_commands state''; (* FIXME async!? *) |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
349 |
in (rev rev_updates, state'') end; |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
350 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
351 |
end; |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
352 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
353 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
354 |
(* execute *) |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
355 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
356 |
fun execute version_id state = |
41673 | 357 |
state |> map_state (fn (versions, commands, execs, _) => |
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
358 |
let |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
359 |
val version = the_version state version_id; |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
360 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
361 |
fun force_exec NONE = () |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
362 |
| force_exec (SOME exec_id) = ignore (Lazy.force (the_exec state exec_id)); |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
363 |
|
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
364 |
val execution' = (* FIXME proper node deps *) |
44113 | 365 |
Future.forks |
366 |
{name = "Document.execute", group = NONE, deps = [], pri = 1, interrupts = true} |
|
41673 | 367 |
[fn () => |
43666 | 368 |
node_names_of version |> List.app (fn name => |
369 |
fold_entries NONE (fn (_, exec) => fn () => force_exec exec) |
|
370 |
(get_node version name) ())]; |
|
40520
77a7b0a7d4b1
await_cancellation in the main thread, independently of the execution futures, which might get interrupted or be absent after node deletetion;
wenzelm
parents:
40481
diff
changeset
|
371 |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
372 |
in (versions, commands, execs, execution') end); |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
373 |
|
43713
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
374 |
|
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
375 |
|
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
376 |
(** global state **) |
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
377 |
|
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
378 |
val global_state = Synchronized.var "Document" init_state; |
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
379 |
|
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
380 |
fun state () = Synchronized.value global_state; |
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
381 |
val change_state = Synchronized.change global_state; |
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset
|
382 |
|
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
383 |
end; |
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset
|
384 |