src/Pure/PIDE/document.ML
author wenzelm
Thu, 05 Apr 2012 11:58:46 +0200
changeset 47341 00f6279bb67a
parent 47340 9bbf7fd96bcd
child 47342 7828c7b3c143
permissions -rw-r--r--
Command.memo including physical interrupts (unlike Lazy.lazy); re-assign unstable exec, i.e. reset interrupted transaction; node result as direct exec -- avoid potential interrupt instability of Lazy.map;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     1
(*  Title:      Pure/PIDE/document.ML
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     2
    Author:     Makarius
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     3
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     4
Document as collection of named nodes, each consisting of an editable
44478
4fdb1009a370 tuned signature -- emphasize traditional read/eval/print terminology, which is still relevant here;
wenzelm
parents: 44476
diff changeset
     5
list of commands, with asynchronous read/eval/print processes.
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     6
*)
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     7
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     8
signature DOCUMENT =
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
     9
sig
38363
af7f41a8a0a8 clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents: 38355
diff changeset
    10
  type id = int
38373
wenzelm
parents: 38363
diff changeset
    11
  type version_id = id
38363
af7f41a8a0a8 clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents: 38355
diff changeset
    12
  type command_id = id
38373
wenzelm
parents: 38363
diff changeset
    13
  type exec_id = id
38363
af7f41a8a0a8 clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents: 38355
diff changeset
    14
  val no_id: id
38419
f9dc924e54f8 renamed create_id to new_id;
wenzelm
parents: 38418
diff changeset
    15
  val new_id: unit -> id
38363
af7f41a8a0a8 clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents: 38355
diff changeset
    16
  val parse_id: string -> id
af7f41a8a0a8 clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents: 38355
diff changeset
    17
  val print_id: id -> string
46938
cda018294515 some support for outer syntax keyword declarations within theory header;
wenzelm
parents: 46910
diff changeset
    18
  type node_header = (string * Thy_Header.header) Exn.result
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
    19
  datatype node_edit =
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
    20
    Clear |
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
    21
    Edits of (command_id option * command_id option) list |
44384
8f6054a63f96 some support for editor perspective;
wenzelm
parents: 44338
diff changeset
    22
    Header of node_header |
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
    23
    Perspective of command_id list
44156
6aa25b80e1a5 explicit datatypes for document node edits;
wenzelm
parents: 44113
diff changeset
    24
  type edit = string * node_edit
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    25
  type state
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    26
  val init_state: state
44644
317e4962dd0f clarified define_command: store name as structural information;
wenzelm
parents: 44643
diff changeset
    27
  val define_command: command_id -> string -> string -> state -> state
44301
65f60d9ac4bf tuned signature (again);
wenzelm
parents: 44300
diff changeset
    28
  val cancel_execution: state -> Future.task list
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
    29
  val update_perspective: version_id -> version_id -> string -> command_id list -> state -> state
44481
bb42bc831570 tuned signature;
wenzelm
parents: 44480
diff changeset
    30
  val update: version_id -> version_id -> edit list -> state ->
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
    31
    ((command_id * exec_id option) list * (string * command_id option) list) * state
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    32
  val execute: version_id -> state -> state
44673
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
    33
  val remove_versions: version_id list -> state -> state
43713
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
    34
  val state: unit -> state
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
    35
  val change_state: (state -> state) -> unit
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    36
end;
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    37
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    38
structure Document: DOCUMENT =
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    39
struct
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    40
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    41
(* unique identifiers *)
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    42
38363
af7f41a8a0a8 clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents: 38355
diff changeset
    43
type id = int;
38373
wenzelm
parents: 38363
diff changeset
    44
type version_id = id;
38363
af7f41a8a0a8 clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents: 38355
diff changeset
    45
type command_id = id;
38373
wenzelm
parents: 38363
diff changeset
    46
type exec_id = id;
38355
8cb265fb12fe represent document ids by (long) int, to benefit from the somewhat faster Inttab in ML (LinearSet in Scala is invariably indexed by native object ids);
wenzelm
parents: 38150
diff changeset
    47
8cb265fb12fe represent document ids by (long) int, to benefit from the somewhat faster Inttab in ML (LinearSet in Scala is invariably indexed by native object ids);
wenzelm
parents: 38150
diff changeset
    48
val no_id = 0;
40449
9c390868d255 added general Synchronized.counter convenience;
wenzelm
parents: 40398
diff changeset
    49
val new_id = Synchronized.counter ();
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    50
38414
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38373
diff changeset
    51
val parse_id = Markup.parse_int;
49f1f657adc2 more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents: 38373
diff changeset
    52
val print_id = Markup.print_int;
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    53
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    54
fun err_dup kind id = error ("Duplicate " ^ kind ^ ": " ^ print_id id);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    55
fun err_undef kind id = error ("Undefined " ^ kind ^ ": " ^ print_id id);
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
    56
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    57
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    58
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    59
(** document structure **)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    60
46938
cda018294515 some support for outer syntax keyword declarations within theory header;
wenzelm
parents: 46910
diff changeset
    61
