src/Pure/PIDE/document.ML
author wenzelm
Mon, 06 Apr 2015 16:00:19 +0200
changeset 59934 b65c4370f831
parent 59735 24bee1b11fce
child 60027 c42d65e11b6e
permissions -rw-r--r--
more position information and PIDE markup for command keywords;
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
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
     5
list of commands, associated with asynchronous execution process.
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     6
*)
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     7
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     8
signature DOCUMENT =
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     9
sig
52796
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
    10
  val timing: bool Unsynchronized.ref
59715
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
    11
  type node_header = {master: string, header: Thy_Header.header, errors: string list}
52862
930ce8eacb87 tuned signature -- more uniform treatment of overlays as command mapping;
wenzelm
parents: 52850
diff changeset
    12
  type overlay = Document_ID.command * (string * string list)
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
    13
  datatype node_edit =
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
    14
    Edits of (Document_ID.command option * Document_ID.command option) list |
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
    15
    Deps of node_header |
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    16
    Perspective of bool * Document_ID.command list * overlay list
44156
6aa25b80e1a5 explicit datatypes for document node edits;
wenzelm
parents: 44113
diff changeset
    17
  type edit = string * node_edit
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    18
  type state
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    19
  val init_state: state
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
    20
  val define_blob: string -> string -> state -> state
56458
a8d960baa5c2 simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents: 56447
diff changeset
    21
  type blob_digest = (string * string option) Exn.result
59685
c043306d2598 clarified markup for embedded files, early before execution;
wenzelm
parents: 59347
diff changeset
    22
  val define_command: Document_ID.command -> string -> blob_digest list -> int ->
59085
08a6901eb035 clarified define_command: send tokens more directly, without requiring keywords in ML;
wenzelm
parents: 59083
diff changeset
    23
    ((int * int) * string) list -> state -> state
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
    24
  val remove_versions: Document_ID.version list -> state -> state
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
    25
  val start_execution: state -> state
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
    26
  val update: Document_ID.version -> Document_ID.version -> edit list -> state ->
52655
3b2b1ef13979 more careful termination of removed execs, leaving running execs undisturbed;
wenzelm
parents: 52607
diff changeset
    27
    Document_ID.exec list * (Document_ID.command * Document_ID.exec list) list * state
43713
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
    28
  val state: unit -> state
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
    29
  val change_state: (state -> state) -> unit
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    30
end;
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    31
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    32
structure Document: DOCUMENT =
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    33
struct
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    34
52796
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
    35
val timing = Unsynchronized.ref false;
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
    36
fun timeit msg e = cond_timeit (! timing) msg e;
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
    37
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
    38
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
    39
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    40
(** document structure **)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    41
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
    42
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
    43
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
    44
59715
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
    45
type node_header =
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
    46
  {master: string, header: Thy_Header.header, errors: string list};
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    47
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    48
type perspective =
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    49
 {required: bool,  (*required node*)
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    50
  visible: Inttab.set,  (*visible commands*)
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    51
  visible_last: Document_ID.command option,  (*last visible command*)
57874
9c361f94b323 tuned comments;
wenzelm
parents: 57643
diff changeset
    52
  overlays: (string * string list) list Inttab.table};  (*command id -> print functions with args*)
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    53
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
    54
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
    55
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
    56
