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