type node_header = (string * Thy_Header.header) Exn.result;
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    62
type perspective = (command_id -> bool) * command_id option; (*visible commands, last*)
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    63
structure Entries = Linear_Set(type key = command_id val ord = int_ord);
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
    64
47341
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47340
diff changeset
    65
type exec = (Toplevel.state * unit lazy) Command.memo;  (*eval/print process*)
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47340
diff changeset
    66
val no_exec = Command.memo_value (Toplevel.toplevel, Lazy.value ());
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
    67
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
    68
abstype node = Node of
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
    69
 {touched: bool,
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
    70
  header: node_header,
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    71
  perspective: perspective,
47340
wenzelm
parents: 47339
diff changeset
    72
  entries: (exec_id * exec) option Entries.T,  (*command entries with excecutions*)
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    73
  last_exec: command_id option,  (*last command with exec state assignment*)
47341
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47340
diff changeset
    74
  result: exec}
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
    75
and version = Version of node Graph.T  (*development graph wrt. static imports*)
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    76
with
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    77
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    78
fun make_node (touched, header, perspective, entries, last_exec, result) =
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
    79
  Node {touched = touched, header = header, perspective = perspective,
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    80
    entries = entries, last_exec = last_exec, result = result};
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
    81
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    82
fun map_node f (Node {touched, header, perspective, entries, last_exec, result}) =
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    83
  make_node (f (touched, header, perspective, entries, last_exec, result));
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
    84
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    85
fun make_perspective command_ids : perspective =
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    86
  (Inttab.defined (Inttab.make (map (rpair ()) command_ids)), try List.last command_ids);
44441
fe95e4306b4b misc tuning and simplification;
wenzelm
parents: 44440
diff changeset
    87
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    88
val no_header = Exn.Exn (ERROR "Bad theory header");
44441
fe95e4306b4b misc tuning and simplification;
wenzelm
parents: 44440
diff changeset
    89
val no_perspective = make_perspective [];
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    90
47341
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47340
diff changeset
    91
val empty_node = make_node (false, no_header, no_perspective, Entries.empty, NONE, no_exec);
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
    92
val clear_node = map_node (fn (_, header, _, _, _, _) =>
47341
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47340
diff changeset
    93
  (false, header, no_perspective, Entries.empty, NONE, no_exec));
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    94
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    95
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    96
(* basic components *)
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
    97
44446
f9334afb6945 misc tuning and simplification;
wenzelm
parents: 44445
diff changeset
    98
fun is_touched (Node {touched, ...}) = touched;
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
    99
fun set_touched touched =
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   100
  map_node (fn (_, header, perspective, entries, last_exec, result) =>
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   101
    (touched, header, perspective, entries, last_exec, result));
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   102
44180
a6dc270d3edb maintain node header;
wenzelm
parents: 44160
diff changeset
   103
fun get_header (Node {header, ...}) = header;
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
   104
fun set_header header =
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   105
  map_node (fn (touched, _, perspective, entries, last_exec, result) =>
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   106
    (touched, header, perspective, entries, last_exec, result));
44180
a6dc270d3edb maintain node header;
wenzelm
parents: 44160
diff changeset
   107
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
   108
fun get_perspective (Node {perspective, ...}) = perspective;
44441
fe95e4306b4b misc tuning and simplification;
wenzelm
parents: 44440
diff changeset
   109
fun set_perspective ids =
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   110
  map_node (fn (touched, header, _, entries, last_exec, result) =>
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   111
    (touched, header, make_perspective ids, entries, last_exec, result));
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
   112
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   113
fun map_entries f =
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   114
  map_node (fn (touched, header, perspective, entries, last_exec, result) =>
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   115
    (touched, header, perspective, f entries, last_exec, result));
44643
9987ae55e17b amended last_common, if that happens to the very last entry (important to load HOL/Auth, for example);
wenzelm
parents: 44614
diff changeset
   116
fun get_entries (Node {entries, ...}) = entries;
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   117
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   118
fun iterate_entries f = Entries.iterate NONE f o get_entries;
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   119
fun iterate_entries_after start f (Node {entries, ...}) =
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   120
  (case Entries.get_after entries start of
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   121
    NONE => I
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   122
  | SOME id => Entries.iterate (SOME id) f entries);
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   123
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   124
fun get_last_exec (Node {last_exec, ...}) = last_exec;
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   125
fun set_last_exec last_exec =
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   126
  map_node (fn (touched, header, perspective, entries, _, result) =>
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   127
    (touched, header, perspective, entries, last_exec, result));
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   128
47339
79bd24497ffd tuned -- NB: get_theory still needs to apply Lazy.force due to interrupt instabilities;
wenzelm
parents: 47336
diff changeset
   129
fun get_result (Node {result, ...}) = result;
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
   130
fun set_result result =
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   131
  map_node (fn (touched, header, perspective, entries, last_exec, _) =>
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   132
    (touched, header, perspective, entries, last_exec, result));