abstype node = Node of
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
    57
 {header: node_header,  (*master directory, theory header, errors*)
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
    58
  keywords: Keyword.keywords option,  (*outer syntax keywords*)
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    59
  perspective: perspective,  (*command perspective*)
52761
909167fdd367 discontinued notion of "stable" result -- running execution is never canceled;
wenzelm
parents: 52716
diff changeset
    60
  entries: Command.exec option Entries.T,  (*command entries with excecutions*)
52526
d234cb6b60e3 more Command.memo operations;
wenzelm
parents: 52523
diff changeset
    61
  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
    62
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
    63
with
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    64
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
    65
fun make_node (header, keywords, perspective, entries, result) =
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
    66
  Node {header = header, keywords = keywords, perspective = perspective,
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
    67
    entries = entries, result = result};
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
    68
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
    69
fun map_node f (Node {header, keywords, perspective, entries, result}) =
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
    70
  make_node (f (header, keywords, perspective, entries, result));
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    71
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    72
fun make_perspective (required, command_ids, overlays) : perspective =
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    73
 {required = required,
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    74
  visible = Inttab.make_set command_ids,
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    75
  visible_last = try List.last command_ids,
52862
930ce8eacb87 tuned signature -- more uniform treatment of overlays as command mapping;
wenzelm
parents: 52850
diff changeset
    76
  overlays = Inttab.make_list overlays};
44441
fe95e4306b4b misc tuning and simplification;
wenzelm
parents: 44440
diff changeset
    77
59715
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
    78
val no_header: node_header =
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
    79
  {master = "", header = Thy_Header.make ("", Position.none) [] [], errors = []};
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
    80
val no_perspective = make_perspective (false, [], []);
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    81
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
    82
val empty_node = make_node (no_header, NONE, no_perspective, Entries.empty, NONE);
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    83
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 56801
diff changeset
    84
fun is_no_perspective ({required, visible, visible_last, overlays}: perspective) =
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 56801
diff changeset
    85
  not required andalso
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 56801
diff changeset
    86
  Inttab.is_empty visible andalso
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 56801
diff changeset
    87
  is_none visible_last andalso
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 56801
diff changeset
    88
  Inttab.is_empty overlays;
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 56801
diff changeset
    89
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
    90
fun is_empty_node (Node {header, keywords, perspective, entries, result}) =
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 56801
diff changeset
    91
  header = no_header andalso
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
    92
  is_none keywords andalso
57615
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 56801
diff changeset
    93
  is_no_perspective perspective andalso
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 56801
diff changeset
    94
  Entries.is_empty entries andalso
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 56801
diff changeset
    95
  is_none result;
df1b3452d71c more explicit discrimination of empty nodes -- suppress from Theories panel;
wenzelm
parents: 56801
diff changeset
    96
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    97
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    98
(* basic components *)
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    99
59715
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   100
fun master_directory (Node {header = {master, ...}, ...}) =
54558
31844ca390ad more total master_directory -- NB: this is used outside command transactions (see also 92961f196d9e);
wenzelm
parents: 54526
diff changeset
   101
  (case try Url.explode master of
31844ca390ad more total master_directory -- NB: this is used outside command transactions (see also 92961f196d9e);
wenzelm
parents: 54526
diff changeset
   102
    SOME (Url.File path) => path
31844ca390ad more total master_directory -- NB: this is used outside command transactions (see also 92961f196d9e);
wenzelm
parents: 54526
diff changeset
   103
  | _ => Path.current);
31844ca390ad more total master_directory -- NB: this is used outside command transactions (see also 92961f196d9e);
wenzelm
parents: 54526
diff changeset
   104
59715
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   105
fun set_header master header errors =
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   106
  map_node (fn (_, keywords, perspective, entries, result) =>
59715
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   107
    ({master = master, header = header, errors = errors}, keywords, perspective, entries, result));
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   108
59715
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   109
fun get_header (Node {header, ...}) = header;
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
   110
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   111
fun set_keywords keywords =
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   112
  map_node (fn (header, _, perspective, entries, result) =>
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   113
    (header, keywords, perspective, entries, result));
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   114
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   115
fun get_keywords (Node {keywords, ...}) = keywords;
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   116
48927
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
   117
fun read_header node span =
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
   118
  let
59715
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   119
    val {header, errors, ...} = get_header node;
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   120
    val _ =
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   121
      if null errors then ()
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   122
      else
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   123
        cat_lines errors |>
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   124
        (case Position.get_id (Position.thread_data ()) of
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   125
          NONE => I
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   126
        | SOME id => Protocol_Message.command_positions_yxml id)
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   127
        |> error;
59934
b65c4370f831 more position information and PIDE markup for command keywords;
wenzelm
parents: 59735
diff changeset
   128
    val {name = (name, _), imports, ...} = header;
b65c4370f831 more position information and PIDE markup for command keywords;
wenzelm
parents: 59735
diff changeset
   129
    val {name = (_, pos), imports = imports', keywords} = Thy_Header.read_tokens span;
54526
92961f196d9e load files that are not provided by PIDE blobs;
wenzelm
parents: 54519
diff changeset
   130
  in Thy_Header.make (name, pos) (map #1 imports ~~ map #2 imports') keywords end;
92961f196d9e load files that are not provided by PIDE blobs;
wenzelm
parents: 54519
diff changeset
   131
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
   132
fun get_perspective (Node {perspective, ...}) = perspective;
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   133
52808
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   134
fun set_perspective args =
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   135
  map_node (fn (header, keywords, _, entries, result) =>
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   136
    (header, keywords, make_perspective args, entries, result));
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
   137
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
   138
val required_node = #required o get_perspective;
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
   139
val visible_command = Inttab.defined o #visible o get_perspective;
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
   140
val visible_last = #visible_last o get_perspective;
47345
193251980a73 more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents: 47344
diff changeset
   141
val visible_node = is_some o visible_last
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52849
diff changeset
   142
val overlays = Inttab.lookup_list o #overlays o get_perspective;
47345
193251980a73 more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents: 47344
diff changeset
   143
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   144
fun map_entries f =
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   145
  map_node (fn (header, keywords, perspective, entries, result) =>
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   146
    (header, keywords, perspective, f entries, result));
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   147
52761
909167fdd367 discontinued notion of "stable" result -- running execution is never canceled;
wenzelm
parents: 52716
diff changeset
   148
fun get_entries (Node {entries, ...}) = entries;
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   149
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   150
fun iterate_entries f = Entries.iterate NONE f o get_entries;
52761
909167fdd367 discontinued notion of "stable" result -- running execution is never canceled;
wenzelm
parents: 52716
diff changeset
   151
fun iterate_entries_after start f (Node {entries, ...}) =
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   152
  (case Entries.get_after entries start of
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   153
    NONE => I
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   154
  | SOME id => Entries.iterate (SOME id) f entries);
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   155
47339
79bd24497ffd tuned -- NB: get_theory still needs to apply Lazy.force due to interrupt instabilities;
wenzelm
parents: 47336
diff changeset
   156
fun get_result (Node {result, ...}) = result;
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   157
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
   158
fun set_result result =
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   159
  map_node (fn (header, keywords, perspective, entries, _) =>
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   160
    (header, keywords, perspective, entries, result));
44180
a6dc270d3edb maintain node header;
wenzelm
parents: 44160
diff changeset
   161
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   162
fun changed_result node node' =
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   163
  (case (get_result node, get_result node') of
52607
33a133d50616 clarified execution: maintain running execs only, check "stable" separately via memo (again);
wenzelm
parents: 52606
diff changeset
   164
    (SOME eval, SOME eval') => not (Command.eval_eq (eval, eval'))
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   165
  | (NONE, NONE) => false
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   166
  | _ => true);
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   167
52772
7764c90680f0 clarified conditions for node traversal;
wenzelm
parents: 52771
diff changeset
   168
fun pending_result node =
7764c90680f0 clarified conditions for node traversal;
wenzelm
parents: 52771
diff changeset
   169
  (case get_result node of
7764c90680f0 clarified conditions for node traversal;
wenzelm
parents: 52771
diff changeset
   170
    SOME eval => not (Command.eval_finished eval)
7764c90680f0 clarified conditions for node traversal;
wenzelm
parents: 52771
diff changeset
   171
  | NONE => false);
52533
a95440dcd59c clarified type Command.eval;
wenzelm
parents: 52532
diff changeset
   172
59198
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   173
fun finished_result node =
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   174
  (case get_result node of
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   175
    SOME eval => Command.eval_finished eval
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   176
  | NONE => false);
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   177
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   178
fun loaded_theory name =
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   179
  (case try (unsuffix ".thy") name of
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   180
    SOME a => get_first Thy_Info.lookup_theory [a, Long_Name.base_name a]
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   181
  | NONE => NONE);
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   182
50862
5fc8b83322f5 more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents: 50201
diff changeset
   183
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
   184
  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
   185
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
   186
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
   187
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   188
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   189
(* node edits and associated executions *)
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   190
52862
930ce8eacb87 tuned signature -- more uniform treatment of overlays as command mapping;
wenzelm
parents: 52850
diff changeset
   191
type overlay = Document_ID.command * (string * string list);
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
   192
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   193
datatype node_edit =
52530
99dd8b4ef3fe explicit module Document_ID as source of globally unique identifiers across ML/Scala;
wenzelm
parents: 52527
diff changeset
   194
  Edits of (Document_ID.command option * Document_ID.command option) list |
48707
ba531af91148 simplified Document.Node.Header -- internalized errors;
wenzelm
parents: 47633
diff changeset
   195
  Deps of node_header |
52849
199e9fa5a5c2 maintain overlays within node perspective;
wenzelm
parents: 52810
diff changeset
   196
  Perspective of bool * Document_ID.command list * overlay list;
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   197
44156
6aa25b80e1a5 explicit datatypes for document node edits;
wenzelm
parents: 44113
diff changeset
   198
type edit = string * node_edit;
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   199
49064
bd6cc0b911a1 maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents: 49061
diff changeset
   200
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
   201
49064
bd6cc0b911a1 maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents: 49061
diff changeset
   202
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
   203
  (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
   204
    NONE => NONE
38c5b085fb1c improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents: 44479
diff changeset
   205
  | SOME (exec, _) => exec);
38c5b085fb1c improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents: 44479
diff changeset
   206
49064
bd6cc0b911a1 maintain stable state of node entries from last round -- bypass slightly different Thm.join_theory_proofs;
wenzelm
parents: 49061
diff changeset
   207
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
   208
  (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
   209
    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
   210
  | SOME (exec, _) => exec);
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   211
52532
c81d76f7f63d tuned signature;
wenzelm
parents: 52530
diff changeset
   212
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
   213
  | 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
   214
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   215
fun assign_entry (command_id, exec) node =
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   216
  if is_none (Entries.lookup (get_entries node) command_id) then node
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   217
  else map_entries (Entries.update (command_id, exec)) node;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   218
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   219
fun reset_after id entries =
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   220
  (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
   221
    NONE => entries
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   222
  | 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
   223
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   224
val edit_node = map_entries o fold
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   225
  (fn (id, SOME id2) => Entries.insert_after id (id2, NONE)
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   226
    | (id, NONE) => Entries.delete_after id #> reset_after id);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   227
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   228
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   229
(* version operations *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   230
50862
5fc8b83322f5 more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents: 50201
diff changeset
   231
val empty_version = Version String_Graph.empty;
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   232
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   233
fun nodes_of (Version nodes) = nodes;
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   234
val node_of = get_node o nodes_of;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   235
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   236
fun cycle_msg names = "Cyclic dependency of " ^ space_implode " via " (map quote names);
44180
a6dc270d3edb maintain node header;
wenzelm
parents: 44160
diff changeset
   237
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   238
fun edit_nodes (name, node_edit) (Version nodes) =
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   239
  Version
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   240
    (case node_edit of
54562
301a721af68b clarified node edits sent to prover -- Clear/Blob only required for text edits within editor;
wenzelm
parents: 54558
diff changeset
   241
      Edits edits => update_node name (edit_node edits) nodes
59715
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   242
    | Deps {master, header, errors} =>
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   243
        let
48927
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
   244
          val imports = map fst (#imports header);
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   245
          val nodes1 = nodes
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   246
            |> default_node name
48927
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
   247
            |> fold default_node imports;
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   248
          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
   249
            |> 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
   250
                (fn dep => String_Graph.del_edge (dep, name)) (String_Graph.imm_preds nodes1 name);
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   251
          val (nodes3, errors1) =
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   252
            (String_Graph.add_deps_acyclic (name, imports) nodes2, errors)
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   253
              handle String_Graph.CYCLES cs => (nodes2, errors @ map cycle_msg cs);
59715
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   254
        in String_Graph.map_node name (set_header master header errors1) 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
   255
    | 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
   256
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   257
fun update_keywords name nodes =
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   258
  nodes |> String_Graph.map_node name (fn node =>
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   259
    if is_empty_node node then node
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   260
    else
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   261
      let
59715
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   262
        val {master, header, errors} = get_header node;
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   263
        val imports_keywords = map_filter (get_keywords o get_node nodes o #1) (#imports header);
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   264
        val keywords =
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   265
          Library.foldl Keyword.merge_keywords (Session.get_keywords (), imports_keywords);
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   266
        val (keywords', errors') =
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   267
          (Keyword.add_keywords (#keywords header) keywords, errors)
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   268
            handle ERROR msg =>
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   269
              (keywords, if member (op =) errors msg then errors else errors @ [msg]);
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   270
      in
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   271
        node
59715
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   272
        |> set_header master header errors'
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   273
        |> set_keywords (SOME keywords')
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   274
      end);
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   275
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   276
fun edit_keywords edits (Version nodes) =
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   277
  Version
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   278
    (fold update_keywords
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   279
      (String_Graph.all_succs nodes (map_filter (fn (a, Deps _) => SOME a | _ => NONE) edits))
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   280
      nodes);
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   281
44222
9d5ef6cd4ee1 use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents: 44202
diff changeset
   282
fun put_node (name, node) (Version nodes) =
57616
50ab1db5c0fd avoid redundant data structure;
wenzelm
parents: 57615
diff changeset
   283
  let
50ab1db5c0fd avoid redundant data structure;
wenzelm
parents: 57615
diff changeset
   284
    val nodes1 = update_node name (K node) nodes;
50ab1db5c0fd avoid redundant data structure;
wenzelm
parents: 57615
diff changeset
   285
    val nodes2 =
50ab1db5c0fd avoid redundant data structure;
wenzelm
parents: 57615
diff changeset
   286
      if String_Graph.is_maximal nodes1 name andalso is_empty_node node
50ab1db5c0fd avoid redundant data structure;
wenzelm
parents: 57615
diff changeset
   287
      then String_Graph.del_node name nodes1
50ab1db5c0fd avoid redundant data structure;
wenzelm
parents: 57615
diff changeset
   288
      else nodes1;
50ab1db5c0fd avoid redundant data structure;
wenzelm
parents: 57615
diff changeset
   289
  in Version nodes2 end;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   290
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   291
end;
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   292
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   293
52595
76883c1e1c53 fully synchronized guard of running execution;
wenzelm
parents: 52588
diff changeset
   294
76883c1e1c53 fully synchronized guard of running execution;
wenzelm
parents: 52588
diff changeset
   295
(** main state -- document structure and execution process **)
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   296
56458
a8d960baa5c2 simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents: 56447
diff changeset
   297
type blob_digest = (string * string option) Exn.result;  (*file node name, raw digest*)
55798
985bd3a325ab tuned signature;
wenzelm
parents: 55788
diff changeset
   298
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   299
type execution =
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   300
 {version_id: Document_ID.version,  (*static version id*)
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   301
  execution_id: Document_ID.execution,  (*dynamic execution id*)
59193
59f1591a11cb eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents: 59086
diff changeset
   302
  delay_request: unit future};  (*pending event timer request*)
52604
ff2f0818aebc more explicit type Exec.context;
wenzelm
parents: 52602
diff changeset
   303
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   304
val no_execution: execution =
59193
59f1591a11cb eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents: 59086
diff changeset
   305
  {version_id = Document_ID.none,
59f1591a11cb eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents: 59086
diff changeset
   306
   execution_id = Document_ID.none,
59f1591a11cb eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents: 59086
diff changeset
   307
   delay_request = Future.value ()};
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   308
59193
59f1591a11cb eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents: 59086
diff changeset
   309
fun new_execution version_id delay_request : execution =
59f1591a11cb eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents: 59086
diff changeset
   310
  {version_id = version_id,
59f1591a11cb eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents: 59086
diff changeset
   311
   execution_id = Execution.start (),
59f1591a11cb eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents: 59086
diff changeset
   312
   delay_request = delay_request};
52604
ff2f0818aebc more explicit type Exec.context;
wenzelm
parents: 52602
diff changeset
   313
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   314
abstype state = State of
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   315
 {versions: version Inttab.table,  (*version id -> document content*)
55798
985bd3a325ab tuned signature;
wenzelm
parents: 55788
diff changeset
   316
  blobs: (SHA1.digest * string list) Symtab.table,  (*raw digest -> digest, lines*)
59689
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59687
diff changeset
   317
  commands: (string * blob_digest list * int * Token.T list lazy) Inttab.table,
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59687
diff changeset
   318
    (*command id -> name, inlined files, token index of files, command span*)
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   319
  execution: execution}  (*current execution process*)
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   320
with
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   321
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   322
fun make_state (versions, blobs, commands, execution) =
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   323
  State {versions = versions, blobs = blobs, commands = commands, execution = execution};
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   324
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   325
fun map_state f (State {versions, blobs, commands, execution}) =
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   326
  make_state (f (versions, blobs, commands, execution));
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   327
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   328
val init_state =
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   329
  make_state (Inttab.make [(Document_ID.none, empty_version)],
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   330
    Symtab.empty, Inttab.empty, no_execution);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   331
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   332
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   333
(* document versions *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   334
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   335
fun define_version version_id version =
59193
59f1591a11cb eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents: 59086
diff changeset
   336
  map_state (fn (versions, blobs, commands, {delay_request, ...}) =>
47420
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   337
    let
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   338
      val versions' = Inttab.update_new (version_id, version) versions
47420
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   339
        handle Inttab.DUP dup => err_dup "document version" dup;
59193
59f1591a11cb eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents: 59086
diff changeset
   340
      val execution' = new_execution version_id delay_request;
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   341
    in (versions', blobs, commands, execution') end);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   342
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   343
fun the_version (State {versions, ...}) version_id =
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   344
  (case Inttab.lookup versions version_id of
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   345
    NONE => err_undef "document version" version_id
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   346
  | SOME version => version);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   347
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   348
fun delete_version version_id versions =
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   349
  Inttab.delete version_id versions
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   350
    handle Inttab.UNDEF _ => err_undef "document version" version_id;
44673
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   351
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   352
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   353
(* inlined files *)
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   354
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   355
fun define_blob digest text =
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   356
  map_state (fn (versions, blobs, commands, execution) =>
57638
ed58e740a699 less authentic SHA1.digest: trust Scala side on blobs and avoid re-calculation via Foreign Language Interface, which might be a cause of problems;
wenzelm
parents: 57616
diff changeset
   357
    let val blobs' = Symtab.update (digest, (SHA1.fake digest, split_lines text)) blobs
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   358
    in (versions, blobs', commands, execution) end);
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   359
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   360
fun the_blob (State {blobs, ...}) digest =
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   361
  (case Symtab.lookup blobs digest of
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   362
    NONE => error ("Undefined blob: " ^ digest)
55788
67699e08e969 store blobs / inlined files as separate text lines: smaller values are more healthy for the Poly/ML RTS and allow implicit sharing;
wenzelm
parents: 54562
diff changeset
   363
  | SOME content => content);
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   364
56447
1e77ed11f2f7 separate file_node vs. file_path, e.g. relevant on Windows for hyperlink to the latter;
wenzelm
parents: 56208
diff changeset
   365
fun resolve_blob state (blob_digest: blob_digest) =
56458
a8d960baa5c2 simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents: 56447
diff changeset
   366
  blob_digest |> Exn.map_result (fn (file_node, raw_digest) =>
a8d960baa5c2 simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents: 56447
diff changeset
   367
    (file_node, Option.map (the_blob state) raw_digest));
56447
1e77ed11f2f7 separate file_node vs. file_path, e.g. relevant on Windows for hyperlink to the latter;
wenzelm
parents: 56208
diff changeset
   368
59685
c043306d2598 clarified markup for embedded files, early before execution;
wenzelm
parents: 59347
diff changeset
   369
fun blob_reports pos (blob_digest: blob_digest) =
c043306d2598 clarified markup for embedded files, early before execution;
wenzelm
parents: 59347
diff changeset
   370
  (case blob_digest of Exn.Res (file_node, _) => [(pos, Markup.path file_node)] | _ => []);
c043306d2598 clarified markup for embedded files, early before execution;
wenzelm
parents: 59347
diff changeset
   371
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   372
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   373
(* commands *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   374
59702
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59689
diff changeset
   375
fun define_command command_id name blobs_digests blobs_index toks =
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   376
  map_state (fn (versions, blobs, commands, execution) =>
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   377
    let
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   378
      val id = Document_ID.print command_id;
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   379
      val span =
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   380
        Lazy.lazy (fn () =>
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   381
          Position.setmp_thread_data (Position.id_only id)
59685
c043306d2598 clarified markup for embedded files, early before execution;
wenzelm
parents: 59347
diff changeset
   382
            (fn () =>
c043306d2598 clarified markup for embedded files, early before execution;
wenzelm
parents: 59347
diff changeset
   383
              let
c043306d2598 clarified markup for embedded files, early before execution;
wenzelm
parents: 59347
diff changeset
   384
                val (tokens, _) = fold_map Token.make toks (Position.id id);
c043306d2598 clarified markup for embedded files, early before execution;
wenzelm
parents: 59347
diff changeset
   385
                val _ =
59702
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59689
diff changeset
   386
                  if blobs_index < 0
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59689
diff changeset
   387
                  then (*inlined errors*)
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59689
diff changeset
   388
                    map_filter Exn.get_exn blobs_digests
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59689
diff changeset
   389
                    |> List.app (Output.error_message o Runtime.exn_message)
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59689
diff changeset
   390
                  else (*auxiliary files*)
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59689
diff changeset
   391
                    let val pos = Token.pos_of (nth tokens blobs_index) in
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59689
diff changeset
   392
                      Position.reports
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59689
diff changeset
   393
                        ((pos, Markup.language_path) :: maps (blob_reports pos) blobs_digests)
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59689
diff changeset
   394
                    end;
59685
c043306d2598 clarified markup for embedded files, early before execution;
wenzelm
parents: 59347
diff changeset
   395
              in tokens end) ());
c043306d2598 clarified markup for embedded files, early before execution;
wenzelm
parents: 59347
diff changeset
   396
      val commands' =
59702
58dfaa369c11 hybrid use of command blobs: inlined errors and auxiliary files;
wenzelm
parents: 59689
diff changeset
   397
        Inttab.update_new (command_id, (name, blobs_digests, blobs_index, span)) commands
59685
c043306d2598 clarified markup for embedded files, early before execution;
wenzelm
parents: 59347
diff changeset
   398
          handle Inttab.DUP dup => err_dup "command" dup;
47395
e6261a493f04 added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
wenzelm
parents: 47389
diff changeset
   399
      val _ =
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   400
        Position.setmp_thread_data (Position.id_only id)
50201
c26369c9eda6 Isabelle-specific implementation of quasi-abstract markup elements -- back to module arrangement before d83797ef0d2d;
wenzelm
parents: 49906
diff changeset
   401
          (fn () => Output.status (Markup.markup_only Markup.accepted)) ();
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   402
    in (versions, blobs, commands', execution) end);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   403
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   404
fun the_command (State {commands, ...}) command_id =
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   405
  (case Inttab.lookup commands command_id of
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   406
    NONE => err_undef "command" command_id
44644
317e4962dd0f clarified define_command: store name as structural information;
wenzelm
parents: 44643
diff changeset
   407
  | SOME command => command);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   408
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   409
val the_command_name = #1 oo the_command;
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   410
47420
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   411
end;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   412
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   413
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   414
(* remove_versions *)
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   415
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   416
fun remove_versions version_ids state = state |> map_state (fn (versions, _, _, execution) =>
47420
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   417
  let
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   418
    val _ =
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   419
      member (op =) version_ids (#version_id execution) andalso
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   420
        error ("Attempt to remove execution version " ^ Document_ID.print (#version_id 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
   421
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   422
    val versions' = fold delete_version version_ids versions;
47420
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   423
    val commands' =
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   424
      (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
   425
        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
   426
          String_Graph.fold (fn (_, (node, _)) => node |>
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   427
            iterate_entries (fn ((_, command_id), _) =>
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   428
              SOME o Inttab.insert (K true) (command_id, the_command state command_id))));
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   429
    val blobs' =
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   430
      (commands', Symtab.empty) |->
59689
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59687
diff changeset
   431
        Inttab.fold (fn (_, (_, blobs, _, _)) => blobs |>
56458
a8d960baa5c2 simplified blob again (amending 1e77ed11f2f7): only store file node name, i.e. the raw editor file name;
wenzelm
parents: 56447
diff changeset
   432
          fold (fn Exn.Res (_, SOME b) => Symtab.update (b, the_blob state b) | _ => I));
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   433
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   434
  in (versions', blobs', commands', execution) end);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   435
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   436
52604
ff2f0818aebc more explicit type Exec.context;
wenzelm
parents: 52602
diff changeset
   437
(* document execution *)
47389
e8552cba702d explicit checks stable_finished_theory/stable_command allow parallel asynchronous command transactions;
wenzelm
parents: 47388
diff changeset
   438
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   439
fun start_execution state = state |> map_state (fn (versions, blobs, commands, execution) =>
52796
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
   440
  timeit "Document.start_execution" (fn () =>
ad64ed8e6147 more timing;
wenzelm
parents: 52784
diff changeset
   441
    let
59193
59f1591a11cb eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents: 59086
diff changeset
   442
      val {version_id, execution_id, delay_request} = execution;
52798
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   443
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   444
      val delay = seconds (Options.default_real "editor_execution_delay");
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   445
52798
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   446
      val _ = Future.cancel delay_request;
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   447
      val delay_request' = Event_Timer.future (Time.+ (Time.now (), delay));
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   448
59198
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   449
      fun finished_import (name, (node, _)) =
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   450
        finished_result node orelse is_some (loaded_theory name);
59193
59f1591a11cb eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents: 59086
diff changeset
   451
      val _ =
52573
815461c835b9 tuned start_execution: avoid sleep on worker thread;
wenzelm
parents: 52570
diff changeset
   452
        nodes_of (the_version state version_id) |> String_Graph.schedule
815461c835b9 tuned start_execution: avoid sleep on worker thread;
wenzelm
parents: 52570
diff changeset
   453
          (fn deps => fn (name, node) =>
52772
7764c90680f0 clarified conditions for node traversal;
wenzelm
parents: 52771
diff changeset
   454
            if visible_node node orelse pending_result node then
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   455
              let
52775
e0169f13bd37 keep memo_exec execution running, which is important to cancel goal forks eventually;
wenzelm
parents: 52774
diff changeset
   456
                fun body () =
59347
2183c731f0a7 more explicit errors;
wenzelm
parents: 59198
diff changeset
   457
                  (if forall finished_import deps then
59198
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   458
                    iterate_entries (fn (_, opt_exec) => fn () =>
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   459
                      (case opt_exec of
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   460
                        SOME exec =>
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   461
                          if Execution.is_running execution_id
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   462
                          then SOME (Command.exec execution_id exec)
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   463
                          else NONE
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   464
                      | NONE => NONE)) node ()
59347
2183c731f0a7 more explicit errors;
wenzelm
parents: 59198
diff changeset
   465
                   else ())
2183c731f0a7 more explicit errors;
wenzelm
parents: 59198
diff changeset
   466
                   handle exn => (Output.system_message (Runtime.exn_message exn); reraise exn);
52774
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   467
                val future =
627fb639a2d9 maintain explicit execution frontier: avoid conflict with former task via static dependency;
wenzelm
parents: 52772
diff changeset
   468
                  (singleton o Future.forks)
59193
59f1591a11cb eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents: 59086
diff changeset
   469
                   {name = "theory:" ^ name,
59f1591a11cb eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents: 59086
diff changeset
   470
                    group = SOME (Future.new_group NONE),
59198
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   471
                    deps = Future.task_of delay_request' :: maps (the_list o #2 o #2) deps,
59193
59f1591a11cb eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents: 59086
diff changeset
   472
                    pri = 0, interrupts = false} body;
59198
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   473
              in (node, SOME (Future.task_of future)) end
c73933e07c03 clarified execution graph traversal: stable imports are required to proceed, e.g. relevant to avoid crash of init_theory after discontinued execution;
wenzelm
parents: 59193
diff changeset
   474
            else (node, NONE));
52798
9d3c9862d1dd recovered delay for Document.start_execution (see also 627fb639a2d9), which potentially improves throughput when many consecutive edits arrive;
wenzelm
parents: 52797
diff changeset
   475
      val execution' =
59193
59f1591a11cb eliminated Document.execution frontier (again, see 627fb639a2d9): just run into older execution, potentially stalling worker thread, but without global delay due to long-running tasks (notably sledgehammer);
wenzelm
parents: 59086
diff changeset
   476
        {version_id = version_id, execution_id = execution_id, delay_request = delay_request'};
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   477
    in (versions, blobs, commands, execution') end));
47345
193251980a73 more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents: 47344
diff changeset
   478
193251980a73 more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents: 47344
diff changeset
   479
47420
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   480
0dbe6c69eda2 just one dedicated execution per document version -- NB: non-monotonicity of cancel always requires fresh update;
wenzelm
parents: 47415
diff changeset
   481
(** document update **)
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   482
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   483
(* exec state assignment *)
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   484
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   485
type assign_update = Command.exec option Inttab.table;  (*command id -> exec*)
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   486
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   487
val assign_update_empty: assign_update = Inttab.empty;
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   488
fun assign_update_defined (tab: assign_update) command_id = Inttab.defined tab command_id;
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   489
fun assign_update_apply (tab: assign_update) node = Inttab.fold assign_entry tab node;
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   490
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   491
fun assign_update_new upd (tab: assign_update) =
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   492
  Inttab.update_new upd tab
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   493
    handle Inttab.DUP dup => err_dup "exec state assignment" dup;
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   494
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   495
fun assign_update_result (tab: assign_update) =
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   496
  Inttab.fold (fn (command_id, exec) => cons (command_id, Command.exec_ids exec)) tab [];
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   497
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   498
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   499
(* update *)
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   500
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   501
local
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   502
47335
wenzelm
parents: 47051
diff changeset
   503
fun make_required nodes =
wenzelm
parents: 47051
diff changeset
   504
  let
52808
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   505
    fun all_preds P =
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   506
      String_Graph.fold (fn (a, (node, _)) => P node ? cons a) nodes []
50862
5fc8b83322f5 more sensible order of theory nodes (correspondance to Scala version), e.g. relevant to theory progress;
wenzelm
parents: 50201
diff changeset
   507
      |> String_Graph.all_preds nodes
52808
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   508
      |> Symtab.make_set;
47345
193251980a73 more scalable execute/update: avoid redundant traversal of invisible/finished nodes;
wenzelm
parents: 47344
diff changeset
   509
52808
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   510
    val all_visible = all_preds visible_node;
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   511
    val all_required = all_preds required_node;
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   512
  in
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   513
    Symtab.fold (fn (a, ()) =>
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   514
      exists (Symtab.defined all_visible) (String_Graph.immediate_succs nodes a) ?
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   515
        Symtab.update (a, ())) all_visible all_required
143f225e50f5 allow explicit indication of required node: full eval, no prints;
wenzelm
parents: 52798
diff changeset
   516
  end;
47335
wenzelm
parents: 47051
diff changeset
   517
48927
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
   518
fun init_theory deps node span =
47335
wenzelm
parents: 47051
diff changeset
   519
  let
54526
92961f196d9e load files that are not provided by PIDE blobs;
wenzelm
parents: 54519
diff changeset
   520
    val master_dir = master_directory node;
92961f196d9e load files that are not provided by PIDE blobs;
wenzelm
parents: 54519
diff changeset
   521
    val header = read_header node span;
48927
ef462b5558eb theory def/ref position reports, which enable hyperlinks etc.;
wenzelm
parents: 48918
diff changeset
   522
    val imports = #imports header;
59716
8c56b34a88b0 more precises positions;
wenzelm
parents: 59715
diff changeset
   523
8c56b34a88b0 more precises positions;
wenzelm
parents: 59715
diff changeset
   524
    fun maybe_end_theory pos st =
8c56b34a88b0 more precises positions;
wenzelm
parents: 59715
diff changeset
   525
      SOME (Toplevel.end_theory pos st)
8c56b34a88b0 more precises positions;
wenzelm
parents: 59715
diff changeset
   526
        handle ERROR msg => (Output.error_message msg; NONE);
8c56b34a88b0 more precises positions;
wenzelm
parents: 59715
diff changeset
   527
    val parents_reports =
8c56b34a88b0 more precises positions;
wenzelm
parents: 59715
diff changeset
   528
      imports |> map_filter (fn (import, pos) =>
54516
2a7f9e79cb28 proper theory name vs. node name;
wenzelm
parents: 54509
diff changeset
   529
        (case loaded_theory import of
59716
8c56b34a88b0 more precises positions;
wenzelm
parents: 59715
diff changeset
   530
          NONE =>
8c56b34a88b0 more precises positions;
wenzelm
parents: 59715
diff changeset
   531
            maybe_end_theory pos
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   532
              (case get_result (snd (the (AList.lookup (op =) deps import))) of
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   533
                NONE => Toplevel.toplevel
59716
8c56b34a88b0 more precises positions;
wenzelm
parents: 59715
diff changeset
   534
              | SOME eval => Command.eval_result_state eval)
8c56b34a88b0 more precises positions;
wenzelm
parents: 59715
diff changeset
   535
        | some => some)
8c56b34a88b0 more precises positions;
wenzelm
parents: 59715
diff changeset
   536
        |> Option.map (fn thy => (thy, (pos, Theory.get_markup thy))));
8c56b34a88b0 more precises positions;
wenzelm
parents: 59715
diff changeset
   537
8c56b34a88b0 more precises positions;
wenzelm
parents: 59715
diff changeset
   538
    val parents =
8c56b34a88b0 more precises positions;
wenzelm
parents: 59715
diff changeset
   539
      if null parents_reports then [Thy_Info.get_theory "Pure"] else map #1 parents_reports;
8c56b34a88b0 more precises positions;
wenzelm
parents: 59715
diff changeset
   540
    val _ = Position.reports (map #2 parents_reports);
56208
06cc31dff138 clarifed module name;
wenzelm
parents: 55799
diff changeset
   541
  in Resources.begin_theory master_dir header parents end;
47335
wenzelm
parents: 47051
diff changeset
   542
47407
8da23ecc70cd more explicit last exec result;
wenzelm
parents: 47406
diff changeset
   543
fun check_theory full name node =
54516
2a7f9e79cb28 proper theory name vs. node name;
wenzelm
parents: 54509
diff changeset
   544
  is_some (loaded_theory name) orelse
59715
4f0d0e4ad68d avoid duplicate header errors, more precise positions;
wenzelm
parents: 59702
diff changeset
   545
  null (#errors (get_header node)) andalso (not full orelse is_some (get_result node));
47335
wenzelm
parents: 47051
diff changeset
   546
58923
cb9b69cca999 more explicit Keyword.keywords;
wenzelm
parents: 58918
diff changeset
   547
fun last_common keywords state node_required node0 node =
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   548
  let
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   549
    fun update_flags prev (visible, initial) =
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   550
      let
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   551
        val visible' = visible andalso prev <> visible_last node;
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   552
        val initial' = initial andalso
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   553
          (case prev of
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   554
            NONE => true
59735
24bee1b11fce misc tuning and simplification;
wenzelm
parents: 59716
diff changeset
   555
          | SOME command_id => the_command_name state command_id <> Thy_Header.theoryN);
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   556
      in (visible', initial') end;
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   557
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   558
    fun get_common ((prev, command_id), opt_exec) (_, ok, flags, assign_update) =
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   559
      if ok then
47630
wenzelm
parents: 47628
diff changeset
   560
        let
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   561
          val flags' as (visible', _) = update_flags prev flags;
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   562
          val ok' =
52586
wenzelm
parents: 52573
diff changeset
   563
            (case (lookup_entry node0 command_id, opt_exec) of
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   564
              (SOME (eval0, _), SOME (eval, _)) =>
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   565
                Command.eval_eq (eval0, eval) andalso
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   566
                  (visible' orelse node_required orelse Command.eval_running eval)
52586
wenzelm
parents: 52573
diff changeset
   567
            | _ => false);
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   568
          val assign_update' = assign_update |> ok' ?
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   569
            (case opt_exec of
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   570
              SOME (eval, prints) =>
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   571
                let
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   572
                  val command_visible = visible_command node command_id;
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52849
diff changeset
   573
                  val command_overlays = overlays node command_id;
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   574
                  val command_name = the_command_name state command_id;
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   575
                in
58923
cb9b69cca999 more explicit Keyword.keywords;
wenzelm
parents: 58918
diff changeset
   576
                  (case
cb9b69cca999 more explicit Keyword.keywords;
wenzelm
parents: 58918
diff changeset
   577
                    Command.print command_visible command_overlays keywords command_name eval prints
cb9b69cca999 more explicit Keyword.keywords;
wenzelm
parents: 58918
diff changeset
   578
                   of
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   579
                    SOME prints' => assign_update_new (command_id, SOME (eval, prints'))
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   580
                  | NONE => I)
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   581
                end
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   582
            | NONE => I);
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   583
        in SOME (prev, ok', flags', assign_update') end
47630
wenzelm
parents: 47628
diff changeset
   584
      else NONE;
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   585
    val (common, ok, flags, assign_update') =
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   586
      iterate_entries get_common node (NONE, true, (true, true), assign_update_empty);
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   587
    val (common', flags') =
52784
4ba2e8b9972f de-assign execs that were not registered as running yet -- observe change of perspective more thoroughly;
wenzelm
parents: 52776
diff changeset
   588
      if ok then
52569
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   589
        let val last = Entries.get_after (get_entries node) common
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   590
        in (last, update_flags last flags) end
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   591
      else (common, flags);
18dde2cf7aa7 produce print_execs assignment earlier during last_common phase (referring to current command_id, not prev);
wenzelm
parents: 52566
diff changeset
   592
  in (assign_update', common', flags') end;
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   593
52534
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   594
fun illegal_init _ = error "Illegal theory header after end of theory";
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   595
58923
cb9b69cca999 more explicit Keyword.keywords;
wenzelm
parents: 58918
diff changeset
   596
fun new_exec keywords state node proper_init command_id' (assign_update, command_exec, init) =
47407
8da23ecc70cd more explicit last exec result;
wenzelm
parents: 47406
diff changeset
   597
  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
   598
  else
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   599
    let
52534
341ae9cd4743 tuned signature;
wenzelm
parents: 52533
diff changeset
   600
      val (_, (eval, _)) = command_exec;
52850
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52849
diff changeset
   601
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52849
diff changeset
   602
      val command_visible = visible_command node command_id';
9fff9f78240a support print functions with explicit arguments, as provided by overlays;
wenzelm
parents: 52849
diff changeset
   603
      val command_overlays = overlays node command_id';
59689
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59687
diff changeset
   604
      val (command_name, blob_digests, blobs_index, span0) = the_command state command_id';
56447
1e77ed11f2f7 separate file_node vs. file_path, e.g. relevant on Windows for hyperlink to the latter;
wenzelm
parents: 56208
diff changeset
   605
      val blobs = map (resolve_blob state) blob_digests;
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   606
      val span = Lazy.force span0;
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   607
54519
5fed81762406 maintain blobs within document state: digest + text in ML, digest-only in Scala;
wenzelm
parents: 54516
diff changeset
   608
      val eval' =
58934
385a4cc7426f prefer externally provided keywords -- Command.read_thy may degenerate to bootstrap_thy in case of errors;
wenzelm
parents: 58928
diff changeset
   609
        Command.eval keywords (master_directory node)
59689
7968c57ea240 simplified Command.resolve_files in ML, using blobs_index from Scala;
wenzelm
parents: 59687
diff changeset
   610
          (fn () => the_default illegal_init init span) (blobs, blobs_index) span eval;
58923
cb9b69cca999 more explicit Keyword.keywords;
wenzelm
parents: 58918
diff changeset
   611
      val prints' =
cb9b69cca999 more explicit Keyword.keywords;
wenzelm
parents: 58918
diff changeset
   612
        perhaps (Command.print command_visible command_overlays keywords command_name eval') [];
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   613
      val exec' = (eval', prints');
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   614
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   615
      val assign_update' = assign_update_new (command_id', SOME exec') assign_update;
59735
24bee1b11fce misc tuning and simplification;
wenzelm
parents: 59716
diff changeset
   616
      val init' = if command_name = Thy_Header.theoryN then NONE else init;
52566
52a0eacf04d1 more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
wenzelm
parents: 52536
diff changeset
   617
    in SOME (assign_update', (command_id', (eval', prints')), init') end;
52602
00170ef1dc39 strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
wenzelm
parents: 52600
diff changeset
   618
52655
3b2b1ef13979 more careful termination of removed execs, leaving running execs undisturbed;
wenzelm
parents: 52607
diff changeset
   619
fun removed_execs node0 (command_id, exec_ids) =
3b2b1ef13979 more careful termination of removed execs, leaving running execs undisturbed;
wenzelm
parents: 52607
diff changeset
   620
  subtract (op =) exec_ids (Command.exec_ids (lookup_entry node0 command_id));
52602
00170ef1dc39 strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
wenzelm
parents: 52600
diff changeset
   621
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   622
in
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   623
59056
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   624
fun update old_version_id new_version_id edits state = Runtime.exn_trace_system (fn () =>
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   625
  let
52536
3a35ce87a55c tuned signature;
wenzelm
parents: 52534
diff changeset
   626
    val old_version = the_version state old_version_id;
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   627
    val new_version =
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   628
      timeit "Document.edit_nodes"
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   629
        (fn () => old_version |> fold edit_nodes edits |> edit_keywords edits);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   630
44544
da5f0af32c1b more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents: 44483
diff changeset
   631
    val nodes = nodes_of new_version;
52776
fd81d51460b7 traverse node on change of "required" state;
wenzelm
parents: 52775
diff changeset
   632
    val required = make_required nodes;
fd81d51460b7 traverse node on change of "required" state;
wenzelm
parents: 52775
diff changeset
   633
    val required0 = make_required (nodes_of old_version);
52772
7764c90680f0 clarified conditions for node traversal;
wenzelm
parents: 52771
diff changeset
   634
    val edited = fold (fn (name, _) => Symtab.update (name, ())) edits Symtab.empty;
44544
da5f0af32c1b more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents: 44483
diff changeset
   635
47628
3275758d274e builtin timing for main operations;
wenzelm
parents: 47424
diff changeset
   636
    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
   637
      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
   638
        (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
   639
          (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
   640
            {name = "Document.update", group = NONE,
52716
ecb46f11c366 document update at high priority -- important;
wenzelm
parents: 52715
diff changeset
   641
              deps = map (Future.task_of o #2) deps, pri = 1, interrupts = false}
59056
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   642
            (fn () =>
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   643
              timeit ("Document.update " ^ name) (fn () =>
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   644
                Runtime.exn_trace_system (fn () =>
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   645
                  let
59086
94b2690ad494 node-specific keywords, with session base syntax as default;
wenzelm
parents: 59085
diff changeset
   646
                    val keywords = the_default (Session.get_keywords ()) (get_keywords node);
59056
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   647
                    val imports = map (apsnd Future.join) deps;
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   648
                    val imports_result_changed = exists (#4 o #1 o #2) imports;
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   649
                    val node_required = Symtab.defined required name;
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   650
                  in
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   651
                    if Symtab.defined edited name orelse visible_node node orelse
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   652
                      imports_result_changed orelse Symtab.defined required0 name <> node_required
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   653
                    then
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   654
                      let
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   655
                        val node0 = node_of old_version name;
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   656
                        val init = init_theory imports node;
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   657
                        val proper_init =
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   658
                          check_theory false name node andalso
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   659
                          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
   660
59056
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   661
                        val (print_execs, common, (still_visible, initial)) =
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   662
                          if imports_result_changed then (assign_update_empty, NONE, (true, true))
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   663
                          else last_common keywords state node_required node0 node;
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   664
                        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
   665
59056
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   666
                        val (updated_execs, (command_id', (eval', _)), _) =
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   667
                          (print_execs, common_command_exec, if initial then SOME init else NONE)
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   668
                          |> (still_visible orelse node_required) ?
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   669
                            iterate_entries_after common
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   670
                              (fn ((prev, id), _) => fn res =>
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   671
                                if not node_required andalso prev = visible_last node then NONE
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   672
                                else new_exec keywords state node proper_init id res) node;
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   673
59056
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   674
                        val assigned_execs =
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   675
                          (node0, updated_execs) |-> iterate_entries_after common
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   676
                            (fn ((_, command_id0), exec0) => fn res =>
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   677
                              if is_none exec0 then NONE
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   678
                              else if assign_update_defined updated_execs command_id0 then SOME res
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   679
                              else SOME (assign_update_new (command_id0, NONE) res));
44480
38c5b085fb1c improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents: 44479
diff changeset
   680
59056
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   681
                        val last_exec =
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   682
                          if command_id' = Document_ID.none then NONE else SOME command_id';
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   683
                        val result =
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   684
                          if is_none last_exec orelse is_some (after_entry node last_exec) then NONE
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   685
                          else SOME eval';
44480
38c5b085fb1c improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents: 44479
diff changeset
   686
59056
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   687
                        val assign_update = assign_update_result assigned_execs;
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   688
                        val removed = maps (removed_execs node0) assign_update;
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   689
                        val _ = List.app Execution.cancel removed;
52602
00170ef1dc39 strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
wenzelm
parents: 52600
diff changeset
   690
59056
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   691
                        val node' = node
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   692
                          |> assign_update_apply assigned_execs
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   693
                          |> set_result result;
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   694
                        val assigned_node = SOME (name, node');
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   695
                        val result_changed = changed_result node0 node';
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   696
                      in ((removed, assign_update, assigned_node, result_changed), node') end
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   697
                    else (([], [], NONE, false), node)
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   698
                  end))))
47628
3275758d274e builtin timing for main operations;
wenzelm
parents: 47424
diff changeset
   699
      |> Future.joins |> map #1);
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   700
52655
3b2b1ef13979 more careful termination of removed execs, leaving running execs undisturbed;
wenzelm
parents: 52607
diff changeset
   701
    val removed = maps #1 updated;
3b2b1ef13979 more careful termination of removed execs, leaving running execs undisturbed;
wenzelm
parents: 52607
diff changeset
   702
    val assign_update = maps #2 updated;
52602
00170ef1dc39 strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
wenzelm
parents: 52600
diff changeset
   703
    val assigned_nodes = map_filter #3 updated;
00170ef1dc39 strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
wenzelm
parents: 52600
diff changeset
   704
44197
458573968568 refined Document.edit: less stateful update via Graph.schedule;
wenzelm
parents: 44196
diff changeset
   705
    val state' = state
52602
00170ef1dc39 strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
wenzelm
parents: 52600
diff changeset
   706
      |> define_version new_version_id (fold put_node assigned_nodes new_version);
00170ef1dc39 strictly monotonic Document.update: avoid disruptive cancel_execution, merely discontinue_execution and cancel/terminate old execs individually;
wenzelm
parents: 52600
diff changeset
   707
59056
cbe9563c03d1 even more exception traces for Document.update, which goes through additional execution wrappers;
wenzelm
parents: 58934
diff changeset
   708
  in (removed, assign_update, state') end);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   709
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   710
end;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   711
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   712
43713
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   713
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   714
(** global state **)
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   715
52508
wenzelm
parents: 51294
diff changeset
   716
val global_state = Synchronized.var "Document.global_state" init_state;
43713
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   717
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   718
fun state () = Synchronized.value global_state;
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   719
val change_state = Synchronized.change global_state;
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   720
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   721
end;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   722