| author | wenzelm | 
| Thu, 18 Aug 2011 15:37:01 +0200 | |
| changeset 44265 | b94951f06e48 | 
| parent 44247 | 270366301bd7 | 
| child 44270 | 3eaad39e520c | 
| 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: 
38414diff
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: 
38355diff
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: 
38355diff
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: 
38355diff
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: 
38355diff
changeset | 16 | val parse_id: string -> id | 
| 
af7f41a8a0a8
clarified "state" (accumulated data) vs. "exec" (execution that produces data);
 wenzelm parents: 
38355diff
changeset | 17 | val print_id: id -> string | 
| 44185 | 18 | type node_header = (string * string list * (string * bool) list) Exn.result | 
| 44157 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 wenzelm parents: 
44156diff
changeset | 19 | datatype node_edit = | 
| 44185 | 20 | Clear | | 
| 44157 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 wenzelm parents: 
44156diff
changeset | 21 | Edits of (command_id option * command_id option) list | | 
| 44182 | 22 | Header of node_header | 
| 44156 | 23 | type edit = string * node_edit | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 24 | type state | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 25 | val init_state: state | 
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 26 | val join_commands: state -> unit | 
| 43666 | 27 | val cancel_execution: state -> unit -> unit | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 28 | val define_command: command_id -> string -> state -> state | 
| 44157 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 wenzelm parents: 
44156diff
changeset | 29 | 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: 
38414diff
changeset | 30 | val execute: version_id -> state -> state | 
| 43713 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 31 | val state: unit -> state | 
| 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 32 | val change_state: (state -> state) -> unit | 
| 38150 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 33 | end; | 
| 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 34 | |
| 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 35 | structure Document: DOCUMENT = | 
| 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 36 | struct | 
| 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 37 | |
| 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 38 | (* unique identifiers *) | 
| 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 39 | |
| 38363 
af7f41a8a0a8
clarified "state" (accumulated data) vs. "exec" (execution that produces data);
 wenzelm parents: 
38355diff
changeset | 40 | type id = int; | 
| 38373 | 41 | type version_id = id; | 
| 38363 
af7f41a8a0a8
clarified "state" (accumulated data) vs. "exec" (execution that produces data);
 wenzelm parents: 
38355diff
changeset | 42 | type command_id = id; | 
| 38373 | 43 | 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: 
38150diff
changeset | 44 | |
| 
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: 
38150diff
changeset | 45 | val no_id = 0; | 
| 40449 | 46 | val new_id = Synchronized.counter (); | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 47 | |
| 38414 
49f1f657adc2
more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
 wenzelm parents: 
38373diff
changeset | 48 | val parse_id = Markup.parse_int; | 
| 
49f1f657adc2
more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
 wenzelm parents: 
38373diff
changeset | 49 | val print_id = Markup.print_int; | 
| 38150 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 50 | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 51 | fun err_dup kind id = error ("Duplicate " ^ kind ^ ": " ^ print_id id);
 | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 52 | 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 | 53 | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 54 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 55 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 56 | (** document structure **) | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 57 | |
| 44185 | 58 | type node_header = (string * string list * (string * bool) list) Exn.result; | 
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 59 | 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: 
38421diff
changeset | 60 | |
| 43668 | 61 | abstype node = Node of | 
| 44182 | 62 |  {header: node_header,
 | 
| 44180 | 63 | entries: exec_id option Entries.T, (*command entries with excecutions*) | 
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 64 | result: Toplevel.state lazy} | 
| 43668 | 65 | and version = Version of node Graph.T (*development graph wrt. static imports*) | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 66 | with | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 67 | |
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 68 | fun make_node (header, entries, result) = | 
| 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 69 |   Node {header = header, entries = entries, result = result};
 | 
| 43668 | 70 | |
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 71 | fun map_node f (Node {header, entries, result}) =
 | 
| 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 72 | make_node (f (header, entries, result)); | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 73 | |
| 44180 | 74 | fun get_header (Node {header, ...}) = header;
 | 
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 75 | fun set_header header = map_node (fn (_, entries, result) => (header, entries, result)); | 
| 44180 | 76 | |
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 77 | fun map_entries f (Node {header, entries, result}) = make_node (header, f entries, result);
 | 
| 43668 | 78 | fun fold_entries start f (Node {entries, ...}) = Entries.fold start f entries;
 | 
