author  wenzelm 
Thu, 04 Jul 2013 23:51:47 +0200  
changeset 52527  dbac84eab3bc 
parent 52526  d234cb6b60e3 
child 52530  99dd8b4ef3fe 
permissions  rwrr 
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

1 
(* Title: Pure/PIDE/document.ML 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

2 
Author: Makarius 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

3 

67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

4 
Document as collection of named nodes, each consisting of an editable 
44478
4fdb1009a370
tuned signature  emphasize traditional read/eval/print terminology, which is still relevant here;
wenzelm
parents:
44476
diff
changeset

5 
list of commands, with asynchronous read/eval/print processes. 
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

6 
*) 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

7 

67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

8 
signature DOCUMENT = 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

9 
sig 
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 
48707
ba531af91148
simplified Document.Node.Header  internalized errors;
wenzelm
parents:
47633
diff
changeset

18 
type node_header = string * Thy_Header.header * string list 
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset

19 
datatype node_edit = 
48755
393a37003851
apply all text edits to each node, before determining the resulting doc_edits  allow several iterations to consolidate spans etc.;
wenzelm
parents:
48735
diff
changeset

20 
Clear  (* FIXME unused !? *) 
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset

21 
Edits of (command_id option * command_id option) list  
48707
ba531af91148
simplified Document.Node.Header  internalized errors;
wenzelm
parents:
47633
diff
changeset

22 
Deps of node_header  
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44384
diff
changeset

23 
Perspective of command_id list 
44156  24 
type edit = string * node_edit 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

25 
type state 
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

26 
val init_state: state 
44644
317e4962dd0f
clarified define_command: store name as structural information;
wenzelm
parents:
44643
diff
changeset

27 
val define_command: command_id > string > string > state > state 
47420
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

28 
val remove_versions: version_id list > state > state 
47343
b8aeab386414
less aggressive discontinue_execution before document update, to avoid unstable execs that need to be reassigned;
wenzelm
parents:
47342
diff
changeset

29 
val discontinue_execution: state > unit 
47404
e6e5750f1311
simplified Future.cancel/cancel_group (again)  running threads only;
wenzelm
parents:
47395
diff
changeset

30 
val cancel_execution: state > unit 
47420
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

31 
val start_execution: state > unit 
47628  32 
val timing: bool Unsynchronized.ref 
44481  33 
val update: version_id > version_id > edit list > state > 
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

34 
(command_id * exec_id list) list * state 
43713
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset

35 
val state: unit > state 
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset

36 
val change_state: (state > state) > unit 
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

37 
end; 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

38 

67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

39 
structure Document: DOCUMENT = 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

40 
struct 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

41 

67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

42 
(* unique identifiers *) 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

43 

38363
af7f41a8a0a8
clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents:
38355
diff
changeset

44 
type id = int; 
38373  45 
type version_id = id; 
38363
af7f41a8a0a8
clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents:
38355
diff
changeset

46 
type command_id = id; 
38373  47 
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

48 

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

49 
val no_id = 0; 
40449  50 
val new_id = Synchronized.counter (); 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

51 

38414
49f1f657adc2
more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents:
38373
diff
changeset

52 
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

53 
val print_id = Markup.print_int; 
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

54 

38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

55 
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

56 
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

57 

38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

58 

52526  59 
(* command execution *) 
60 

61 
type exec = exec_id * (Command.eval * Command.print list); (*eval/print process*) 

62 
val no_exec: exec = (no_id, (Command.no_eval, [])); 

63 

52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

64 
fun exec_ids_of ((exec_id, (_, prints)): exec) = exec_id :: map #exec_id prints; 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

65 

52526  66 
fun exec_result ((_, (eval, _)): exec) = Command.memo_result eval; 
67 

68 
fun exec_run ((_, (eval, prints)): exec) = 

69 
(Command.memo_eval eval; 

52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

70 
prints > List.app (fn {name, pri, print, ...} => 
52526  71 
Command.memo_fork {name = name, group = NONE, deps = [], pri = pri, interrupts = true} print)); 
72 

73 

38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

74 

9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

75 
(** document structure **) 
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

76 

48707
ba531af91148
simplified Document.Node.Header  internalized errors;
wenzelm
parents:
47633
diff
changeset

77 
type node_header = string * Thy_Header.header * string list; 
52526  78 
type perspective = Inttab.set * command_id option; 
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset

79 
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

80 

43668  81 
abstype node = Node of 
48707
ba531af91148
simplified Document.Node.Header  internalized errors;
wenzelm
parents:
47633
diff
changeset

82 
{header: node_header, (*master directory, theory header, errors*) 
52508  83 
perspective: perspective, (*visible commands, last visible command*) 
52526  84 
entries: exec option Entries.T * bool, (*command entries with excecutions, stable*) 
85 
result: Command.eval option} (*result of last execution*) 