44180
a6dc270d3edb maintain node header;
wenzelm
parents: 44160
diff changeset
   133
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   134
fun get_node nodes name = Graph.get_node nodes name handle Graph.UNDEF _ => empty_node;
44202
44c4ae5c5ce2 touch descendants of edited nodes;
wenzelm
parents: 44201
diff changeset
   135
fun default_node name = Graph.default_node (name, empty_node);
44c4ae5c5ce2 touch descendants of edited nodes;
wenzelm
parents: 44201
diff changeset
   136
fun update_node name f = default_node name #> Graph.map_node name f;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   137
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   138
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   139
(* node edits and associated executions *)
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   140
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   141
datatype node_edit =
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   142
  Clear |
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   143
  Edits of (command_id option * command_id option) list |
44384
8f6054a63f96 some support for editor perspective;
wenzelm
parents: 44338
diff changeset
   144
  Header of node_header |
44385
e7fdb008aa7d propagate editor perspective through document model;
wenzelm
parents: 44384
diff changeset
   145
  Perspective of command_id list;
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   146
44156
6aa25b80e1a5 explicit datatypes for document node edits;
wenzelm
parents: 44113
diff changeset
   147
type edit = string * node_edit;
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   148
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   149
fun after_entry (Node {entries, ...}) = Entries.get_after entries;
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   150
44480
38c5b085fb1c improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents: 44479
diff changeset
   151
fun lookup_entry (Node {entries, ...}) id =
38c5b085fb1c improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents: 44479
diff changeset
   152
  (case Entries.lookup entries id of
38c5b085fb1c improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents: 44479
diff changeset
   153
    NONE => NONE
38c5b085fb1c improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents: 44479
diff changeset
   154
  | SOME (exec, _) => exec);
38c5b085fb1c improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents: 44479
diff changeset
   155
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   156
fun the_entry (Node {entries, ...}) id =
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   157
  (case Entries.lookup entries id of
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   158
    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
   159
  | SOME (exec, _) => exec);
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   160
47341
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47340
diff changeset
   161
fun the_default_entry node (SOME id) = (id, (the_default (no_id, no_exec) (the_entry node id)))
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47340
diff changeset
   162
  | the_default_entry _ NONE = (no_id, (no_id, no_exec));
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   163
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   164
fun update_entry id exec =
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   165
  map_entries (Entries.update (id, exec));
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   166
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   167
fun reset_entry id node =
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   168
  if is_some (lookup_entry node id) then update_entry id NONE node else node;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   169