| 79 | fun first_entry start P (Node {entries, ...}) = Entries.get_first start P entries;
 | |
| 80 | ||
| 44200 | 81 | fun get_theory pos (Node {result, ...}) = Toplevel.end_theory pos (Lazy.get_finished result);
 | 
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 82 | fun set_result result = map_node (fn (header, entries, _) => (header, entries, result)); | 
| 44180 | 83 | |
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 84 | val empty_exec = Lazy.value Toplevel.toplevel; | 
| 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 85 | val empty_node = make_node (Exn.Exn (ERROR "Bad theory header"), Entries.empty, empty_exec); | 
| 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 86 | val clear_node = map_node (fn (header, _, _) => (header, Entries.empty, empty_exec)); | 
| 44185 | 87 | |
| 88 | fun get_node nodes name = Graph.get_node nodes name handle Graph.UNDEF _ => empty_node; | |
| 44202 | 89 | fun default_node name = Graph.default_node (name, empty_node); | 
| 90 | fun update_node name f = default_node name #> Graph.map_node name f; | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 91 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 92 | |
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 93 | (* node edits and associated executions *) | 
| 38150 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 94 | |
| 44157 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 wenzelm parents: 
44156diff
changeset | 95 | datatype node_edit = | 
| 44185 | 96 | Clear | | 
| 44157 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 wenzelm parents: 
44156diff
changeset | 97 | Edits of (command_id option * command_id option) list | | 
| 44182 | 98 | Header of node_header; | 
| 44157 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 wenzelm parents: 
44156diff
changeset | 99 | |
| 44156 | 100 | type edit = string * node_edit; | 
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 101 | |
| 43668 | 102 | fun the_entry (Node {entries, ...}) id =
 | 
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 103 | (case Entries.lookup entries id of | 
| 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 104 | NONE => err_undef "command entry" id | 
| 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 105 | | SOME entry => entry); | 
| 38150 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 106 | |
| 43668 | 107 | fun update_entry (id, exec_id) = | 
| 108 | map_entries (Entries.update (id, SOME exec_id)); | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 109 | |
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 110 | fun reset_after id entries = | 
| 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 111 | (case Entries.get_after entries id of | 
| 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 112 | NONE => entries | 
| 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 113 | | SOME next => Entries.update (next, NONE) entries); | 
| 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 114 | |
| 43668 | 115 | val edit_node = map_entries o fold | 
| 116 | (fn (id, SOME id2) => Entries.insert_after id (id2, NONE) | |
| 117 | | (id, NONE) => Entries.delete_after id #> reset_after id); | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 118 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 119 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 120 | (* version operations *) | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 121 | |
| 44185 | 122 | val empty_version = Version Graph.empty; | 
| 123 | ||
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 124 | fun nodes_of (Version nodes) = nodes; | 
| 44185 | 125 | val node_of = get_node o nodes_of; | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 126 | |
| 44185 | 127 | fun cycle_msg names = "Cyclic dependency of " ^ space_implode " via " (map quote names); | 
| 44180 | 128 | |
| 44202 | 129 | fun touch_descendants name nodes = | 
| 130 | fold (fn desc => desc <> name ? update_node desc (map_entries (reset_after NONE))) | |
| 131 | (Graph.all_succs nodes [name]) nodes; | |
| 132 | ||
| 44157 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 wenzelm parents: 
44156diff
changeset | 133 | fun edit_nodes (name, node_edit) (Version nodes) = | 
| 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 wenzelm parents: 
44156diff
changeset | 134 | Version | 
| 44202 | 135 | (touch_descendants name | 
| 136 | (case node_edit of | |
| 137 | Clear => update_node name clear_node nodes | |
| 138 | | Edits edits => | |
| 139 | nodes | |
| 140 | |> update_node name (edit_node edits) | |
| 141 | | Header header => | |
| 142 | let | |
| 44222 
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
 wenzelm parents: 
44202diff
changeset | 143 | val parents = (case header of Exn.Res (_, parents, _) => parents | _ => []); | 
| 44223 
cac52579f2c2
more robust treatment of node dependencies in incremental edits;
 wenzelm parents: 
44222diff
changeset | 144 | val nodes1 = nodes | 
| 
cac52579f2c2
more robust treatment of node dependencies in incremental edits;
 wenzelm parents: 
44222diff
changeset | 145 | |> default_node name | 
| 
cac52579f2c2
more robust treatment of node dependencies in incremental edits;
 wenzelm parents: 
44222diff
changeset | 146 | |> fold default_node parents; | 
| 
cac52579f2c2
more robust treatment of node dependencies in incremental edits;
 wenzelm parents: 
44222diff
changeset | 147 | val nodes2 = nodes1 | 
| 
cac52579f2c2
more robust treatment of node dependencies in incremental edits;
 wenzelm parents: 
44222diff
changeset | 148 | |> fold (fn dep => Graph.del_edge (dep, name)) (Graph.imm_preds nodes1 name); | 
| 44222 
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
 wenzelm parents: 
44202diff
changeset | 149 | val (header', nodes3) = | 
| 
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
 wenzelm parents: 
44202diff
changeset | 150 | (header, Graph.add_deps_acyclic (name, parents) nodes2) | 
| 
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
 wenzelm parents: 
44202diff
changeset | 151 | handle Graph.CYCLES cs => (Exn.Exn (ERROR (cat_lines (map cycle_msg cs))), nodes2); | 
| 
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
 wenzelm parents: 
44202diff
changeset | 152 | in Graph.map_node name (set_header header') nodes3 end)); | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 153 | |
| 44222 
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
 wenzelm parents: 
44202diff
changeset | 154 | fun put_node (name, node) (Version nodes) = | 
| 
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
 wenzelm parents: 
44202diff
changeset | 155 | Version (update_node name (K node) nodes); | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 156 | |
| 38150 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 157 | end; | 
| 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: diff
changeset | 158 | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 159 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 160 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 161 | (** global state -- document structure and execution process **) | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 162 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 163 | abstype state = State of | 
| 40398 | 164 |  {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: 
38419diff
changeset | 165 | commands: Toplevel.transition future Inttab.table, (*command_id -> transition (future parsing)*) | 
| 44196 | 166 | execs: Toplevel.state lazy Inttab.table, (*exec_id -> execution process*) | 
| 40398 | 167 | execution: unit future list} (*global execution process*) | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 168 | with | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 169 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 170 | fun make_state (versions, commands, execs, execution) = | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 171 |   State {versions = versions, commands = commands, execs = execs, execution = execution};
 | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 172 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 173 | fun map_state f (State {versions, commands, execs, execution}) =
 | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 174 | make_state (f (versions, commands, execs, execution)); | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 175 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 176 | val init_state = | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 177 | make_state (Inttab.make [(no_id, empty_version)], | 
| 38449 | 178 | Inttab.make [(no_id, Future.value Toplevel.empty)], | 
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 179 | Inttab.make [(no_id, empty_exec)], | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 180 | []); | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 181 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 182 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 183 | (* document versions *) | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 184 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 185 | fun define_version (id: version_id) version = | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 186 | map_state (fn (versions, commands, execs, execution) => | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 187 | let val versions' = Inttab.update_new (id, version) versions | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 188 | handle Inttab.DUP dup => err_dup "document version" dup | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 189 | in (versions', commands, execs, execution) end); | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 190 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 191 | fun the_version (State {versions, ...}) (id: version_id) =
 | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 192 | (case Inttab.lookup versions id of | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 193 | NONE => err_undef "document version" id | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 194 | | SOME version => version); | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 195 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 196 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 197 | (* commands *) | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 198 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 199 | fun define_command (id: command_id) text = | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 200 | map_state (fn (versions, commands, execs, execution) => | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 201 | let | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 202 | 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: 
38419diff
changeset | 203 | val tr = Future.fork_pri 2 (fn () => | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 204 | 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: 
38419diff
changeset | 205 | (fn () => Outer_Syntax.prepare_command (Position.id id_string) text) ()); | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 206 | 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: 
38419diff
changeset | 207 | Inttab.update_new (id, tr) commands | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 208 | handle Inttab.DUP dup => err_dup "command" dup; | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 209 | in (versions, commands', execs, execution) end); | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 210 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 211 | fun the_command (State {commands, ...}) (id: command_id) =
 | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 212 | (case Inttab.lookup commands id of | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 213 | NONE => err_undef "command" id | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 214 | | SOME tr => tr); | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 215 | |
| 38421 
6cfc6fce7bfb
document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
 wenzelm parents: 
38419diff
changeset | 216 | 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: 
38419diff
changeset | 217 | 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: 
38419diff
changeset | 218 | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 219 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 220 | (* command executions *) | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 221 | |
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 222 | fun define_exec (exec_id, exec) = | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 223 | map_state (fn (versions, commands, execs, execution) => | 
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 224 | let val execs' = Inttab.update_new (exec_id, exec) execs | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 225 | handle Inttab.DUP dup => err_dup "command execution" dup | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 226 | in (versions, commands, execs', execution) end); | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 227 | |
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 228 | fun the_exec (State {execs, ...}) exec_id =
 | 
| 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 229 | (case Inttab.lookup execs exec_id of | 
| 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 230 | NONE => err_undef "command execution" exec_id | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 231 | | SOME exec => exec); | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 232 | |
| 41634 
28d94383249c
cancel document execution before editing, to improve reactivity on systems with few cores;
 wenzelm parents: 
41630diff
changeset | 233 | |
| 
28d94383249c
cancel document execution before editing, to improve reactivity on systems with few cores;
 wenzelm parents: 
41630diff
changeset | 234 | (* document execution *) | 
| 
28d94383249c
cancel document execution before editing, to improve reactivity on systems with few cores;
 wenzelm parents: 
41630diff
changeset | 235 | |
| 43666 | 236 | fun cancel_execution (State {execution, ...}) =
 | 
| 237 | (List.app Future.cancel execution; | |
| 238 | fn () => ignore (Future.join_results execution)); | |
| 41634 
28d94383249c
cancel document execution before editing, to improve reactivity on systems with few cores;
 wenzelm parents: 
41630diff
changeset | 239 | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 240 | end; | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 241 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 242 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 243 | |
| 38888 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 244 | (* toplevel transactions *) | 
| 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 245 | |
| 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 246 | local | 
| 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 247 | |
| 40391 
b0dafbfc05b7
explicit "timing" status for toplevel transactions;
 wenzelm parents: 
40390diff
changeset | 248 | fun timing tr t = Toplevel.status tr (Markup.timing t); | 
| 
b0dafbfc05b7
explicit "timing" status for toplevel transactions;
 wenzelm parents: 
40390diff
changeset | 249 | |
| 38888 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 250 | fun proof_status tr st = | 
| 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 251 | (case try Toplevel.proof_of st of | 
| 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 252 | SOME prf => Toplevel.status tr (Proof.status_markup prf) | 
| 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 253 | | NONE => ()); | 
| 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 254 | |
| 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 255 | 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: 
40532diff
changeset | 256 | ignore | 
| 41673 | 257 | (singleton | 
| 41674 | 258 |       (Future.forks {name = "Document.async_state",
 | 
| 44113 | 259 | 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: 
40532diff
changeset | 260 | (fn () => | 
| 
9e196062bf88
clarified interact/print state: proof commands are treated as in TTY mode to get full response;
 wenzelm parents: 
40532diff
changeset | 261 | Toplevel.setmp_thread_position tr | 
| 
9e196062bf88
clarified interact/print state: proof commands are treated as in TTY mode to get full response;
 wenzelm parents: 
40532diff
changeset | 262 | (fn () => Toplevel.print_state false st) ())); | 
| 38888 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 263 | |
| 40390 | 264 | fun run int tr st = | 
| 265 | (case Toplevel.transition int tr st of | |
| 266 | SOME (st', NONE) => ([], SOME st') | |
| 267 | | SOME (_, SOME exn_info) => | |
| 268 | (case ML_Compiler.exn_messages (Runtime.EXCURSION_FAIL exn_info) of | |
| 269 | [] => Exn.interrupt () | |
| 270 | | errs => (errs, NONE)) | |
| 271 | | NONE => ([ML_Compiler.exn_message Runtime.TERMINATE], NONE)); | |
| 272 | ||
| 38888 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 273 | in | 
| 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 274 | |
| 44199 
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
 wenzelm parents: 
44198diff
changeset | 275 | fun run_command tr st = | 
| 44185 | 276 | let | 
| 44199 
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
 wenzelm parents: 
44198diff
changeset | 277 | val is_init = Toplevel.is_init tr; | 
| 44185 | 278 | val is_proof = Keyword.is_proof (Toplevel.name_of tr); | 
| 279 | val do_print = not is_init andalso (Toplevel.print_of tr orelse is_proof); | |
| 280 | ||
| 281 | val start = Timing.start (); | |
| 282 | val (errs, result) = | |
| 283 | if Toplevel.is_toplevel st andalso not is_init then ([], SOME st) | |
| 284 | else run (is_init orelse is_proof) (Toplevel.set_print false tr) st; | |
| 285 | val _ = timing tr (Timing.result start); | |
| 286 | val _ = List.app (Toplevel.error_msg tr) errs; | |
| 287 | in | |
| 288 | (case result of | |
| 44196 | 289 | NONE => (Toplevel.status tr Markup.failed; st) | 
| 44185 | 290 | | SOME st' => | 
| 291 | (Toplevel.status tr Markup.finished; | |
| 292 | proof_status tr st'; | |
| 293 | if do_print then async_state tr st' else (); | |
| 44196 | 294 | st')) | 
| 44185 | 295 | end; | 
| 38888 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 296 | |
| 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 297 | end; | 
| 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 298 | |
| 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 299 | |
| 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 300 | |
| 
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
 wenzelm parents: 
38873diff
changeset | 301 | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 302 | (** editing **) | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 303 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 304 | (* edit *) | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 305 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 306 | local | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 307 | |
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 308 | fun is_changed node' ((_, id), exec) = | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 309 | (case try (the_entry node') id of | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 310 | NONE => true | 
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38421diff
changeset | 311 | | SOME exec' => exec' <> exec); | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 312 | |
| 44199 
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
 wenzelm parents: 
44198diff
changeset | 313 | fun new_exec (command_id, command) (assigns, execs, exec) = | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 314 | let | 
| 38419 | 315 | val exec_id' = new_id (); | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 316 | val exec' = | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 317 | Lazy.lazy (fn () => | 
| 40398 | 318 | let | 
| 44198 | 319 | val tr = Toplevel.put_id (print_id exec_id') (Future.get_finished command); | 
| 320 | val st = Lazy.get_finished exec; | |
| 44199 
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
 wenzelm parents: 
44198diff
changeset | 321 | in run_command tr st end); | 
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 322 | in ((command_id, exec_id') :: assigns, (exec_id', exec') :: execs, exec') end; | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 323 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 324 | in | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 325 | |
| 44157 
a21d3e1e64fd
uniform treatment of header edits as document edits;
 wenzelm parents: 
44156diff
changeset | 326 | fun edit (old_id: version_id) (new_id: version_id) edits state = | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 327 | let | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 328 | val old_version = the_version state old_id; | 
| 44180 | 329 | val _ = Time.now (); (* FIXME odd workaround for polyml-5.4.0/x86_64 *) | 
| 44222 
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
 wenzelm parents: 
44202diff
changeset | 330 | val new_version = fold edit_nodes edits old_version; | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 331 | |
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 332 | val updates = | 
| 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 333 | nodes_of new_version |> Graph.schedule | 
| 44199 
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
 wenzelm parents: 
44198diff
changeset | 334 | (fn deps => fn (name, node) => | 
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 335 | (case first_entry NONE (is_changed (node_of old_version name)) node of | 
| 44201 | 336 | NONE => Future.value (([], [], []), node) | 
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 337 | | SOME ((prev, id), _) => | 
| 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 338 | let | 
| 44199 
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
 wenzelm parents: 
44198diff
changeset | 339 | fun init () = | 
| 
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
 wenzelm parents: 
44198diff
changeset | 340 | let | 
| 
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
 wenzelm parents: 
44198diff
changeset | 341 | val (thy_name, imports, uses) = Exn.release (get_header node); | 
| 
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
 wenzelm parents: 
44198diff
changeset | 342 | (* FIXME provide files via Scala layer *) | 
| 44226 
1ea760da0f2d
workaround for Cygwin, to make it work in the important special case without extra files;
 wenzelm parents: 
44223diff
changeset | 343 | val (dir, files) = | 
| 
1ea760da0f2d
workaround for Cygwin, to make it work in the important special case without extra files;
 wenzelm parents: 
44223diff
changeset | 344 | if ML_System.platform_is_cygwin then (Path.current, []) | 
| 
1ea760da0f2d
workaround for Cygwin, to make it work in the important special case without extra files;
 wenzelm parents: 
44223diff
changeset | 345 | else (Path.dir (Path.explode name), map (apfst Path.explode) uses); | 
| 44199 
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
 wenzelm parents: 
44198diff
changeset | 346 | |
| 
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
 wenzelm parents: 
44198diff
changeset | 347 | val parents = | 
| 
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
 wenzelm parents: 
44198diff
changeset | 348 | imports |> map (fn import => | 
| 44222 
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
 wenzelm parents: 
44202diff
changeset | 349 | (case Thy_Info.lookup_theory import of | 
| 
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
 wenzelm parents: 
44202diff
changeset | 350 | SOME thy => thy | 
| 
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
 wenzelm parents: 
44202diff
changeset | 351 | | NONE => | 
| 
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
 wenzelm parents: 
44202diff
changeset | 352 | get_theory (Position.file_only import) | 
| 
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
 wenzelm parents: 
44202diff
changeset | 353 | (#2 (Future.join (the (AList.lookup (op =) deps import)))))); | 
| 44199 
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
 wenzelm parents: 
44198diff
changeset | 354 | in Thy_Load.begin_theory dir thy_name imports files parents end | 
| 
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
 wenzelm parents: 
44198diff
changeset | 355 | fun get_command id = | 
| 
e38885e3ea60
retrieve imports from document state, with fall-back on theory loader for preloaded theories;
 wenzelm parents: 
44198diff
changeset | 356 | (id, the_command state id |> Future.map (Toplevel.modify_init init)); | 
| 44201 | 357 | in | 
| 358 | singleton | |
| 359 |                   (Future.forks {name = "Document.edit", group = NONE,
 | |
| 360 | deps = map (Future.task_of o #2) deps, pri = 2, interrupts = false}) | |
| 361 | (fn () => | |
| 362 | let | |
| 363 | val prev_exec = | |
| 364 | (case prev of | |
| 365 | NONE => no_id | |
| 366 | | SOME prev_id => the_default no_id (the_entry node prev_id)); | |
| 367 | val (assigns, execs, result) = | |
| 368 | fold_entries (SOME id) (new_exec o get_command o #2 o #1) | |
| 369 | node ([], [], the_exec state prev_exec); | |
| 370 | val node' = node | |
| 371 | |> fold update_entry assigns | |
| 372 | |> set_result result; | |
| 373 | in ((assigns, execs, [(name, node')]), node') end) | |
| 374 | end)) | |
| 44247 | 375 | |> Future.join_results |> Par_Exn.release_all |> map #1; | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 376 | |
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 377 | val state' = state | 
| 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 378 | |> fold (fold define_exec o #2) updates | 
| 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 379 | |> define_version new_id (fold (fold put_node o #3) updates new_version); | 
| 38421 
6cfc6fce7bfb
document commands: maintain transition as future (wrt. potentially slow Outer_Syntax.prepare_command), refrain from second Toplevel.put_id;
 wenzelm parents: 
38419diff
changeset | 380 | |
| 44197 
458573968568
refined Document.edit: less stateful update via Graph.schedule;
 wenzelm parents: 
44196diff
changeset | 381 | in (maps #1 (rev updates), state') end; | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 382 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 383 | end; | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 384 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 385 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 386 | (* execute *) | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 387 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 388 | fun execute version_id state = | 
| 41673 | 389 | state |> map_state (fn (versions, commands, execs, _) => | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 390 | let | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 391 | val version = the_version state version_id; | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 392 | |
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 393 | fun force_exec NONE = () | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 394 | | force_exec (SOME exec_id) = ignore (Lazy.force (the_exec state exec_id)); | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 395 | |
| 44201 | 396 | val execution' = | 
| 397 | nodes_of version |> Graph.schedule | |
| 398 | (fn deps => fn (name, node) => | |
| 399 | singleton | |
| 400 | (Future.forks | |
| 401 |                 {name = "theory:" ^ name, group = NONE,
 | |
| 402 | deps = map (Future.task_of o #2) deps, | |
| 403 | pri = 1, interrupts = true}) | |
| 404 | (fold_entries NONE (fn (_, exec) => fn () => force_exec exec) node)); | |
| 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: 
40481diff
changeset | 405 | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 406 | in (versions, commands, execs, execution') end); | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 407 | |
| 43713 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 408 | |
| 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 409 | |
| 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 410 | (** global state **) | 
| 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 411 | |
| 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 412 | val global_state = Synchronized.var "Document" init_state; | 
| 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 413 | |
| 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 414 | fun state () = Synchronized.value global_state; | 
| 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 415 | val change_state = Synchronized.change global_state; | 
| 
1ba5331b4623
moved global state to structure Document (again);
 wenzelm parents: 
43668diff
changeset | 416 | |
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 417 | end; | 
| 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38414diff
changeset | 418 |