50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset

86 
and version = Version of node String_Graph.T (*development graph wrt. static imports*) 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

87 
with 
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

88 

47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

89 
fun make_node (header, perspective, entries, result) = 
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

90 
Node {header = header, perspective = perspective, entries = entries, result = result}; 
43668  91 

47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

92 
fun map_node f (Node {header, perspective, entries, result}) = 
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

93 
make_node (f (header, perspective, entries, result)); 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

94 

44476
e8a87398f35d
propagate information about last command with exec state assignment through document model;
wenzelm
parents:
44446
diff
changeset

95 
fun make_perspective command_ids : perspective = 
52526  96 
(Inttab.make_set command_ids, try List.last command_ids); 
44441  97 

51294
0850d43cb355
discontinued obsolete header "files"  these are loaded explicitly after exploring dependencies;
wenzelm
parents:
51293
diff
changeset

98 
val no_header = ("", Thy_Header.make ("", Position.none) [] [], ["Bad theory header"]); 
44441  99 
val no_perspective = make_perspective []; 
44386
4048ca2658b7
some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents:
44385
diff
changeset

100 

49064
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

101 
val empty_node = make_node (no_header, no_perspective, (Entries.empty, true), NONE); 
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

102 
val clear_node = 
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

103 
map_node (fn (header, _, _, _) => (header, no_perspective, (Entries.empty, true), NONE)); 
44386
4048ca2658b7
some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents:
44385
diff
changeset

104 

4048ca2658b7
some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents:
44385
diff
changeset

105 

4048ca2658b7
some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents:
44385
diff
changeset

106 
(* basic components *) 
4048ca2658b7
some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents:
44385
diff
changeset

107 

48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset

108 
fun set_header header = 
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset

109 
map_node (fn (_, perspective, entries, result) => (header, perspective, entries, result)); 
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset

110 

48707
ba531af91148
simplified Document.Node.Header  internalized errors;
wenzelm
parents:
47633
diff
changeset

111 
fun get_header (Node {header = (master, header, errors), ...}) = 
ba531af91148
simplified Document.Node.Header  internalized errors;
wenzelm
parents:
47633
diff
changeset

112 
if null errors then (master, header) 
ba531af91148
simplified Document.Node.Header  internalized errors;
wenzelm
parents:
47633
diff
changeset

113 
else error (cat_lines errors); 
ba531af91148
simplified Document.Node.Header  internalized errors;
wenzelm
parents:
47633
diff
changeset

114 

48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset

115 
fun read_header node span = 
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset

116 
let 
51294
0850d43cb355
discontinued obsolete header "files"  these are loaded explicitly after exploring dependencies;
wenzelm
parents:
51293
diff
changeset

117 
val (dir, {name = (name, _), imports, keywords}) = get_header node; 
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset

118 
val {name = (_, pos), imports = imports', ...} = Thy_Header.read_tokens span; 
51294
0850d43cb355
discontinued obsolete header "files"  these are loaded explicitly after exploring dependencies;
wenzelm
parents:
51293
diff
changeset

119 
in (dir, Thy_Header.make (name, pos) (map #1 imports ~~ map #2 imports') keywords) end; 
44180  120 

44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44384
diff
changeset

121 
fun get_perspective (Node {perspective, ...}) = perspective; 
44441  122 
fun set_perspective ids = 
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

123 
map_node (fn (header, _, entries, result) => (header, make_perspective ids, entries, result)); 
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44384
diff
changeset

124 

52526  125 
val visible_commands = #1 o get_perspective; 
47345
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset

126 
val visible_last = #2 o get_perspective; 
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset

127 
val visible_node = is_some o visible_last 
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset

128 

44444
33a5616a7571
tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents:
44441
diff
changeset

129 
fun map_entries f = 
49064
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

130 
map_node (fn (header, perspective, (entries, stable), result) => 
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

131 
(header, perspective, (f entries, stable), result)); 
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

132 
fun get_entries (Node {entries = (entries, _), ...}) = entries; 
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

133 

bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

134 
fun entries_stable stable = 
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

135 
map_node (fn (header, perspective, (entries, _), result) => 
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

136 
(header, perspective, (entries, stable), result)); 
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

137 
fun stable_entries (Node {entries = (_, stable), ...}) = stable; 
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

138 

5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

139 
fun iterate_entries f = Entries.iterate NONE f o get_entries; 
49064
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

140 
fun iterate_entries_after start f (Node {entries = (entries, _), ...}) = 
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

141 
(case Entries.get_after entries start of 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

142 
NONE => I 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

143 
 SOME id => Entries.iterate (SOME id) f entries); 
43668  144 

47339
79bd24497ffd
tuned  NB: get_theory still needs to apply Lazy.force due to interrupt instabilities;
wenzelm
parents:
47336
diff
changeset

145 
fun get_result (Node {result, ...}) = result; 
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44384
diff
changeset

146 
fun set_result result = 
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

147 
map_node (fn (header, perspective, entries, _) => (header, perspective, entries, result)); 
44180  148 

50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset

149 
fun get_node nodes name = String_Graph.get_node nodes name 
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset

150 
handle String_Graph.UNDEF _ => empty_node; 
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset

151 
fun default_node name = String_Graph.default_node (name, empty_node); 
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset

152 
fun update_node name f = default_node name #> String_Graph.map_node name f; 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

153 

9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

154 

38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset

155 
(* node edits and associated executions *) 
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

156 

44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset

157 
datatype node_edit = 
44185  158 
Clear  
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset

159 
Edits of (command_id option * command_id option) list  
48707
ba531af91148
simplified Document.Node.Header  internalized errors;
wenzelm
parents:
47633
diff
changeset

160 
Deps of node_header  
44385
e7fdb008aa7d
propagate editor perspective through document model;
wenzelm
parents:
44384
diff
changeset

161 
Perspective of command_id list; 
44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset

162 

44156  163 
type edit = string * node_edit; 
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset

164 

49064
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

165 
val after_entry = Entries.get_after o get_entries; 
44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44478
diff
changeset

166 

49064
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

167 
fun lookup_entry node id = 
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

168 
(case Entries.lookup (get_entries node) id of 
44480
38c5b085fb1c
improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents:
44479
diff
changeset

169 
NONE => NONE 
38c5b085fb1c
improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents:
44479
diff
changeset

170 
 SOME (exec, _) => exec); 
38c5b085fb1c
improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents:
44479
diff
changeset

171 

49064
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

172 
fun the_entry node id = 
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

173 
(case Entries.lookup (get_entries node) id of 
38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset

174 
NONE => err_undef "command entry" id 
44476
e8a87398f35d
propagate information about last command with exec state assignment through document model;
wenzelm
parents:
44446
diff
changeset

175 
 SOME (exec, _) => exec); 
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

176 

52526  177 
fun the_default_entry node (SOME id) = (id, the_default no_exec (the_entry node id)) 
178 
 the_default_entry _ NONE = (no_id, no_exec); 

44476
e8a87398f35d
propagate information about last command with exec state assignment through document model;
wenzelm
parents:
44446
diff
changeset

179 

44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset

180 
fun update_entry id exec = 
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset

181 
map_entries (Entries.update (id, exec)); 
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset

182 

c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset

183 
fun reset_entry id node = 
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset

184 
if is_some (lookup_entry node id) then update_entry id NONE node else node; 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

185 

38448
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset

186 
fun reset_after id entries = 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset

187 
(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

188 
NONE => entries 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents:
38421
diff
changeset

189 
 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

190 

43668  191 
val edit_node = map_entries o fold 
192 
(fn (id, SOME id2) => Entries.insert_after id (id2, NONE) 

193 
 (id, NONE) => Entries.delete_after id #> reset_after id); 

38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

194 

9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

195 

9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

196 
(* version operations *) 
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

197 

50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset

198 
val empty_version = Version String_Graph.empty; 
44185  199 

38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

200 
fun nodes_of (Version nodes) = nodes; 
44185  201 
val node_of = get_node o nodes_of; 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

202 

44185  203 
fun cycle_msg names = "Cyclic dependency of " ^ space_implode " via " (map quote names); 
44180  204 

44157
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset

205 
fun edit_nodes (name, node_edit) (Version nodes) = 
a21d3e1e64fd
uniform treatment of header edits as document edits;
wenzelm
parents:
44156
diff
changeset

206 
Version 
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44435
diff
changeset

207 
(case node_edit of 
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

208 
Clear => update_node name clear_node nodes 
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

209 
 Edits edits => update_node name (edit_node edits) nodes 
48707
ba531af91148
simplified Document.Node.Header  internalized errors;
wenzelm
parents:
47633
diff
changeset

210 
 Deps (master, header, errors) => 
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44435
diff
changeset

211 
let 
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset

212 
val imports = map fst (#imports header); 
48707
ba531af91148
simplified Document.Node.Header  internalized errors;
wenzelm
parents:
47633
diff
changeset

213 
val errors1 = 
ba531af91148
simplified Document.Node.Header  internalized errors;
wenzelm
parents:
47633
diff
changeset

214 
(Thy_Header.define_keywords header; errors) 
ba531af91148
simplified Document.Node.Header  internalized errors;
wenzelm
parents:
47633
diff
changeset

215 
handle ERROR msg => errors @ [msg]; 
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44435
diff
changeset

216 
val nodes1 = nodes 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44435
diff
changeset

217 
> default_node name 
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset

218 
> fold default_node imports; 
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44435
diff
changeset

219 
val nodes2 = nodes1 
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset

220 
> String_Graph.Keys.fold 
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset

221 
(fn dep => String_Graph.del_edge (dep, name)) (String_Graph.imm_preds nodes1 name); 
48707
ba531af91148
simplified Document.Node.Header  internalized errors;
wenzelm
parents:
47633
diff
changeset

222 
val (nodes3, errors2) = 
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset

223 
(String_Graph.add_deps_acyclic (name, imports) nodes2, errors1) 
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset

224 
handle String_Graph.CYCLES cs => (nodes2, errors1 @ map cycle_msg cs); 
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset

225 
in String_Graph.map_node name (set_header (master, header, errors2)) nodes3 end 
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

226 
 Perspective perspective => update_node name (set_perspective perspective) nodes); 
44444
33a5616a7571
tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents:
44441
diff
changeset

227 

44222
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents:
44202
diff
changeset

228 
fun put_node (name, node) (Version nodes) = 
9d5ef6cd4ee1
use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents:
44202
diff
changeset

229 
Version (update_node name (K node) nodes); 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

230 

38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

231 
end; 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff
changeset

232 

38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

233 

9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

234 

47389
e8552cba702d
explicit checks stable_finished_theory/stable_command allow parallel asynchronous command transactions;
wenzelm
parents:
47388
diff
changeset

235 
(** main state  document structure and execution process **) 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

236 

9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

237 
abstype state = State of 
40398  238 
{versions: version Inttab.table, (*version_id > document content*) 
47335  239 
commands: (string * Token.T list lazy) Inttab.table, (*command_id > named span*) 
47343
b8aeab386414
less aggressive discontinue_execution before document update, to avoid unstable execs that need to be reassigned;
wenzelm
parents:
47342
diff
changeset

240 
execution: version_id * Future.group * bool Unsynchronized.ref} (*current execution process*) 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

241 
with 
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

242 

44674
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset

243 
fun make_state (versions, commands, execution) = 
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset

244 
State {versions = versions, commands = commands, execution = execution}; 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

245 

44674
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset

246 
fun map_state f (State {versions, commands, execution}) = 
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset

247 
make_state (f (versions, commands, execution)); 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

248 

9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

249 
val init_state = 
47343
b8aeab386414
less aggressive discontinue_execution before document update, to avoid unstable execs that need to be reassigned;
wenzelm
parents:
47342
diff
changeset

250 
make_state (Inttab.make [(no_id, empty_version)], Inttab.empty, 
b8aeab386414
less aggressive discontinue_execution before document update, to avoid unstable execs that need to be reassigned;
wenzelm
parents:
47342
diff
changeset

251 
(no_id, Future.new_group NONE, Unsynchronized.ref false)); 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

252 

47420
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

253 
fun execution_of (State {execution, ...}) = execution; 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

254 

38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

255 

9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

256 
(* document versions *) 
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

257 

9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

258 
fun define_version (id: version_id) version = 
47420
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

259 
map_state (fn (versions, commands, _) => 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

260 
let 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

261 
val versions' = Inttab.update_new (id, version) versions 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

262 
handle Inttab.DUP dup => err_dup "document version" dup; 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

263 
val execution' = (id, Future.new_group NONE, Unsynchronized.ref true); 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

264 
in (versions', commands, execution') end); 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

265 

9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

266 
fun the_version (State {versions, ...}) (id: version_id) = 
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

267 
(case Inttab.lookup versions id of 
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

268 
NONE => err_undef "document version" id 
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

269 
 SOME version => version); 
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

270 

44673  271 
fun delete_version (id: version_id) versions = Inttab.delete id versions 
272 
handle Inttab.UNDEF _ => err_undef "document version" id; 

273 

38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

274 

9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

275 
(* commands *) 
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

276 

44644
317e4962dd0f
clarified define_command: store name as structural information;
wenzelm
parents:
44643
diff
changeset

277 
fun define_command (id: command_id) name text = 
44674
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset

278 
map_state (fn (versions, commands, execution) => 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

279 
let 
47395
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents:
47389
diff
changeset

280 
val id_string = print_id id; 
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents:
47389
diff
changeset

281 
val span = Lazy.lazy (fn () => 
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents:
47389
diff
changeset

282 
Position.setmp_thread_data (Position.id_only id_string) 
51268
fcc4b89a600d
simplified Outer_Syntax.read_span: internalized Toplevel.is_ignored;
wenzelm
parents:
50862
diff
changeset

283 
(fn () => Thy_Syntax.parse_tokens (Keyword.get_lexicons ()) (Position.id id_string) text) 
fcc4b89a600d
simplified Outer_Syntax.read_span: internalized Toplevel.is_ignored;
wenzelm
parents:
50862
diff
changeset

284 
()); 
47395
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents:
47389
diff
changeset

285 
val _ = 
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents:
47389
diff
changeset

286 
Position.setmp_thread_data (Position.id_only id_string) 
50201
c26369c9eda6
Isabellespecific implementation of quasiabstract markup elements  back to module arrangement before d83797ef0d2d;
wenzelm
parents:
49906
diff
changeset

287 
(fn () => Output.status (Markup.markup_only Markup.accepted)) (); 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

288 
val commands' = 
46945  289 
Inttab.update_new (id, (name, span)) commands 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

290 
handle Inttab.DUP dup => err_dup "command" dup; 
44674
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset

291 
in (versions, commands', execution) end); 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

292 

9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

293 
fun the_command (State {commands, ...}) (id: command_id) = 
44660
90bab3febb6c
less agressive parsing of commands (priority ~1);
wenzelm
parents:
44645
diff
changeset

294 
(case Inttab.lookup commands id of 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

295 
NONE => err_undef "command" id 
44644
317e4962dd0f
clarified define_command: store name as structural information;
wenzelm
parents:
44643
diff
changeset

296 
 SOME command => command); 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

297 

47420
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

298 
end; 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

299 

47420
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

300 
fun remove_versions ids state = state > map_state (fn (versions, _, execution) => 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

301 
let 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

302 
val _ = member (op =) ids (#1 execution) andalso 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

303 
error ("Attempt to remove execution version " ^ print_id (#1 execution)); 
47343
b8aeab386414
less aggressive discontinue_execution before document update, to avoid unstable execs that need to be reassigned;
wenzelm
parents:
47342
diff
changeset

304 

47420
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

305 
val versions' = fold delete_version ids versions; 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

306 
val commands' = 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

307 
(versions', Inttab.empty) > 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

308 
Inttab.fold (fn (_, version) => nodes_of version > 
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset

309 
String_Graph.fold (fn (_, (node, _)) => node > 
47420
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

310 
iterate_entries (fn ((_, id), _) => 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

311 
SOME o Inttab.insert (K true) (id, the_command state id)))); 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

312 
in (versions', commands', execution) end); 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

313 

9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

314 

49064
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

315 
(* consolidated states *) 
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

316 

52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

317 
fun stable_goals exec_id = 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

318 
not (Par_Exn.is_interrupted (Future.join_results (Goal.peek_futures exec_id))); 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

319 

dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

320 
fun stable_eval ((exec_id, (eval, _)): exec) = 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

321 
stable_goals exec_id andalso Command.memo_stable eval; 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

322 

dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

323 
fun stable_print ({exec_id, print, ...}: Command.print) = 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

324 
stable_goals exec_id andalso Command.memo_stable print; 
49064
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

325 

bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

326 
fun finished_theory node = 
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

327 
(case Exn.capture (Command.memo_result o the) (get_result node) of 
52526  328 
Exn.Res {state = st, ...} => can (Toplevel.end_theory Position.none) st 
49064
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

329 
 _ => false); 
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

330 

bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

331 

38888
8248cda328de
moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents:
38873
diff
changeset

332 

47420
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

333 
(** document execution **) 
47389
e8552cba702d
explicit checks stable_finished_theory/stable_command allow parallel asynchronous command transactions;
wenzelm
parents:
47388
diff
changeset

334 

47420
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

335 
val discontinue_execution = execution_of #> (fn (_, _, running) => running := false); 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

336 
val cancel_execution = execution_of #> (fn (_, group, _) => Future.cancel_group group); 
49906  337 
val terminate_execution = execution_of #> (fn (_, group, _) => Future.terminate group); 
47345
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset

338 

47420
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

339 
fun start_execution state = 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

340 
let 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

341 
val (version_id, group, running) = execution_of state; 
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

342 
val _ = 
47633
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset

343 
(singleton o Future.forks) 
52508  344 
{name = "Document.execution", group = SOME group, deps = [], pri = ~2, interrupts = true} 
47633
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset

345 
(fn () => 
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset

346 
(OS.Process.sleep (seconds 0.02); 
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset

347 
nodes_of (the_version state version_id) > String_Graph.schedule 
47633
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset

348 
(fn deps => fn (name, node) => 
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset

349 
if not (visible_node node) andalso finished_theory node then 
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset

350 
Future.value () 
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset

351 
else 
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset

352 
(singleton o Future.forks) 
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset

353 
{name = "theory:" ^ name, group = SOME (Future.new_group (SOME group)), 
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset

354 
deps = map (Future.task_of o #2) deps, pri = ~2, interrupts = false} 
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset

355 
(fn () => 
52515  356 
iterate_entries (fn (_, opt_exec) => fn () => 
47633
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset

357 
(case opt_exec of 
52526  358 
SOME exec => if ! running then SOME (exec_run exec) else NONE 
47633
e5c5e73f3e30
improved interleaving of start_execution vs. cancel_execution of the next update;
wenzelm
parents:
47631
diff
changeset

359 
 NONE => NONE)) node ())))); 
47420
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

360 
in () end; 
47345
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset

361 

193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset

362 

47420
0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

363 

0dbe6c69eda2
just one dedicated execution per document version  NB: nonmonotonicity of cancel always requires fresh update;
wenzelm
parents:
47415
diff
changeset

364 
(** document update **) 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

365 

47628  366 
val timing = Unsynchronized.ref false; 
367 
fun timeit msg e = cond_timeit (! timing) msg e; 

368 

38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

369 
local 
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

370 

47335  371 
fun make_required nodes = 
372 
let 

373 
val all_visible = 

50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset

374 
String_Graph.fold (fn (a, (node, _)) => visible_node node ? cons a) nodes [] 
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset

375 
> String_Graph.all_preds nodes 
47345
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset

376 
> map (rpair ()) > Symtab.make; 
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset

377 

47335  378 
val required = 
47345
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset

379 
Symtab.fold (fn (a, ()) => 
50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset

380 
exists (Symtab.defined all_visible) (String_Graph.immediate_succs nodes a) ? 
47345
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset

381 
Symtab.update (a, ())) all_visible Symtab.empty; 
47335  382 
in Symtab.defined required end; 
383 

48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset

384 
fun init_theory deps node span = 
47335  385 
let 
49173
fa01a202399c
eliminated potentially confusing terminology of Scala "layer";
wenzelm
parents:
49064
diff
changeset

386 
(* FIXME provide files via Isabelle/Scala, not master_dir *) 
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset

387 
val (dir, header) = read_header node span; 
47335  388 
val master_dir = 
48735
35c47932584c
even more permissive approximation of master_dir, which is only required to access external resources ('uses' etc.);
wenzelm
parents:
48707
diff
changeset

389 
(case try Url.explode dir of 
35c47932584c
even more permissive approximation of master_dir, which is only required to access external resources ('uses' etc.);
wenzelm
parents:
48707
diff
changeset

390 
SOME (Url.File path) => path 
47335  391 
 _ => Path.current); 
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset

392 
val imports = #imports header; 
47335  393 
val parents = 
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset

394 
imports > map (fn (import, _) => 
47407  395 
(case Thy_Info.lookup_theory import of 
47335  396 
SOME thy => thy 
397 
 NONE => 

47339
79bd24497ffd
tuned  NB: get_theory still needs to apply Lazy.force due to interrupt instabilities;
wenzelm
parents:
47336
diff
changeset

398 
Toplevel.end_theory (Position.file_only import) 
52526  399 
(#state 
47407  400 
(Command.memo_result 
52526  401 
(the_default Command.no_eval 
402 
(get_result (snd (the (AList.lookup (op =) deps import))))))))); 

48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset

403 
val _ = Position.reports (map #2 imports ~~ map Theory.get_markup parents); 
47335  404 
in Thy_Load.begin_theory master_dir header parents end; 
405 

47407  406 
fun check_theory full name node = 
407 
is_some (Thy_Info.lookup_theory name) orelse 

48707
ba531af91148
simplified Document.Node.Header  internalized errors;
wenzelm
parents:
47633
diff
changeset

408 
can get_header node andalso (not full orelse is_some (get_result node)); 
47335  409 

44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

410 
fun last_common state last_visible node0 node = 
44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset

411 
let 
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

412 
fun update_flags prev (visible, initial) = 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

413 
let 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

414 
val visible' = visible andalso prev <> last_visible; 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

415 
val initial' = initial andalso 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

416 
(case prev of 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

417 
NONE => true 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

418 
 SOME id => not (Keyword.is_theory_begin (#1 (the_command state id)))); 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

419 
in (visible', initial') end; 
47630  420 
fun get_common ((prev, id), opt_exec) (same, (_, flags)) = 
421 
if same then 

422 
let 

423 
val flags' = update_flags prev flags; 

424 
val same' = 

425 
(case opt_exec of 

426 
NONE => false 

427 
 SOME (exec_id, exec) => 

428 
(case lookup_entry node0 id of 

429 
NONE => false 

52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

430 
 SOME (exec_id0, _) => exec_id = exec_id0 andalso stable_eval (exec_id, exec))); 
47630  431 
in SOME (same', (prev, flags')) end 
432 
else NONE; 

433 
val (same, (common, flags)) = 

434 
iterate_entries get_common node (true, (NONE, (true, true))); 

44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

435 
in 
47630  436 
if same then 
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

437 
let val last = Entries.get_after (get_entries node) common 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

438 
in (last, update_flags last flags) end 
47630  439 
else (common, flags) 
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

440 
end; 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

441 

52515  442 
fun new_exec state proper_init command_visible command_id' (execs, command_exec, init) = 
47407  443 
if not proper_init andalso is_none init then NONE 
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

444 
else 
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

445 
let 
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

446 
val (command_name, span) = the_command state command_id' > Lazy.force; 
52526  447 

52514  448 
fun illegal_init _ = error "Illegal theory header after end of theory"; 
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

449 
val (modify_init, init') = 
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

450 
if Keyword.is_theory_begin command_name then 
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset

451 
(Toplevel.modify_init (fn () => the_default illegal_init init span), NONE) 
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

452 
else (I, init); 
52526  453 

44660
90bab3febb6c
less agressive parsing of commands (priority ~1);
wenzelm
parents:
44645
diff
changeset

454 
val exec_id' = new_id (); 
52526  455 
val eval' = 
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

456 
Command.memo (fn () => 
52509  457 
let 
52526  458 
val eval_state = exec_result (snd command_exec); 
459 
val tr = 

460 
Position.setmp_thread_data (Position.id_only (print_id exec_id')) 

461 
(fn () => 

462 
Command.read span 

463 
> modify_init 

52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

464 
> Toplevel.put_id exec_id') (); 
52526  465 
in Command.eval span tr eval_state end); 
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

466 
val prints' = if command_visible then Command.print new_id command_name eval' else []; 
52526  467 
val command_exec' = (command_id', (exec_id', (eval', prints'))); 
44674
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset

468 
in SOME (command_exec' :: execs, command_exec', init') end; 
44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset

469 

52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

470 
fun update_prints state node command_id = 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

471 
(case the_entry node command_id of 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

472 
SOME (exec_id, (eval, prints)) => 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

473 
let 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

474 
val (command_name, _) = the_command state command_id; 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

475 
val new_prints = Command.print new_id command_name eval; 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

476 
val prints' = 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

477 
new_prints > map (fn new_print => 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

478 
(case find_first (fn {name, ...} => name = #name new_print) prints of 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

479 
SOME print => if stable_print print then print else new_print 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

480 
 NONE => new_print)); 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

481 
in 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

482 
if eq_list (op = o pairself #exec_id) (prints, prints') then NONE 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

483 
else SOME (command_id, (exec_id, (eval, prints'))) 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

484 
end 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

485 
 NONE => NONE); 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

486 

38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

487 
in 
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

488 

44481  489 
fun update (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

490 
let 
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

491 
val old_version = the_version state old_id; 
47628  492 
val new_version = timeit "Document.edit_nodes" (fn () => fold edit_nodes edits old_version); 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

493 

44544
da5f0af32c1b
more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents:
44483
diff
changeset

494 
val nodes = nodes_of new_version; 
da5f0af32c1b
more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents:
44483
diff
changeset

495 
val is_required = make_required nodes; 
da5f0af32c1b
more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents:
44483
diff
changeset

496 

47628  497 
val _ = timeit "Document.terminate_execution" (fn () => terminate_execution state); 
498 
val updated = timeit "Document.update" (fn () => 

50862
5fc8b83322f5
more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents:
50201
diff
changeset

499 
nodes > String_Graph.schedule 
44199
e38885e3ea60
retrieve imports from document state, with fallback on theory loader for preloaded theories;
wenzelm
parents:
44198
diff
changeset

500 
(fn deps => fn (name, node) => 
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

501 
(singleton o Future.forks) 
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

502 
{name = "Document.update", group = NONE, 
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

503 
deps = map (Future.task_of o #2) deps, pri = 0, interrupts = false} 
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

504 
(fn () => 
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

505 
let 
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

506 
val imports = map (apsnd Future.join) deps; 
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

507 
val changed_imports = exists (#4 o #1 o #2) imports; 
52514  508 
val node_required = is_required name; 
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

509 
in 
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

510 
if changed_imports orelse AList.defined (op =) edits name orelse 
49064
bd6cc0b911a1
maintain stable state of node entries from last round  bypass slightly different Thm.join_theory_proofs;
wenzelm
parents:
49061
diff
changeset

511 
not (stable_entries node) orelse not (finished_theory node) 
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

512 
then 
44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset

513 
let 
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

514 
val node0 = node_of old_version name; 
48927
ef462b5558eb
theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents:
48918
diff
changeset

515 
val init = init_theory imports node; 
47407  516 
val proper_init = 
517 
check_theory false name node andalso 

518 
forall (fn (name, (_, node)) => check_theory true name node) imports; 

47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

519 

52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

520 
val visible_commands = visible_commands node; 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

521 
val visible_command = Inttab.defined visible_commands; 
47345
193251980a73
more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents:
47344
diff
changeset

522 
val last_visible = visible_last node; 
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

523 

52514  524 
val (common, (still_visible, initial)) = 
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

525 
if changed_imports then (NONE, (true, true)) 
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

526 
else last_common state last_visible node0 node; 
44674
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset

527 
val common_command_exec = the_default_entry node common; 
44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44478
diff
changeset

528 

52526  529 
val (new_execs, (command_id', (_, (eval', _))), _) = 
44674
bad4f9158c80
discontinued global execs: store exec value directly within entries;
wenzelm
parents:
44673
diff
changeset

530 
([], common_command_exec, if initial then SOME init else NONE) > 
52514  531 
(still_visible orelse node_required) ? 
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

532 
iterate_entries_after common 
44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset

533 
(fn ((prev, id), _) => fn res => 
52514  534 
if not node_required andalso prev = last_visible then NONE 
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

535 
else new_exec state proper_init (visible_command id) id res) node; 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

536 

dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

537 
val updated_execs = 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

538 
(visible_commands, new_execs) > Inttab.fold (fn (id, ()) => 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

539 
if exists (fn (_, (id', _)) => id = id') new_execs then I 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

540 
else append (the_list (update_prints state node id))); 
44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44478
diff
changeset

541 

44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset

542 
val no_execs = 
44645
5938beb84adc
more precise iterate_entries_after if start refers to last entry;
wenzelm
parents:
44644
diff
changeset

543 
iterate_entries_after common 
44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset

544 
(fn ((_, id0), exec0) => fn res => 
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset

545 
if is_none exec0 then NONE 
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

546 
else if exists (fn (_, (id, _)) => id0 = id) updated_execs 
52526  547 
then SOME res 
44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset

548 
else SOME (id0 :: res)) node0 []; 
44480
38c5b085fb1c
improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents:
44479
diff
changeset

549 

47405  550 
val last_exec = if command_id' = no_id then NONE else SOME command_id'; 
44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset

551 
val result = 
47407  552 
if is_some (after_entry node last_exec) then NONE 
52526  553 
else SOME eval'; 
44480
38c5b085fb1c
improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents:
44479
diff
changeset

554 

44482
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset

555 
val node' = node 
c7225307acf2
further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents:
44481
diff
changeset

556 
> fold reset_entry no_execs 
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

557 
> fold (fn (id, exec) => update_entry id (SOME exec)) updated_execs 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

558 
> entries_stable (null updated_execs) 
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

559 
> set_result result; 
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

560 
val updated_node = 
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

561 
if null no_execs andalso null updated_execs then NONE 
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

562 
else SOME (name, node'); 
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

563 
val changed_result = not (null no_execs) orelse not (null new_execs); 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

564 
in ((no_execs, updated_execs, updated_node, changed_result), node') end 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

565 
else (([], [], NONE, false), node) 
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

566 
end)) 
47628  567 
> Future.joins > map #1); 
44476
e8a87398f35d
propagate information about last command with exec state assignment through document model;
wenzelm
parents:
44446
diff
changeset

568 

44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44478
diff
changeset

569 
val command_execs = 
52527
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

570 
map (rpair []) (maps #1 updated) @ 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
wenzelm
parents:
52526
diff
changeset

571 
map (fn (command_id, exec) => (command_id, exec_ids_of exec)) (maps #2 updated); 
47406
8818f54773cc
dynamic propagation of node "updated" status, which is required to propagate edits and reassigments and allow direct memo_result;
wenzelm
parents:
47405
diff
changeset

572 
val updated_nodes = map_filter #3 updated; 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

573 

44197
458573968568
refined Document.edit: less stateful update via Graph.schedule;
wenzelm
parents:
44196
diff
changeset

574 
val state' = state 
44476
e8a87398f35d
propagate information about last command with exec state assignment through document model;
wenzelm
parents:
44446
diff
changeset

575 
> define_version new_id (fold put_node updated_nodes new_version); 
47388
fe4b245af74c
discontinued obsolete last_execs (cf. cd3ab7625519);
wenzelm
parents:
47347
diff
changeset

576 
in (command_execs, state') end; 
38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

577 

9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

578 
end; 
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

579 

9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

580 

43713
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset

581 

1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset

582 
(** global state **) 
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset

583 

52508  584 
val global_state = Synchronized.var "Document.global_state" init_state; 
43713
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset

585 

1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset

586 
fun state () = Synchronized.value global_state; 
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset

587 
val change_state = Synchronized.change global_state; 
1ba5331b4623
moved global state to structure Document (again);
wenzelm
parents:
43668
diff
changeset

588 

38418
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

589 
end; 
9a7af64d71bb
more explicit / functional ML version of document model;
wenzelm
parents:
38414
diff
changeset

590 