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