38448
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   170
fun reset_after id entries =
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   171
  (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
   172
    NONE => entries
62d16c415019 added functor Linear_Set, based on former adhoc structures in document.ML;
wenzelm
parents: 38421
diff changeset
   173
  | 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
   174
43668
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   175
val edit_node = map_entries o fold
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   176
  (fn (id, SOME id2) => Entries.insert_after id (id2, NONE)
aad4f1956098 get theory from last executation state;
wenzelm
parents: 43666
diff changeset
   177
    | (id, NONE) => Entries.delete_after id #> reset_after id);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   178
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   179
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   180
(* version operations *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   181
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   182
val empty_version = Version Graph.empty;
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   183
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   184
fun nodes_of (Version nodes) = nodes;
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   185
val node_of = get_node o nodes_of;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   186
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   187
local
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   188
44185
05641edb5d30 provide node header via Scala layer;
wenzelm
parents: 44182
diff changeset
   189
fun cycle_msg names = "Cyclic dependency of " ^ space_implode " via " (map quote names);
44180
a6dc270d3edb maintain node header;
wenzelm
parents: 44160
diff changeset
   190
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   191
fun touch_node name nodes =
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   192
  fold (fn desc =>
44643
9987ae55e17b amended last_common, if that happens to the very last entry (important to load HOL/Auth, for example);
wenzelm
parents: 44614
diff changeset
   193
      update_node desc
9987ae55e17b amended last_common, if that happens to the very last entry (important to load HOL/Auth, for example);
wenzelm
parents: 44614
diff changeset
   194
        (set_touched true #>
47341
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47340
diff changeset
   195
          desc <> name ? (map_entries (reset_after NONE) #> set_result no_exec)))
44202
44c4ae5c5ce2 touch descendants of edited nodes;
wenzelm
parents: 44201
diff changeset
   196
    (Graph.all_succs nodes [name]) nodes;
44c4ae5c5ce2 touch descendants of edited nodes;
wenzelm
parents: 44201
diff changeset
   197
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   198
in
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   199
44157
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   200
fun edit_nodes (name, node_edit) (Version nodes) =
a21d3e1e64fd uniform treatment of header edits as document edits;
wenzelm
parents: 44156
diff changeset
   201
  Version
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   202
    (case node_edit of
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   203
      Clear =>
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   204
        nodes
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   205
        |> update_node name clear_node
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   206
        |> touch_node name
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   207
    | Edits edits =>
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   208
        nodes
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   209
        |> update_node name (edit_node edits)
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   210
        |> touch_node name
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   211
    | Header header =>
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   212
        let
46938
cda018294515 some support for outer syntax keyword declarations within theory header;
wenzelm
parents: 46910
diff changeset
   213
          val imports = (case header of Exn.Res (_, {imports, ...}) => imports | _ => []);
46945
26007caf6e9c declare keywords as side-effect of header edit;
wenzelm
parents: 46938
diff changeset
   214
          val header' =
46958
0ec8f04e753a define keywords early when processing the theory header, before running the body commands;
wenzelm
parents: 46950
diff changeset
   215
            ((case header of Exn.Res (_, h) => Thy_Header.define_keywords h | _ => ()); header)
46945
26007caf6e9c declare keywords as side-effect of header edit;
wenzelm
parents: 46938
diff changeset
   216
              handle exn as ERROR _ => Exn.Exn exn;
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   217
          val nodes1 = nodes
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   218
            |> default_node name
46739
6024353549ca clarified document nodes (full import graph) vs. node_status (non-preloaded theories);
wenzelm
parents: 45674
diff changeset
   219
            |> fold default_node imports;
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   220
          val nodes2 = nodes1
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   221
            |> Graph.Keys.fold
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   222
                (fn dep => Graph.del_edge (dep, name)) (Graph.imm_preds nodes1 name);
46945
26007caf6e9c declare keywords as side-effect of header edit;
wenzelm
parents: 46938
diff changeset
   223
          val (header'', nodes3) =
26007caf6e9c declare keywords as side-effect of header edit;
wenzelm
parents: 46938
diff changeset
   224
            (header', Graph.add_deps_acyclic (name, imports) nodes2)
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   225
              handle Graph.CYCLES cs => (Exn.Exn (ERROR (cat_lines (map cycle_msg cs))), nodes2);
46945
26007caf6e9c declare keywords as side-effect of header edit;
wenzelm
parents: 46938
diff changeset
   226
        in Graph.map_node name (set_header header'') nodes3 end
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   227
        |> touch_node name
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   228
    | Perspective perspective =>
44544
da5f0af32c1b more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents: 44483
diff changeset
   229
        update_node name (set_perspective perspective) nodes);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   230
44444
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   231
end;
33a5616a7571 tuned Document.node: maintain "touched" flag to indicate changes in entries etc.;
wenzelm
parents: 44441
diff changeset
   232
44222
9d5ef6cd4ee1 use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents: 44202
diff changeset
   233
fun put_node (name, node) (Version nodes) =
9d5ef6cd4ee1 use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents: 44202
diff changeset
   234
  Version (update_node name (K node) nodes);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   235
38150
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   236
end;
67fc24df3721 simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
diff changeset
   237
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   238
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   239
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   240
(** global state -- document structure and execution process **)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   241
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   242
abstype state = State of
40398
cdda2847a91e continue after failed commands;
wenzelm
parents: 40391
diff changeset
   243
 {versions: version Inttab.table,  (*version_id -> document content*)
47335
wenzelm
parents: 47051
diff changeset
   244
  commands: (string * Token.T list lazy) Inttab.table,  (*command_id -> named span*)
44673
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   245
  execution: version_id * Future.group}  (*current execution process*)
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   246
with
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   247
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   248
fun make_state (versions, commands, execution) =
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   249
  State {versions = versions, commands = commands, execution = execution};
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   250
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   251
fun map_state f (State {versions, commands, execution}) =
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   252
  make_state (f (versions, commands, execution));
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   253
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   254
val init_state =
44675
f665a5d35a3d discontinued predefined empty command (obsolete!?);
wenzelm
parents: 44674
diff changeset
   255
  make_state (Inttab.make [(no_id, empty_version)], Inttab.empty, (no_id, Future.new_group NONE));
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   256
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   257
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   258
(* document versions *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   259
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   260
fun define_version (id: version_id) version =
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   261
  map_state (fn (versions, commands, execution) =>
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   262
    let val versions' = Inttab.update_new (id, version) versions
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   263
      handle Inttab.DUP dup => err_dup "document version" dup
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   264
    in (versions', commands, execution) end);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   265
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   266
fun the_version (State {versions, ...}) (id: version_id) =
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   267
  (case Inttab.lookup versions id of
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   268
    NONE => err_undef "document version" id
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   269
  | SOME version => version);
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   270
44673
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   271
fun delete_version (id: version_id) versions = Inttab.delete id versions
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   272
  handle Inttab.UNDEF _ => err_undef "document version" id;
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   273
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   274
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   275
(* commands *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   276
44644
317e4962dd0f clarified define_command: store name as structural information;
wenzelm
parents: 44643
diff changeset
   277
fun define_command (id: command_id) name text =
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   278
  map_state (fn (versions, commands, execution) =>
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   279
    let
47336
bed4b2738d8a separate module for prover command execution;
wenzelm
parents: 47335
diff changeset
   280
      val span = Lazy.lazy (fn () => Command.parse_command (print_id id) text);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   281
      val commands' =
46945
26007caf6e9c declare keywords as side-effect of header edit;
wenzelm
parents: 46938
diff changeset
   282
        Inttab.update_new (id, (name, span)) commands
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   283
          handle Inttab.DUP dup => err_dup "command" dup;
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   284
    in (versions, commands', execution) end);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   285
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   286
fun the_command (State {commands, ...}) (id: command_id) =
44660
90bab3febb6c less agressive parsing of commands (priority ~1);
wenzelm
parents: 44645
diff changeset
   287
  (case Inttab.lookup commands id of
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   288
    NONE => err_undef "command" id
44644
317e4962dd0f clarified define_command: store name as structural information;
wenzelm
parents: 44643
diff changeset
   289
  | SOME command => command);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   290
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   291
41634
28d94383249c cancel document execution before editing, to improve reactivity on systems with few cores;
wenzelm
parents: 41630
diff changeset
   292
(* document execution *)
28d94383249c cancel document execution before editing, to improve reactivity on systems with few cores;
wenzelm
parents: 41630
diff changeset
   293
44673
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   294
fun cancel_execution (State {execution, ...}) = Future.cancel_group (#2 execution);
41634
28d94383249c cancel document execution before editing, to improve reactivity on systems with few cores;
wenzelm
parents: 41630
diff changeset
   295
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   296
end;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   297
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   298
38888
8248cda328de moved Toplevel.run_command to Pure/PIDE/document.ML;
wenzelm
parents: 38873
diff changeset
   299
44481
bb42bc831570 tuned signature;
wenzelm
parents: 44480
diff changeset
   300
(** update **)
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   301
44436
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   302
(* perspective *)
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   303
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   304
fun update_perspective (old_id: version_id) (new_id: version_id) name perspective state =
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   305
  let
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   306
    val old_version = the_version state old_id;
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   307
    val _ = Time.now ();  (* FIXME odd workaround for polyml-5.4.0/x86_64 -- needed? *)
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   308
    val new_version = edit_nodes (name, Perspective perspective) old_version;
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   309
  in define_version new_id new_version state end;
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   310
546adfa8a6fc update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents: 44435
diff changeset
   311
44481
bb42bc831570 tuned signature;
wenzelm
parents: 44480
diff changeset
   312
(* edits *)
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   313
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   314
local
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   315
47335
wenzelm
parents: 47051
diff changeset
   316
fun make_required nodes =
wenzelm
parents: 47051
diff changeset
   317
  let
wenzelm
parents: 47051
diff changeset
   318
    val all_visible =
wenzelm
parents: 47051
diff changeset
   319
      Graph.fold (fn (a, (node, _)) => is_some (#2 (get_perspective node)) ? cons a) nodes []
wenzelm
parents: 47051
diff changeset
   320
      |> Graph.all_preds nodes;
wenzelm
parents: 47051
diff changeset
   321
    val required =
wenzelm
parents: 47051
diff changeset
   322
      fold (fn a => exists (fn b => Graph.is_edge nodes (a, b)) all_visible ? Symtab.update (a, ()))
wenzelm
parents: 47051
diff changeset
   323
        all_visible Symtab.empty;
wenzelm
parents: 47051
diff changeset
   324
  in Symtab.defined required end;
wenzelm
parents: 47051
diff changeset
   325
wenzelm
parents: 47051
diff changeset
   326
fun init_theory deps node =
wenzelm
parents: 47051
diff changeset
   327
  let
wenzelm
parents: 47051
diff changeset
   328
    (* FIXME provide files via Scala layer, not master_dir *)
wenzelm
parents: 47051
diff changeset
   329
    val (dir, header) = Exn.release (get_header node);
wenzelm
parents: 47051
diff changeset
   330
    val master_dir =
wenzelm
parents: 47051
diff changeset
   331
      (case Url.explode dir of
wenzelm
parents: 47051
diff changeset
   332
        Url.File path => path
wenzelm
parents: 47051
diff changeset
   333
      | _ => Path.current);
wenzelm
parents: 47051
diff changeset
   334
    val parents =
wenzelm
parents: 47051
diff changeset
   335
      #imports header |> map (fn import =>
wenzelm
parents: 47051
diff changeset
   336
        (case Thy_Info.lookup_theory import of  (* FIXME more robust!? *)
wenzelm
parents: 47051
diff changeset
   337
          SOME thy => thy
wenzelm
parents: 47051
diff changeset
   338
        | NONE =>
47339
79bd24497ffd tuned -- NB: get_theory still needs to apply Lazy.force due to interrupt instabilities;
wenzelm
parents: 47336
diff changeset
   339
            Toplevel.end_theory (Position.file_only import)
47341
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47340
diff changeset
   340
              (fst (Exn.release (Command.memo_result
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47340
diff changeset
   341
                (get_result (snd (Future.join (the (AList.lookup (op =) deps import))))))))));
47335
wenzelm
parents: 47051
diff changeset
   342
  in Thy_Load.begin_theory master_dir header parents end;
wenzelm
parents: 47051
diff changeset
   343
wenzelm
parents: 47051
diff changeset
   344
fun check_theory nodes name =
wenzelm
parents: 47051
diff changeset
   345
  is_some (Thy_Info.lookup_theory name) orelse  (* FIXME more robust!? *)
wenzelm
parents: 47051
diff changeset
   346
  is_some (Exn.get_res (get_header (get_node nodes name)));
wenzelm
parents: 47051
diff changeset
   347
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   348
fun last_common state last_visible node0 node =
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   349
  let
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   350
    fun update_flags prev (visible, initial) =
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   351
      let
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   352
        val visible' = visible andalso prev <> last_visible;
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   353
        val initial' = initial andalso
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   354
          (case prev of
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   355
            NONE => true
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   356
          | SOME id => not (Keyword.is_theory_begin (#1 (the_command state id))));
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   357
      in (visible', initial') end;
47340
wenzelm
parents: 47339
diff changeset
   358
    fun get_common ((prev, id), opt_exec) (found, (_, flags)) =
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   359
      if found then NONE
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   360
      else
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   361
        let val found' =
47340
wenzelm
parents: 47339
diff changeset
   362
          (case opt_exec of
wenzelm
parents: 47339
diff changeset
   363
            NONE => true
wenzelm
parents: 47339
diff changeset
   364
          | SOME (exec_id, exec) =>
47341
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47340
diff changeset
   365
              not (Command.memo_stable exec) orelse
47340
wenzelm
parents: 47339
diff changeset
   366
              (case lookup_entry node0 id of
wenzelm
parents: 47339
diff changeset
   367
                NONE => true
wenzelm
parents: 47339
diff changeset
   368
              | SOME (exec_id0, _) => exec_id <> exec_id0));
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   369
        in SOME (found', (prev, update_flags prev flags)) end;
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   370
    val (found, (common, flags)) =
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   371
      iterate_entries get_common node (false, (NONE, (true, true)));
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   372
  in
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   373
    if found then (common, flags)
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   374
    else
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   375
      let val last = Entries.get_after (get_entries node) common
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   376
      in (last, update_flags last flags) end
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   377
  end;
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   378
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   379
fun illegal_init () = error "Illegal theory header after end of theory";
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   380
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   381
fun new_exec state bad_init command_id' (execs, command_exec, init) =
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   382
  if bad_init andalso is_none init then NONE
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   383
  else
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   384
    let
46945
26007caf6e9c declare keywords as side-effect of header edit;
wenzelm
parents: 46938
diff changeset
   385
      val (name, span) = the_command state command_id' ||> Lazy.force;
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   386
      val (modify_init, init') =
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   387
        if Keyword.is_theory_begin name then
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   388
          (Toplevel.modify_init (the_default illegal_init init), NONE)
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   389
        else (I, init);
44660
90bab3febb6c less agressive parsing of commands (priority ~1);
wenzelm
parents: 44645
diff changeset
   390
      val exec_id' = new_id ();
46876
8f3bb485f628 refined define_command vs. run_command: static tokenization vs. dynamic parsing, to increase the chance that the proper transaction is run after redefining commands (NB: requires slightly more space and time for document state);
wenzelm
parents: 46739
diff changeset
   391
      val exec_id'_string = print_id exec_id';
8f3bb485f628 refined define_command vs. run_command: static tokenization vs. dynamic parsing, to increase the chance that the proper transaction is run after redefining commands (NB: requires slightly more space and time for document state);
wenzelm
parents: 46739
diff changeset
   392
      val tr =
8f3bb485f628 refined define_command vs. run_command: static tokenization vs. dynamic parsing, to increase the chance that the proper transaction is run after redefining commands (NB: requires slightly more space and time for document state);
wenzelm
parents: 46739
diff changeset
   393
        Position.setmp_thread_data (Position.id_only exec_id'_string)
8f3bb485f628 refined define_command vs. run_command: static tokenization vs. dynamic parsing, to increase the chance that the proper transaction is run after redefining commands (NB: requires slightly more space and time for document state);
wenzelm
parents: 46739
diff changeset
   394
          (fn () =>
8f3bb485f628 refined define_command vs. run_command: static tokenization vs. dynamic parsing, to increase the chance that the proper transaction is run after redefining commands (NB: requires slightly more space and time for document state);
wenzelm
parents: 46739
diff changeset
   395
            #1 (Outer_Syntax.read_span (#2 (Outer_Syntax.get_syntax ())) span)
8f3bb485f628 refined define_command vs. run_command: static tokenization vs. dynamic parsing, to increase the chance that the proper transaction is run after redefining commands (NB: requires slightly more space and time for document state);
wenzelm
parents: 46739
diff changeset
   396
            |> modify_init
8f3bb485f628 refined define_command vs. run_command: static tokenization vs. dynamic parsing, to increase the chance that the proper transaction is run after redefining commands (NB: requires slightly more space and time for document state);
wenzelm
parents: 46739
diff changeset
   397
            |> Toplevel.put_id exec_id'_string);
47341
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47340
diff changeset
   398
      val exec' = Command.memo (fn () =>
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47340
diff changeset
   399
        let val (st, _) = Exn.release (Command.memo_result (snd (snd command_exec)));
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47340
diff changeset
   400
        in Command.run_command (tr ()) st end);
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   401
      val command_exec' = (command_id', (exec_id', exec'));
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   402
    in SOME (command_exec' :: execs, command_exec', init') end;
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   403
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   404
in
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   405
44481
bb42bc831570 tuned signature;
wenzelm
parents: 44480
diff changeset
   406
fun update (old_id: version_id) (new_id: version_id) edits state =
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   407
  let
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   408
    val old_version = the_version state old_id;
44180
a6dc270d3edb maintain node header;
wenzelm
parents: 44160
diff changeset
   409
    val _ = Time.now ();  (* FIXME odd workaround for polyml-5.4.0/x86_64 *)
44222
9d5ef6cd4ee1 use full .thy file name as node name, which makes MiscUtilities.resolveSymlinks/File.getCanonicalPath more predictable;
wenzelm
parents: 44202
diff changeset
   410
    val new_version = fold edit_nodes edits old_version;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   411
44544
da5f0af32c1b more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents: 44483
diff changeset
   412
    val nodes = nodes_of new_version;
da5f0af32c1b more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents: 44483
diff changeset
   413
    val is_required = make_required nodes;
da5f0af32c1b more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents: 44483
diff changeset
   414
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   415
    val updated =
44544
da5f0af32c1b more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents: 44483
diff changeset
   416
      nodes |> Graph.schedule
44199
e38885e3ea60 retrieve imports from document state, with fall-back on theory loader for preloaded theories;
wenzelm
parents: 44198
diff changeset
   417
        (fn deps => fn (name, node) =>
47340
wenzelm
parents: 47339
diff changeset
   418
          if is_touched node orelse is_required name then
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   419
            let
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   420
              val node0 = node_of old_version name;
44979
68b990e950b1 explicit master_dir as part of header -- still required (for Cygwin) since Scala layer does not pass file content yet;
wenzelm
parents: 44804
diff changeset
   421
              fun init () = init_theory deps node;
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   422
              val bad_init =
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   423
                not (check_theory nodes name andalso forall (check_theory nodes o #1) deps);
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   424
            in
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   425
              (singleton o Future.forks)
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   426
                {name = "Document.update", group = NONE,
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   427
                  deps = map (Future.task_of o #2) deps, pri = 0, interrupts = false}
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   428
                (fn () =>
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   429
                  let
44544
da5f0af32c1b more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents: 44483
diff changeset
   430
                    val required = is_required name;
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   431
                    val last_visible = #2 (get_perspective node);
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   432
                    val (common, (visible, initial)) = last_common state last_visible node0 node;
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   433
                    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
   434
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   435
                    val (execs, (command_id, (_, exec)), _) =
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   436
                      ([], common_command_exec, if initial then SOME init else NONE) |>
44544
da5f0af32c1b more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents: 44483
diff changeset
   437
                      (visible orelse required) ?
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   438
                        iterate_entries_after common
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   439
                          (fn ((prev, id), _) => fn res =>
44544
da5f0af32c1b more precise treatment of nodes that are fully required for partially visible ones;
wenzelm
parents: 44483
diff changeset
   440
                            if not required andalso prev = last_visible then NONE
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   441
                            else new_exec state bad_init id res) node;
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   442
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   443
                    val no_execs =
44645
5938beb84adc more precise iterate_entries_after if start refers to last entry;
wenzelm
parents: 44644
diff changeset
   444
                      iterate_entries_after common
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   445
                        (fn ((_, id0), exec0) => fn res =>
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   446
                          if is_none exec0 then NONE
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   447
                          else if exists (fn (_, (id, _)) => id0 = id) execs then SOME res
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   448
                          else SOME (id0 :: res)) node0 [];
44480
38c5b085fb1c improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents: 44479
diff changeset
   449
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   450
                    val last_exec = if command_id = no_id then NONE else SOME command_id;
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   451
                    val result =
47341
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47340
diff changeset
   452
                      if is_some (after_entry node last_exec) then no_exec
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47340
diff changeset
   453
                      else exec;
44480
38c5b085fb1c improved Document.edit: more accurate update_start and no_execs;
wenzelm
parents: 44479
diff changeset
   454
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   455
                    val node' = node
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   456
                      |> fold reset_entry no_execs
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   457
                      |> fold (fn (id, exec) => update_entry id (SOME exec)) execs
44482
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   458
                      |> set_last_exec last_exec
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   459
                      |> set_result result
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   460
                      |> set_touched false;
c7225307acf2 further clarification of Document.updated, based on last_common and after_entry;
wenzelm
parents: 44481
diff changeset
   461
                  in ((no_execs, execs, [(name, node')]), node') end)
47340
wenzelm
parents: 47339
diff changeset
   462
            end
wenzelm
parents: 47339
diff changeset
   463
          else Future.value (([], [], []), node))
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   464
      |> Future.joins |> map #1;
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   465
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   466
    val command_execs =
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   467
      map (rpair NONE) (maps #1 updated) @
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   468
      map (fn (command_id, (exec_id, _)) => (command_id, SOME exec_id)) (maps #2 updated);
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   469
    val updated_nodes = maps #3 updated;
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   470
    val last_execs = map (fn (name, node) => (name, get_last_exec node)) updated_nodes;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   471
44197
458573968568 refined Document.edit: less stateful update via Graph.schedule;
wenzelm
parents: 44196
diff changeset
   472
    val state' = state
44476
e8a87398f35d propagate information about last command with exec state assignment through document model;
wenzelm
parents: 44446
diff changeset
   473
      |> define_version new_id (fold put_node updated_nodes new_version);
44479
9a04e7502e22 refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents: 44478
diff changeset
   474
  in ((command_execs, last_execs), state') end;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   475
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   476
end;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   477
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   478
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   479
(* execute *)
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   480
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   481
fun execute version_id state =
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   482
  state |> map_state (fn (versions, commands, _) =>
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   483
    let
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   484
      val version = the_version state version_id;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   485
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   486
      fun force_exec _ _ NONE = ()
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   487
        | force_exec node command_id (SOME (_, exec)) =
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   488
            let
47341
00f6279bb67a Command.memo including physical interrupts (unlike Lazy.lazy);
wenzelm
parents: 47340
diff changeset
   489
              val (_, print) = Exn.release (Command.memo_result exec);
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   490
              val _ =
44439
2bcd2aefaf7f print state only for visible command, to avoid wasting resources for the larger part of the text;
wenzelm
parents: 44436
diff changeset
   491
                if #1 (get_perspective node) command_id
44386
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   492
                then ignore (Lazy.future Future.default_params print)
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   493
                else ();
4048ca2658b7 some support for toplevel printing wrt. editor perspective (still inactive);
wenzelm
parents: 44385
diff changeset
   494
            in () end;
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   495
44673
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   496
      val group = Future.new_group NONE;
44299
061599cb6eb0 refined Future.cancel: explicit future allows to join actual cancellation;
wenzelm
parents: 44271
diff changeset
   497
      val _ =
44201
6429ab1b6883 parellel scheduling of node edits and execution;
wenzelm
parents: 44200
diff changeset
   498
        nodes_of version |> Graph.schedule
6429ab1b6883 parellel scheduling of node edits and execution;
wenzelm
parents: 44200
diff changeset
   499
          (fn deps => fn (name, node) =>
44302
wenzelm
parents: 44301
diff changeset
   500
            (singleton o Future.forks)
44673
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   501
              {name = "theory:" ^ name, group = SOME (Future.new_group (SOME group)),
44614
466ea227e00d more careful treatment of interrupts, to retain them within forked/joined boundary of command transactions;
wenzelm
parents: 44611
diff changeset
   502
                deps = map (Future.task_of o #2) deps, pri = 1, interrupts = false}
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   503
              (iterate_entries (fn ((_, id), exec) => fn () =>
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   504
                SOME (force_exec node id exec)) node));
40520
77a7b0a7d4b1 await_cancellation in the main thread, independently of the execution futures, which might get interrupted or be absent after node deletetion;
wenzelm
parents: 40481
diff changeset
   505
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   506
    in (versions, commands, (version_id, group)) end);
44673
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   507
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   508
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   509
(* remove versions *)
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   510
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   511
fun remove_versions ids state = state |> map_state (fn (versions, _, execution) =>
44673
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   512
  let
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   513
    val _ = member (op =) ids (#1 execution) andalso
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   514
      error ("Attempt to remove execution version " ^ print_id (#1 execution));
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   515
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   516
    val versions' = fold delete_version ids versions;
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   517
    val commands' =
44675
f665a5d35a3d discontinued predefined empty command (obsolete!?);
wenzelm
parents: 44674
diff changeset
   518
      (versions', Inttab.empty) |->
44673
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   519
        Inttab.fold (fn (_, version) => nodes_of version |>
2fa51ac191bc Document.remove_versions on ML side;
wenzelm
parents: 44660
diff changeset
   520
          Graph.fold (fn (_, (node, _)) => node |>
44674
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   521
            iterate_entries (fn ((_, id), _) =>
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   522
              SOME o Inttab.insert (K true) (id, the_command state id))));
bad4f9158c80 discontinued global execs: store exec value directly within entries;
wenzelm
parents: 44673
diff changeset
   523
  in (versions', commands', execution) end);
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   524
43713
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   525
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   526
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   527
(** global state **)
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   528
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   529
val global_state = Synchronized.var "Document" init_state;
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   530
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   531
fun state () = Synchronized.value global_state;
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   532
val change_state = Synchronized.change global_state;
1ba5331b4623 moved global state to structure Document (again);
wenzelm
parents: 43668
diff changeset
   533
38418
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   534
end;
9a7af64d71bb more explicit / functional ML version of document model;
wenzelm
parents: 38414
diff changeset
   535