| author | wenzelm | 
| Thu, 11 Jan 2018 13:48:17 +0100 | |
| changeset 67405 | e9ab4ad7bd15 | 
| parent 67309 | 0e322d7325c3 | 
| child 67825 | f9c071cc958b | 
| permissions | -rw-r--r-- | 
| 36676 | 1 | /* Title: Pure/PIDE/document.scala | 
| 2 | Author: Makarius | |
| 3 | ||
| 38150 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: 
37849diff
changeset | 4 | Document as collection of named nodes, each consisting of an editable | 
| 38418 
9a7af64d71bb
more explicit / functional ML version of document model;
 wenzelm parents: 
38417diff
changeset | 5 | list of commands, associated with asynchronous execution process. | 
| 36676 | 6 | */ | 
| 34407 | 7 | |
| 34871 
e596a0b71f3c
incorporate "proofdocument" part into main Isabelle/Pure.jar -- except for html_panel.scala, which depends on external library (Lobo/Cobra browser);
 wenzelm parents: 
34868diff
changeset | 8 | package isabelle | 
| 34318 
c13e168a8ae6
original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
 wenzelm parents: diff
changeset | 9 | |
| 34760 | 10 | |
| 38150 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: 
37849diff
changeset | 11 | import scala.collection.mutable | 
| 37073 | 12 | |
| 13 | ||
| 34823 | 14 | object Document | 
| 34483 | 15 | {
 | 
| 38424 | 16 | /** document structure **/ | 
| 17 | ||
| 52977 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 18 | /* overlays -- print functions with arguments */ | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 19 | |
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 20 | object Overlays | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 21 |   {
 | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 22 | val empty = new Overlays(Map.empty) | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 23 | } | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 24 | |
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 25 | final class Overlays private(rep: Map[Node.Name, Node.Overlays]) | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 26 |   {
 | 
| 64799 | 27 | def apply(name: Node.Name): Node.Overlays = | 
| 52977 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 28 | rep.getOrElse(name, Node.Overlays.empty) | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 29 | |
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 30 | private def update(name: Node.Name, f: Node.Overlays => Node.Overlays): Overlays = | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 31 |     {
 | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 32 | val node_overlays = f(apply(name)) | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 33 | new Overlays(if (node_overlays.is_empty) rep - name else rep + (name -> node_overlays)) | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 34 | } | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 35 | |
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 36 | def insert(command: Command, fn: String, args: List[String]): Overlays = | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 37 | update(command.node_name, _.insert(command, fn, args)) | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 38 | |
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 39 | def remove(command: Command, fn: String, args: List[String]): Overlays = | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 40 | update(command.node_name, _.remove(command, fn, args)) | 
| 55800 | 41 | |
| 42 |     override def toString: String = rep.mkString("Overlays(", ",", ")")
 | |
| 52977 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 43 | } | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 44 | |
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 45 | |
| 55783 | 46 | /* document blobs: auxiliary files */ | 
| 47 | ||
| 67265 
f32287c95432
store full blob source for the sake of markup_to_XML;
 wenzelm parents: 
67264diff
changeset | 48 | sealed case class Blob(bytes: Bytes, source: String, chunk: Symbol.Text_Chunk, changed: Boolean) | 
| 56335 
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
 wenzelm parents: 
56314diff
changeset | 49 |   {
 | 
| 
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
 wenzelm parents: 
56314diff
changeset | 50 | def unchanged: Blob = copy(changed = false) | 
| 
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
 wenzelm parents: 
56314diff
changeset | 51 | } | 
| 55783 | 52 | |
| 53 | object Blobs | |
| 54 |   {
 | |
| 56336 | 55 | def apply(blobs: Map[Node.Name, Blob]): Blobs = new Blobs(blobs) | 
| 55783 | 56 | val empty: Blobs = apply(Map.empty) | 
| 57 | } | |
| 58 | ||
| 56336 | 59 | final class Blobs private(blobs: Map[Node.Name, Blob]) | 
| 55783 | 60 |   {
 | 
| 56336 | 61 | def get(name: Node.Name): Option[Blob] = blobs.get(name) | 
| 55783 | 62 | |
| 63 | def changed(name: Node.Name): Boolean = | |
| 64 |       get(name) match {
 | |
| 65 | case Some(blob) => blob.changed | |
| 66 | case None => false | |
| 67 | } | |
| 68 | ||
| 55800 | 69 |     override def toString: String = blobs.mkString("Blobs(", ",", ")")
 | 
| 55783 | 70 | } | 
| 71 | ||
| 72 | ||
| 73 | /* document nodes: theories and auxiliary files */ | |
| 38424 | 74 | |
| 44615 | 75 | type Edit[A, B] = (Node.Name, Node.Edit[A, B]) | 
| 44384 | 76 | type Edit_Text = Edit[Text.Edit, Text.Perspective] | 
| 52849 | 77 | type Edit_Command = Edit[Command.Edit, Command.Perspective] | 
| 38151 | 78 | |
| 79 | object Node | |
| 80 |   {
 | |
| 52887 | 81 | /* header and name */ | 
| 82 | ||
| 48707 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 wenzelm parents: 
48706diff
changeset | 83 | sealed case class Header( | 
| 63020 | 84 | imports: List[(Name, Position.T)] = Nil, | 
| 85 | keywords: Thy_Header.Keywords = Nil, | |
| 63579 | 86 | abbrevs: Thy_Header.Abbrevs = Nil, | 
| 63020 | 87 | errors: List[String] = Nil) | 
| 48707 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 wenzelm parents: 
48706diff
changeset | 88 |     {
 | 
| 66773 | 89 | def append_errors(msgs: List[String]): Header = | 
| 90 | copy(errors = errors ::: msgs) | |
| 54549 
2a3053472ec3
actually expose errors of cumulative theory dependencies;
 wenzelm parents: 
54530diff
changeset | 91 | |
| 
2a3053472ec3
actually expose errors of cumulative theory dependencies;
 wenzelm parents: 
54530diff
changeset | 92 | def cat_errors(msg2: String): Header = | 
| 62492 | 93 | copy(errors = errors.map(msg1 => Exn.cat_message(msg1, msg2))) | 
| 48707 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 wenzelm parents: 
48706diff
changeset | 94 | } | 
| 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 wenzelm parents: 
48706diff
changeset | 95 | |
| 63020 | 96 | val no_header = Header() | 
| 97 | def bad_header(msg: String): Header = Header(errors = List(msg)) | |
| 46737 | 98 | |
| 44957 
098dd95349e7
more elaborate Node_Renderer, which paints node_name.theory only;
 wenzelm parents: 
44676diff
changeset | 99 | object Name | 
| 
098dd95349e7
more elaborate Node_Renderer, which paints node_name.theory only;
 wenzelm parents: 
44676diff
changeset | 100 |     {
 | 
| 54515 | 101 |       val empty = Name("")
 | 
| 46723 | 102 | |
| 65471 
05e5bffcf1d8
clarified loaded_theories: map to qualified theory name;
 wenzelm parents: 
65445diff
changeset | 103 | def loaded_theory(theory: String): Name = Name(theory, "", theory) | 
| 
05e5bffcf1d8
clarified loaded_theories: map to qualified theory name;
 wenzelm parents: 
65445diff
changeset | 104 | |
| 46723 | 105 | object Ordering extends scala.math.Ordering[Name] | 
| 106 |       {
 | |
| 107 | def compare(name1: Name, name2: Name): Int = name1.node compare name2.node | |
| 108 | } | |
| 44957 
098dd95349e7
more elaborate Node_Renderer, which paints node_name.theory only;
 wenzelm parents: 
44676diff
changeset | 109 | } | 
| 52887 | 110 | |
| 54515 | 111 | sealed case class Name(node: String, master_dir: String = "", theory: String = "") | 
| 44615 | 112 |     {
 | 
| 113 | override def hashCode: Int = node.hashCode | |
| 114 | override def equals(that: Any): Boolean = | |
| 115 |         that match {
 | |
| 116 | case other: Name => node == other.node | |
| 117 | case _ => false | |
| 118 | } | |
| 54509 
1f77110c94ef
maintain document model for all files, with document view for theory only, and special blob for non-theory files;
 wenzelm parents: 
54462diff
changeset | 119 | |
| 66849 | 120 | def path: Path = Path.explode(File.standard_path(node)) | 
| 66716 | 121 | |
| 67290 | 122 | def is_bibtex: Boolean = Bibtex.is_bibtex(node) | 
| 67293 | 123 | def is_bibtex_theory: Boolean = Bibtex.is_bibtex(theory) | 
| 67247 | 124 | |
| 59319 | 125 | def is_theory: Boolean = theory.nonEmpty | 
| 65409 | 126 | |
| 65439 | 127 | def theory_base_name: String = Long_Name.base_name(theory) | 
| 128 | ||
| 54510 | 129 | override def toString: String = if (is_theory) theory else node | 
| 56801 
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
 wenzelm parents: 
56746diff
changeset | 130 | |
| 
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
 wenzelm parents: 
56746diff
changeset | 131 | def map(f: String => String): Name = copy(f(node), f(master_dir), theory) | 
| 66195 | 132 | def map_theory(f: String => String): Name = copy(node, master_dir, f(theory)) | 
| 44615 | 133 | } | 
| 134 | ||
| 66714 | 135 | sealed case class Entry(name: Node.Name, header: Node.Header) | 
| 136 |     {
 | |
| 137 | override def toString: String = name.toString | |
| 138 | } | |
| 139 | ||
| 52887 | 140 | |
| 52977 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 141 | /* node overlays */ | 
| 52887 | 142 | |
| 143 | object Overlays | |
| 144 |     {
 | |
| 52976 | 145 | val empty = new Overlays(Multi_Map.empty) | 
| 52887 | 146 | } | 
| 147 | ||
| 52977 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 148 | final class Overlays private(rep: Multi_Map[Command, (String, List[String])]) | 
| 52887 | 149 |     {
 | 
| 150 | def commands: Set[Command] = rep.keySet | |
| 151 | def is_empty: Boolean = rep.isEmpty | |
| 52977 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 152 | def dest: List[(Command, (String, List[String]))] = rep.iterator.toList | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 153 | def insert(cmd: Command, fn: String, args: List[String]): Overlays = | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 154 | new Overlays(rep.insert(cmd, (fn, args))) | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 155 | def remove(cmd: Command, fn: String, args: List[String]): Overlays = | 
| 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 wenzelm parents: 
52976diff
changeset | 156 | new Overlays(rep.remove(cmd, (fn, args))) | 
| 55800 | 157 | |
| 158 |       override def toString: String = rep.mkString("Node.Overlays(", ",", ")")
 | |
| 52887 | 159 | } | 
| 160 | ||
| 161 | ||
| 162 | /* edits */ | |
| 163 | ||
| 44384 | 164 | sealed abstract class Edit[A, B] | 
| 44156 | 165 |     {
 | 
| 44383 | 166 | def foreach(f: A => Unit) | 
| 167 |       {
 | |
| 44156 | 168 |         this match {
 | 
| 44383 | 169 | case Edits(es) => es.foreach(f) | 
| 170 | case _ => | |
| 44156 | 171 | } | 
| 44383 | 172 | } | 
| 57621 | 173 | |
| 174 | def is_void: Boolean = | |
| 175 |         this match {
 | |
| 176 | case Edits(Nil) => true | |
| 177 | case _ => false | |
| 178 | } | |
| 44156 | 179 | } | 
| 56335 
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
 wenzelm parents: 
56314diff
changeset | 180 | case class Blob[A, B](blob: Document.Blob) extends Edit[A, B] | 
| 54562 
301a721af68b
clarified node edits sent to prover -- Clear/Blob only required for text edits within editor;
 wenzelm parents: 
54549diff
changeset | 181 | |
| 44384 | 182 | case class Edits[A, B](edits: List[A]) extends Edit[A, B] | 
| 48707 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 wenzelm parents: 
48706diff
changeset | 183 | case class Deps[A, B](header: Header) extends Edit[A, B] | 
| 52849 | 184 | case class Perspective[A, B](required: Boolean, visible: B, overlays: Overlays) extends Edit[A, B] | 
| 57610 | 185 | |
| 186 | ||
| 187 | /* perspective */ | |
| 188 | ||
| 52808 
143f225e50f5
allow explicit indication of required node: full eval, no prints;
 wenzelm parents: 
52568diff
changeset | 189 | type Perspective_Text = Perspective[Text.Edit, Text.Perspective] | 
| 52849 | 190 | type Perspective_Command = Perspective[Command.Edit, Command.Perspective] | 
| 44156 | 191 | |
| 57615 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 192 | val no_perspective_text: Perspective_Text = | 
| 57610 | 193 | Perspective(false, Text.Perspective.empty, Overlays.empty) | 
| 194 | ||
| 57615 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 195 | val no_perspective_command: Perspective_Command = | 
| 57614 | 196 | Perspective(false, Command.Perspective.empty, Overlays.empty) | 
| 197 | ||
| 64867 | 198 | def is_no_perspective_text(perspective: Perspective_Text): Boolean = | 
| 199 | !perspective.required && | |
| 200 | perspective.visible.is_empty && | |
| 201 | perspective.overlays.is_empty | |
| 202 | ||
| 57615 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 203 | def is_no_perspective_command(perspective: Perspective_Command): Boolean = | 
| 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 204 | !perspective.required && | 
| 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 205 | perspective.visible.is_empty && | 
| 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 206 | perspective.overlays.is_empty | 
| 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 207 | |
| 52887 | 208 | |
| 209 | /* commands */ | |
| 210 | ||
| 52901 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 211 | object Commands | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 212 |     {
 | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 213 | def apply(commands: Linear_Set[Command]): Commands = new Commands(commands) | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 214 | val empty: Commands = apply(Linear_Set.empty) | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 215 | |
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 216 | def starts(commands: Iterator[Command], offset: Text.Offset = 0) | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 217 | : Iterator[(Command, Text.Offset)] = | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 218 |       {
 | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 219 | var i = offset | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 220 |         for (command <- commands) yield {
 | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 221 | val start = i | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 222 | i += command.length | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 223 | (command, start) | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 224 | } | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 225 | } | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 226 | |
| 56398 
15d0821c8667
afford larger full_index, to save a few milliseconds during rendering (notably text_overview);
 wenzelm parents: 
56394diff
changeset | 227 | private val block_size = 256 | 
| 52901 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 228 | } | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 229 | |
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 230 | final class Commands private(val commands: Linear_Set[Command]) | 
| 38227 
6bbb42843b6e
concentrate structural document notions in document.scala;
 wenzelm parents: 
38220diff
changeset | 231 |     {
 | 
| 56314 | 232 | lazy val load_commands: List[Command] = | 
| 59319 | 233 | commands.iterator.filter(cmd => cmd.blobs.nonEmpty).toList | 
| 54462 | 234 | |
| 52901 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 235 | private lazy val full_index: (Array[(Command, Text.Offset)], Text.Range) = | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 236 |       {
 | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 237 | val blocks = new mutable.ListBuffer[(Command, Text.Offset)] | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 238 | var next_block = 0 | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 239 | var last_stop = 0 | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 240 |         for ((command, start) <- Commands.starts(commands.iterator)) {
 | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 241 | last_stop = start + command.length | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 242 |           while (last_stop + 1 > next_block) {
 | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 243 | blocks += (command -> start) | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 244 | next_block += Commands.block_size | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 245 | } | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 246 | } | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 247 | (blocks.toArray, Text.Range(0, last_stop)) | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 248 | } | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 249 | |
| 66043 | 250 | private def full_range: Text.Range = full_index._2 | 
| 52901 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 251 | |
| 56373 
0605d90be6fc
tuned signature -- more explicit iterator terminology;
 wenzelm parents: 
56372diff
changeset | 252 | def iterator(i: Text.Offset = 0): Iterator[(Command, Text.Offset)] = | 
| 52901 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 253 |       {
 | 
| 59319 | 254 |         if (commands.nonEmpty && full_range.contains(i)) {
 | 
| 52901 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 255 | val (cmd0, start0) = full_index._1(i / Commands.block_size) | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 256 |           Node.Commands.starts(commands.iterator(cmd0), start0) dropWhile {
 | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 257 | case (cmd, start) => start + cmd.length <= i } | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 258 | } | 
| 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 259 | else Iterator.empty | 
| 38227 
6bbb42843b6e
concentrate structural document notions in document.scala;
 wenzelm parents: 
38220diff
changeset | 260 | } | 
| 
6bbb42843b6e
concentrate structural document notions in document.scala;
 wenzelm parents: 
38220diff
changeset | 261 | } | 
| 57614 | 262 | |
| 263 | val empty: Node = new Node() | |
| 38151 | 264 | } | 
| 265 | ||
| 46712 | 266 | final class Node private( | 
| 56335 
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
 wenzelm parents: 
56314diff
changeset | 267 | val get_blob: Option[Document.Blob] = None, | 
| 57615 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 268 | val header: Node.Header = Node.no_header, | 
| 63584 
68751fe1c036
tuned signature -- prover-independence is presently theoretical;
 wenzelm parents: 
63579diff
changeset | 269 | val syntax: Option[Outer_Syntax] = None, | 
| 59372 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 270 | val text_perspective: Text.Perspective = Text.Perspective.empty, | 
| 57615 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 271 | val perspective: Node.Perspective_Command = Node.no_perspective_command, | 
| 52901 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 272 | _commands: Node.Commands = Node.Commands.empty) | 
| 38151 | 273 |   {
 | 
| 57615 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 274 | def is_empty: Boolean = | 
| 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 275 | get_blob.isEmpty && | 
| 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 276 | header == Node.no_header && | 
| 59372 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 277 | text_perspective.is_empty && | 
| 57615 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 278 | Node.is_no_perspective_command(perspective) && | 
| 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 279 | commands.isEmpty | 
| 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 280 | |
| 59702 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59695diff
changeset | 281 | def has_header: Boolean = header != Node.no_header | 
| 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 wenzelm parents: 
59695diff
changeset | 282 | |
| 57615 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 283 | def commands: Linear_Set[Command] = _commands.commands | 
| 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 284 | def load_commands: List[Command] = _commands.load_commands | 
| 64799 | 285 | def load_commands_changed(doc_blobs: Blobs): Boolean = | 
| 286 | load_commands.exists(_.blobs_changed(doc_blobs)) | |
| 57615 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 wenzelm parents: 
57614diff
changeset | 287 | |
| 64799 | 288 | def init_blob(blob: Blob): Node = new Node(get_blob = Some(blob.unchanged)) | 
| 55435 
662e0fd39823
maintain blob edits within history, which is important for Snapshot.convert/revert;
 wenzelm parents: 
55434diff
changeset | 289 | |
| 48707 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 wenzelm parents: 
48706diff
changeset | 290 | def update_header(new_header: Node.Header): Node = | 
| 59372 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 291 | new Node(get_blob, new_header, syntax, text_perspective, perspective, _commands) | 
| 59077 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 wenzelm parents: 
57976diff
changeset | 292 | |
| 63584 
68751fe1c036
tuned signature -- prover-independence is presently theoretical;
 wenzelm parents: 
63579diff
changeset | 293 | def update_syntax(new_syntax: Option[Outer_Syntax]): Node = | 
| 59372 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 294 | new Node(get_blob, header, new_syntax, text_perspective, perspective, _commands) | 
| 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 295 | |
| 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 296 | def update_perspective( | 
| 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 297 | new_text_perspective: Text.Perspective, | 
| 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 298 | new_perspective: Node.Perspective_Command): Node = | 
| 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 299 | new Node(get_blob, header, syntax, new_text_perspective, new_perspective, _commands) | 
| 46680 | 300 | |
| 59372 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 301 | def edit_perspective: Node.Edit[Text.Edit, Text.Perspective] = | 
| 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 302 | Node.Perspective(perspective.required, text_perspective, perspective.overlays) | 
| 46680 | 303 | |
| 59372 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 304 | def same_perspective( | 
| 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 305 | other_text_perspective: Text.Perspective, | 
| 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 306 | other_perspective: Node.Perspective_Command): Boolean = | 
| 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 307 | text_perspective == other_text_perspective && | 
| 52849 | 308 | perspective.required == other_perspective.required && | 
| 309 | perspective.visible.same(other_perspective.visible) && | |
| 310 | perspective.overlays == other_perspective.overlays | |
| 52808 
143f225e50f5
allow explicit indication of required node: full eval, no prints;
 wenzelm parents: 
52568diff
changeset | 311 | |
| 52901 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 312 | def update_commands(new_commands: Linear_Set[Command]): Node = | 
| 52918 
038458a4d11b
proper low-level comparison -- heed warning by Scala compiler;
 wenzelm parents: 
52901diff
changeset | 313 | if (new_commands eq _commands.commands) this | 
| 59372 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 314 | else | 
| 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 315 | new Node(get_blob, header, syntax, text_perspective, perspective, | 
| 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 wenzelm parents: 
59319diff
changeset | 316 | Node.Commands(new_commands)) | 
| 38151 | 317 | |
| 56373 
0605d90be6fc
tuned signature -- more explicit iterator terminology;
 wenzelm parents: 
56372diff
changeset | 318 | def command_iterator(i: Text.Offset = 0): Iterator[(Command, Text.Offset)] = | 
| 
0605d90be6fc
tuned signature -- more explicit iterator terminology;
 wenzelm parents: 
56372diff
changeset | 319 | _commands.iterator(i) | 
| 38151 | 320 | |
| 56373 
0605d90be6fc
tuned signature -- more explicit iterator terminology;
 wenzelm parents: 
56372diff
changeset | 321 | def command_iterator(range: Text.Range): Iterator[(Command, Text.Offset)] = | 
| 
0605d90be6fc
tuned signature -- more explicit iterator terminology;
 wenzelm parents: 
56372diff
changeset | 322 |       command_iterator(range.start) takeWhile { case (_, start) => start < range.stop }
 | 
| 38151 | 323 | |
| 38879 
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
 wenzelm parents: 
38872diff
changeset | 324 | def command_start(cmd: Command): Option[Text.Offset] = | 
| 52901 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 wenzelm parents: 
52900diff
changeset | 325 | Node.Commands.starts(commands.iterator).find(_._1 == cmd).map(_._2) | 
| 67247 | 326 | |
| 67251 | 327 | def source: String = | 
| 67247 | 328 |       get_blob match {
 | 
| 67265 
f32287c95432
store full blob source for the sake of markup_to_XML;
 wenzelm parents: 
67264diff
changeset | 329 | case Some(blob) => blob.source | 
| 67247 | 330 |         case None => command_iterator(0).map({ case (cmd, _) => cmd.source }).mkString
 | 
| 331 | } | |
| 38151 | 332 | } | 
| 333 | ||
| 334 | ||
| 46723 | 335 | /* development graph */ | 
| 336 | ||
| 337 | object Nodes | |
| 338 |   {
 | |
| 339 | val empty: Nodes = new Nodes(Graph.empty(Node.Name.Ordering)) | |
| 340 | } | |
| 341 | ||
| 342 | final class Nodes private(graph: Graph[Node.Name, Node]) | |
| 343 |   {
 | |
| 344 | def apply(name: Node.Name): Node = | |
| 345 | graph.default_node(name, Node.empty).get_node(name) | |
| 346 | ||
| 57619 | 347 | def is_hidden(name: Node.Name): Boolean = | 
| 348 |     {
 | |
| 349 | val graph1 = graph.default_node(name, Node.empty) | |
| 350 | graph1.is_maximal(name) && graph1.get_node(name).is_empty | |
| 351 | } | |
| 57617 | 352 | |
| 67112 | 353 | def purge(pred: Node.Name => Boolean): Option[Nodes] = | 
| 354 |       graph.keys_iterator.filter(pred).toList match {
 | |
| 355 | case Nil => None | |
| 356 | case del => Some(new Nodes((graph /: del)(_.del_node(_)))) | |
| 357 | } | |
| 67110 
3156faac30a7
purge hidden nodes more thoroughly: is_hidden may become true only later;
 wenzelm parents: 
67014diff
changeset | 358 | |
| 46723 | 359 | def + (entry: (Node.Name, Node)): Nodes = | 
| 360 |     {
 | |
| 361 | val (name, node) = entry | |
| 59695 | 362 | val imports = node.header.imports.map(_._1) | 
| 46723 | 363 | val graph1 = | 
| 46739 
6024353549ca
clarified document nodes (full import graph) vs. node_status (non-preloaded theories);
 wenzelm parents: 
46737diff
changeset | 364 | (graph.default_node(name, Node.empty) /: imports)((g, p) => g.default_node(p, Node.empty)) | 
| 46723 | 365 | val graph2 = (graph1 /: graph1.imm_preds(name))((g, dep) => g.del_edge(dep, name)) | 
| 46739 
6024353549ca
clarified document nodes (full import graph) vs. node_status (non-preloaded theories);
 wenzelm parents: 
46737diff
changeset | 366 | val graph3 = (graph2 /: imports)((g, dep) => g.add_edge(dep, name)) | 
| 67110 
3156faac30a7
purge hidden nodes more thoroughly: is_hidden may become true only later;
 wenzelm parents: 
67014diff
changeset | 367 | new Nodes(graph3.map_node(name, _ => node)) | 
| 46723 | 368 | } | 
| 369 | ||
| 56372 
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
 wenzelm parents: 
56354diff
changeset | 370 | def iterator: Iterator[(Node.Name, Node)] = | 
| 
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
 wenzelm parents: 
56354diff
changeset | 371 |       graph.iterator.map({ case (name, (node, _)) => (name, node) })
 | 
| 46723 | 372 | |
| 64799 | 373 | def commands_loading(file_name: Node.Name): List[Command] = | 
| 54528 | 374 |       (for {
 | 
| 56372 
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
 wenzelm parents: 
56354diff
changeset | 375 | (_, node) <- iterator | 
| 56314 | 376 | cmd <- node.load_commands.iterator | 
| 54530 
2c1440f70028
ranges of thy_load commands count as visible within perspective;
 wenzelm parents: 
54528diff
changeset | 377 | name <- cmd.blobs_names.iterator | 
| 54528 | 378 | if name == file_name | 
| 379 | } yield cmd).toList | |
| 380 | ||
| 46942 
f5c2d66faa04
basic support for outer syntax keywords in theory header;
 wenzelm parents: 
46941diff
changeset | 381 | def descendants(names: List[Node.Name]): List[Node.Name] = graph.all_succs(names) | 
| 46723 | 382 | def topological_order: List[Node.Name] = graph.topological_order | 
| 56337 | 383 | |
| 384 |     override def toString: String = topological_order.mkString("Nodes(", ",", ")")
 | |
| 46723 | 385 | } | 
| 386 | ||
| 387 | ||
| 38424 | 388 | |
| 389 | /** versioning **/ | |
| 390 | ||
| 391 | /* particular document versions */ | |
| 34485 | 392 | |
| 38417 | 393 | object Version | 
| 394 |   {
 | |
| 46681 | 395 | val init: Version = new Version() | 
| 59077 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 wenzelm parents: 
57976diff
changeset | 396 | def make(nodes: Nodes): Version = new Version(Document_ID.make(), nodes) | 
| 67112 | 397 | |
| 398 | def purge(f: Version => Option[Version], versions: Map[Document_ID.Version, Version]) | |
| 399 | : Map[Document_ID.Version, Version] = | |
| 400 | (versions /: (for ((id, v) <- versions.iterator; v1 <- f(v)) yield (id, v1)))(_ + _) | |
| 38417 | 401 | } | 
| 402 | ||
| 46712 | 403 | final class Version private( | 
| 52530 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 wenzelm parents: 
52527diff
changeset | 404 | val id: Document_ID.Version = Document_ID.none, | 
| 46723 | 405 | val nodes: Nodes = Nodes.empty) | 
| 46941 | 406 |   {
 | 
| 55777 | 407 |     override def toString: String = "Version(" + id + ")"
 | 
| 67110 
3156faac30a7
purge hidden nodes more thoroughly: is_hidden may become true only later;
 wenzelm parents: 
67014diff
changeset | 408 | |
| 
3156faac30a7
purge hidden nodes more thoroughly: is_hidden may become true only later;
 wenzelm parents: 
67014diff
changeset | 409 | def purge_hidden: Option[Version] = | 
| 67112 | 410 | nodes.purge(nodes.is_hidden(_)).map(new Version(id, _)) | 
| 411 | ||
| 412 | def purge_blobs(blobs: Set[Node.Name]): Option[Version] = | |
| 413 | nodes.purge(name => nodes(name).get_blob.isDefined && !blobs.contains(name)). | |
| 414 | map(new Version(id, _)) | |
| 46941 | 415 | } | 
| 34660 | 416 | |
| 34859 | 417 | |
| 38424 | 418 | /* changes of plain text, eventually resulting in document edits */ | 
| 38227 
6bbb42843b6e
concentrate structural document notions in document.scala;
 wenzelm parents: 
38220diff
changeset | 419 | |
| 
6bbb42843b6e
concentrate structural document notions in document.scala;
 wenzelm parents: 
38220diff
changeset | 420 | object Change | 
| 
6bbb42843b6e
concentrate structural document notions in document.scala;
 wenzelm parents: 
38220diff
changeset | 421 |   {
 | 
| 46678 | 422 | val init: Change = new Change() | 
| 423 | ||
| 424 | def make(previous: Future[Version], edits: List[Edit_Text], version: Future[Version]): Change = | |
| 57620 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 wenzelm parents: 
57619diff
changeset | 425 | new Change(Some(previous), edits.reverse, version) | 
| 38227 
6bbb42843b6e
concentrate structural document notions in document.scala;
 wenzelm parents: 
38220diff
changeset | 426 | } | 
| 
6bbb42843b6e
concentrate structural document notions in document.scala;
 wenzelm parents: 
38220diff
changeset | 427 | |
| 46712 | 428 | final class Change private( | 
| 46677 | 429 | val previous: Option[Future[Version]] = Some(Future.value(Version.init)), | 
| 57620 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 wenzelm parents: 
57619diff
changeset | 430 | val rev_edits: List[Edit_Text] = Nil, | 
| 46677 | 431 | val version: Future[Version] = Future.value(Version.init)) | 
| 38227 
6bbb42843b6e
concentrate structural document notions in document.scala;
 wenzelm parents: 
38220diff
changeset | 432 |   {
 | 
| 44672 | 433 | def is_finished: Boolean = | 
| 434 |       (previous match { case None => true case Some(future) => future.is_finished }) &&
 | |
| 435 | version.is_finished | |
| 436 | ||
| 46678 | 437 | def truncate: Change = new Change(None, Nil, version) | 
| 38227 
6bbb42843b6e
concentrate structural document notions in document.scala;
 wenzelm parents: 
38220diff
changeset | 438 | } | 
| 
6bbb42843b6e
concentrate structural document notions in document.scala;
 wenzelm parents: 
38220diff
changeset | 439 | |
| 
6bbb42843b6e
concentrate structural document notions in document.scala;
 wenzelm parents: 
38220diff
changeset | 440 | |
| 38841 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 441 | /* history navigation */ | 
| 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 442 | |
| 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 443 | object History | 
| 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 444 |   {
 | 
| 46679 | 445 | val init: History = new History() | 
| 38841 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 446 | } | 
| 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 447 | |
| 46712 | 448 | final class History private( | 
| 46679 | 449 | val undo_list: List[Change] = List(Change.init)) // non-empty list | 
| 38841 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 450 |   {
 | 
| 67114 | 451 |     override def toString: String = "History(" + undo_list.length + ")"
 | 
| 452 | ||
| 46679 | 453 | def tip: Change = undo_list.head | 
| 454 | def + (change: Change): History = new History(change :: undo_list) | |
| 38841 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 455 | |
| 46679 | 456 | def prune(check: Change => Boolean, retain: Int): Option[(List[Change], History)] = | 
| 457 |     {
 | |
| 458 | val n = undo_list.iterator.zipWithIndex.find(p => check(p._1)).get._2 + 1 | |
| 459 | val (retained, dropped) = undo_list.splitAt(n max retain) | |
| 460 | ||
| 461 |       retained.splitAt(retained.length - 1) match {
 | |
| 462 | case (prefix, List(last)) => Some(dropped, new History(prefix ::: List(last.truncate))) | |
| 463 | case _ => None | |
| 464 | } | |
| 465 | } | |
| 38841 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 466 | } | 
| 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 467 | |
| 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 468 | |
| 55820 
61869776ce1f
tuned signature -- more explicit Document.Elements;
 wenzelm parents: 
55801diff
changeset | 469 | /* snapshot */ | 
| 38424 | 470 | |
| 52972 | 471 | object Snapshot | 
| 472 |   {
 | |
| 473 | val init = State.init.snapshot() | |
| 474 | } | |
| 475 | ||
| 38424 | 476 | abstract class Snapshot | 
| 477 |   {
 | |
| 64798 | 478 | def state: State | 
| 479 | def version: Version | |
| 480 | def is_outdated: Boolean | |
| 55649 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 wenzelm parents: 
55620diff
changeset | 481 | |
| 38427 | 482 | def convert(i: Text.Offset): Text.Offset | 
| 52889 
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
 wenzelm parents: 
52887diff
changeset | 483 | def revert(i: Text.Offset): Text.Offset | 
| 39177 
0468964aec11
simplified Markup_Tree.select: Stream instead of Iterator (again), explicit Option instead of default;
 wenzelm parents: 
38976diff
changeset | 484 | def convert(range: Text.Range): Text.Range | 
| 
0468964aec11
simplified Markup_Tree.select: Stream instead of Iterator (again), explicit Option instead of default;
 wenzelm parents: 
38976diff
changeset | 485 | def revert(range: Text.Range): Text.Range | 
| 52972 | 486 | |
| 64798 | 487 | def node_name: Node.Name | 
| 488 | def node: Node | |
| 66379 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66195diff
changeset | 489 | def node_consolidated: Boolean | 
| 66040 | 490 | |
| 64799 | 491 | def commands_loading: List[Command] | 
| 492 | def commands_loading_ranges(pred: Node.Name => Boolean): List[Text.Range] | |
| 65199 
6bd7081f8319
clarified current_command: index refers to node content, negative index means first command;
 wenzelm parents: 
65196diff
changeset | 493 | def current_command(other_node_name: Node.Name, offset: Text.Offset): Option[Command] | 
| 55649 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 wenzelm parents: 
55620diff
changeset | 494 | |
| 66043 | 495 | def markup_to_XML(range: Text.Range, elements: Markup.Elements): XML.Body | 
| 66040 | 496 | |
| 64665 | 497 | def find_command(id: Document_ID.Generic): Option[(Node, Command)] | 
| 498 | def find_command_position(id: Document_ID.Generic, offset: Symbol.Offset) | |
| 499 | : Option[Line.Node_Position] | |
| 500 | ||
| 55651 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 wenzelm parents: 
55650diff
changeset | 501 | def cumulate[A]( | 
| 55649 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 wenzelm parents: 
55620diff
changeset | 502 | range: Text.Range, | 
| 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 wenzelm parents: 
55620diff
changeset | 503 | info: A, | 
| 56743 | 504 | elements: Markup.Elements, | 
| 56354 
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
 wenzelm parents: 
56337diff
changeset | 505 | result: List[Command.State] => (A, Text.Markup) => Option[A], | 
| 55651 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 wenzelm parents: 
55650diff
changeset | 506 | status: Boolean = false): List[Text.Info[A]] | 
| 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 wenzelm parents: 
55650diff
changeset | 507 | |
| 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 wenzelm parents: 
55650diff
changeset | 508 | def select[A]( | 
| 55649 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 wenzelm parents: 
55620diff
changeset | 509 | range: Text.Range, | 
| 56743 | 510 | elements: Markup.Elements, | 
| 56354 
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
 wenzelm parents: 
56337diff
changeset | 511 | result: List[Command.State] => Text.Markup => Option[A], | 
| 55651 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 wenzelm parents: 
55650diff
changeset | 512 | status: Boolean = false): List[Text.Info[A]] | 
| 65332 | 513 | |
| 514 | def command_results(range: Text.Range): Command.Results | |
| 515 | def command_results(command: Command): Command.Results | |
| 38424 | 516 | } | 
| 517 | ||
| 55820 
61869776ce1f
tuned signature -- more explicit Document.Elements;
 wenzelm parents: 
55801diff
changeset | 518 | |
| 64814 | 519 | /* model */ | 
| 520 | ||
| 65221 | 521 | trait Session | 
| 522 |   {
 | |
| 523 | def resources: Resources | |
| 524 | } | |
| 525 | ||
| 64814 | 526 | trait Model | 
| 527 |   {
 | |
| 528 | def session: Session | |
| 64827 
4ef1eb75f1cd
uniform Document.Model.node_edits (without void edits);
 wenzelm parents: 
64819diff
changeset | 529 | def is_stable: Boolean | 
| 
4ef1eb75f1cd
uniform Document.Model.node_edits (without void edits);
 wenzelm parents: 
64819diff
changeset | 530 | def snapshot(): Snapshot | 
| 64814 | 531 | |
| 65356 | 532 | def node_name: Node.Name | 
| 64814 | 533 | def is_theory: Boolean = node_name.is_theory | 
| 534 | override def toString: String = node_name.toString | |
| 535 | ||
| 67014 | 536 | def get_text(range: Text.Range): Option[String] | 
| 66114 | 537 | |
| 64815 | 538 | def node_required: Boolean | 
| 65356 | 539 | def get_blob: Option[Blob] | 
| 67247 | 540 | def is_bibtex: Boolean = node_name.is_bibtex | 
| 67309 | 541 | def is_bibtex_theory: Boolean = node_name.is_bibtex_theory | 
| 66150 | 542 | def bibtex_entries: List[Text.Info[String]] | 
| 64815 | 543 | |
| 64827 
4ef1eb75f1cd
uniform Document.Model.node_edits (without void edits);
 wenzelm parents: 
64819diff
changeset | 544 | def node_edits( | 
| 64867 | 545 | node_header: Node.Header, | 
| 546 | text_edits: List[Text.Edit], | |
| 547 | perspective: Node.Perspective_Text): List[Edit_Text] = | |
| 64827 
4ef1eb75f1cd
uniform Document.Model.node_edits (without void edits);
 wenzelm parents: 
64819diff
changeset | 548 |     {
 | 
| 
4ef1eb75f1cd
uniform Document.Model.node_edits (without void edits);
 wenzelm parents: 
64819diff
changeset | 549 | val edits: List[Node.Edit[Text.Edit, Text.Perspective]] = | 
| 
4ef1eb75f1cd
uniform Document.Model.node_edits (without void edits);
 wenzelm parents: 
64819diff
changeset | 550 |         get_blob match {
 | 
| 
4ef1eb75f1cd
uniform Document.Model.node_edits (without void edits);
 wenzelm parents: 
64819diff
changeset | 551 | case None => | 
| 
4ef1eb75f1cd
uniform Document.Model.node_edits (without void edits);
 wenzelm parents: 
64819diff
changeset | 552 | List( | 
| 65356 | 553 | Node.Deps( | 
| 66773 | 554 |                 if (session.resources.session_base.loaded_theory(node_name)) {
 | 
| 555 | node_header.append_errors( | |
| 556 |                     List("Cannot update finished theory " + quote(node_name.theory)))
 | |
| 557 | } | |
| 64827 
4ef1eb75f1cd
uniform Document.Model.node_edits (without void edits);
 wenzelm parents: 
64819diff
changeset | 558 | else node_header), | 
| 65356 | 559 | Node.Edits(text_edits), perspective) | 
| 560 | case Some(blob) => List(Node.Blob(blob), Node.Edits(text_edits)) | |
| 64827 
4ef1eb75f1cd
uniform Document.Model.node_edits (without void edits);
 wenzelm parents: 
64819diff
changeset | 561 | } | 
| 
4ef1eb75f1cd
uniform Document.Model.node_edits (without void edits);
 wenzelm parents: 
64819diff
changeset | 562 | edits.flatMap(edit => if (edit.is_void) None else Some(node_name -> edit)) | 
| 
4ef1eb75f1cd
uniform Document.Model.node_edits (without void edits);
 wenzelm parents: 
64819diff
changeset | 563 | } | 
| 64814 | 564 | } | 
| 565 | ||
| 566 | ||
| 55820 
61869776ce1f
tuned signature -- more explicit Document.Elements;
 wenzelm parents: 
55801diff
changeset | 567 | /** global state -- document structure, execution process, editing history **/ | 
| 
61869776ce1f
tuned signature -- more explicit Document.Elements;
 wenzelm parents: 
55801diff
changeset | 568 | |
| 52563 | 569 | type Assign_Update = | 
| 570 | List[(Document_ID.Command, List[Document_ID.Exec])] // update of exec state assignment | |
| 44476 
e8a87398f35d
propagate information about last command with exec state assignment through document model;
 wenzelm parents: 
44475diff
changeset | 571 | |
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 572 | object State | 
| 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 573 |   {
 | 
| 38373 | 574 | class Fail(state: State) extends Exception | 
| 575 | ||
| 44479 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 wenzelm parents: 
44477diff
changeset | 576 | object Assignment | 
| 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 wenzelm parents: 
44477diff
changeset | 577 |     {
 | 
| 46683 | 578 | val init: Assignment = new Assignment() | 
| 44479 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 wenzelm parents: 
44477diff
changeset | 579 | } | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 580 | |
| 46712 | 581 | final class Assignment private( | 
| 52530 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 wenzelm parents: 
52527diff
changeset | 582 | val command_execs: Map[Document_ID.Command, List[Document_ID.Exec]] = Map.empty, | 
| 46677 | 583 | val is_finished: Boolean = false) | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 584 |     {
 | 
| 67114 | 585 |       override def toString: String = "Assignment(" + command_execs.size + "," + is_finished + ")"
 | 
| 586 | ||
| 44477 | 587 |       def check_finished: Assignment = { require(is_finished); this }
 | 
| 47388 
fe4b245af74c
discontinued obsolete last_execs (cf. cd3ab7625519);
 wenzelm parents: 
46997diff
changeset | 588 | def unfinished: Assignment = new Assignment(command_execs, false) | 
| 44479 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 wenzelm parents: 
44477diff
changeset | 589 | |
| 52563 | 590 | def assign(update: Assign_Update): Assignment = | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 591 |       {
 | 
| 38976 
a4a465dc89d9
Document.State.Assignment: eliminated promise in favour of plain values -- signalling is done via event bus in Session;
 wenzelm parents: 
38885diff
changeset | 592 | require(!is_finished) | 
| 44479 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 wenzelm parents: 
44477diff
changeset | 593 | val command_execs1 = | 
| 52563 | 594 |           (command_execs /: update) {
 | 
| 595 | case (res, (command_id, exec_ids)) => | |
| 596 | if (exec_ids.isEmpty) res - command_id | |
| 597 | else res + (command_id -> exec_ids) | |
| 44479 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 wenzelm parents: 
44477diff
changeset | 598 | } | 
| 47388 
fe4b245af74c
discontinued obsolete last_execs (cf. cd3ab7625519);
 wenzelm parents: 
46997diff
changeset | 599 | new Assignment(command_execs1, true) | 
| 38150 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: 
37849diff
changeset | 600 | } | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 601 | } | 
| 46682 | 602 | |
| 603 | val init: State = | |
| 52563 | 604 | State().define_version(Version.init, Assignment.init).assign(Version.init.id, Nil)._2 | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 605 | } | 
| 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 606 | |
| 46712 | 607 | final case class State private( | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 608 | /*reachable versions*/ | 
| 60215 | 609 | versions: Map[Document_ID.Version, Version] = Map.empty, | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 610 | /*inlined auxiliary files*/ | 
| 60215 | 611 | blobs: Set[SHA1.Digest] = Set.empty, | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 612 | /*static markup from define_command*/ | 
| 60215 | 613 | commands: Map[Document_ID.Command, Command.State] = Map.empty, | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 614 | /*dynamic markup from execution*/ | 
| 60215 | 615 | execs: Map[Document_ID.Exec, Command.State] = Map.empty, | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 616 | /*command-exec assignment for each version*/ | 
| 60215 | 617 | assignments: Map[Document_ID.Version, State.Assignment] = Map.empty, | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 618 | /*commands with markup produced by other commands (imm_succs)*/ | 
| 60215 | 619 | commands_redirection: Graph[Document_ID.Command, Unit] = Graph.long, | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 620 | /*explicit (linear) history*/ | 
| 60215 | 621 | history: History = History.init, | 
| 57976 
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
 wenzelm parents: 
57842diff
changeset | 622 | /*intermediate state between remove_versions/removed_versions*/ | 
| 60215 | 623 | removing_versions: Boolean = false) | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 624 |   {
 | 
| 38373 | 625 | private def fail[A]: A = throw new State.Fail(this) | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 626 | |
| 44479 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 wenzelm parents: 
44477diff
changeset | 627 | def define_version(version: Version, assignment: State.Assignment): State = | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 628 |     {
 | 
| 38417 | 629 | val id = version.id | 
| 630 | copy(versions = versions + (id -> version), | |
| 44479 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 wenzelm parents: 
44477diff
changeset | 631 | assignments = assignments + (id -> assignment.unfinished)) | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 632 | } | 
| 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 633 | |
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 634 | def define_blob(digest: SHA1.Digest): State = copy(blobs = blobs + digest) | 
| 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 635 | def defined_blob(digest: SHA1.Digest): Boolean = blobs.contains(digest) | 
| 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 636 | |
| 38373 | 637 | def define_command(command: Command): State = | 
| 638 |     {
 | |
| 639 | val id = command.id | |
| 49414 | 640 | copy(commands = commands + (id -> command.init_state)) | 
| 38373 | 641 | } | 
| 642 | ||
| 52530 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 wenzelm parents: 
52527diff
changeset | 643 | def defined_command(id: Document_ID.Command): Boolean = commands.isDefinedAt(id) | 
| 44582 | 644 | |
| 52530 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 wenzelm parents: 
52527diff
changeset | 645 | def the_version(id: Document_ID.Version): Version = versions.getOrElse(id, fail) | 
| 52564 
4e855c120f6a
tuned signature -- NB: Command.read is actually part of Command.eval;
 wenzelm parents: 
52563diff
changeset | 646 | def the_static_state(id: Document_ID.Command): Command.State = commands.getOrElse(id, fail) | 
| 
4e855c120f6a
tuned signature -- NB: Command.read is actually part of Command.eval;
 wenzelm parents: 
52563diff
changeset | 647 | def the_dynamic_state(id: Document_ID.Exec): Command.State = execs.getOrElse(id, fail) | 
| 52563 | 648 | def the_assignment(version: Version): State.Assignment = assignments.getOrElse(version.id, fail) | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 649 | |
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 650 | private def self_id(st: Command.State)(id: Document_ID.Generic): Boolean = | 
| 56295 
a40e67ce4f84
clarified valid_id: always standardize towards static command.id;
 wenzelm parents: 
56176diff
changeset | 651 | id == st.command.id || | 
| 
a40e67ce4f84
clarified valid_id: always standardize towards static command.id;
 wenzelm parents: 
56176diff
changeset | 652 |       (execs.get(id) match { case Some(st1) => st1.command.id == st.command.id case None => false })
 | 
| 
a40e67ce4f84
clarified valid_id: always standardize towards static command.id;
 wenzelm parents: 
56176diff
changeset | 653 | |
| 56746 | 654 | private def other_id(id: Document_ID.Generic) | 
| 63032 
e0fa59bbc956
reactivated other_id reports (see also db929027e701, 8eda56033203);
 wenzelm parents: 
63020diff
changeset | 655 | : Option[(Symbol.Text_Chunk.Id, Symbol.Text_Chunk)] = | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 656 | (execs.get(id) orElse commands.get(id)).map(st => | 
| 56746 | 657 | ((Symbol.Text_Chunk.Id(st.command.id), st.command.chunk))) | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 658 | |
| 56475 | 659 | private def redirection(st: Command.State): Graph[Document_ID.Command, Unit] = | 
| 660 |       (commands_redirection /: st.markups.redirection_iterator)({ case (graph, id) =>
 | |
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 661 | graph.default_node(id, ()).default_node(st.command.id, ()).add_edge(id, st.command.id) }) | 
| 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 662 | |
| 52531 | 663 | def accumulate(id: Document_ID.Generic, message: XML.Elem): (Command.State, State) = | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 664 |     {
 | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 665 |       execs.get(id) match {
 | 
| 44446 | 666 | case Some(st) => | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 667 | val new_st = st.accumulate(self_id(st), other_id _, message) | 
| 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 668 | val execs1 = execs + (id -> new_st) | 
| 56475 | 669 | (new_st, copy(execs = execs1, commands_redirection = redirection(new_st))) | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 670 | case None => | 
| 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 671 |           commands.get(id) match {
 | 
| 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 672 | case Some(st) => | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 673 | val new_st = st.accumulate(self_id(st), other_id _, message) | 
| 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 674 | val commands1 = commands + (id -> new_st) | 
| 56475 | 675 | (new_st, copy(commands = commands1, commands_redirection = redirection(new_st))) | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 676 | case None => fail | 
| 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 677 | } | 
| 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 678 | } | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 679 | } | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 680 | |
| 52563 | 681 | def assign(id: Document_ID.Version, update: Assign_Update): (List[Command], State) = | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 682 |     {
 | 
| 38417 | 683 | val version = the_version(id) | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 684 | |
| 52566 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52564diff
changeset | 685 | def upd(exec_id: Document_ID.Exec, st: Command.State) | 
| 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52564diff
changeset | 686 | : Option[(Document_ID.Exec, Command.State)] = | 
| 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52564diff
changeset | 687 | if (execs.isDefinedAt(exec_id)) None else Some(exec_id -> st) | 
| 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52564diff
changeset | 688 | |
| 44543 | 689 | val (changed_commands, new_execs) = | 
| 52563 | 690 |         ((Nil: List[Command], execs) /: update) {
 | 
| 52566 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52564diff
changeset | 691 | case ((commands1, execs1), (command_id, exec)) => | 
| 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52564diff
changeset | 692 | val st = the_static_state(command_id) | 
| 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52564diff
changeset | 693 | val command = st.command | 
| 52527 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 wenzelm parents: 
52508diff
changeset | 694 | val commands2 = command :: commands1 | 
| 44543 | 695 | val execs2 = | 
| 696 |               exec match {
 | |
| 52527 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 wenzelm parents: 
52508diff
changeset | 697 | case Nil => execs1 | 
| 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 wenzelm parents: 
52508diff
changeset | 698 | case eval_id :: print_ids => | 
| 52566 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52564diff
changeset | 699 | execs1 ++ upd(eval_id, st) ++ | 
| 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 wenzelm parents: 
52564diff
changeset | 700 | (for (id <- print_ids; up <- upd(id, command.empty_state)) yield up) | 
| 44543 | 701 | } | 
| 702 | (commands2, execs2) | |
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 703 | } | 
| 52563 | 704 | val new_assignment = the_assignment(version).assign(update) | 
| 43722 | 705 | val new_state = copy(assignments = assignments + (id -> new_assignment), execs = new_execs) | 
| 44476 
e8a87398f35d
propagate information about last command with exec state assignment through document model;
 wenzelm parents: 
44475diff
changeset | 706 | |
| 44543 | 707 | (changed_commands, new_state) | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 708 | } | 
| 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 709 | |
| 38417 | 710 | def is_assigned(version: Version): Boolean = | 
| 43722 | 711 |       assignments.get(version.id) match {
 | 
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 712 | case Some(assgn) => assgn.is_finished | 
| 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 713 | case None => false | 
| 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 714 | } | 
| 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 715 | |
| 44436 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 wenzelm parents: 
44385diff
changeset | 716 | def is_stable(change: Change): Boolean = | 
| 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 wenzelm parents: 
44385diff
changeset | 717 | change.is_finished && is_assigned(change.version.get_finished) | 
| 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 wenzelm parents: 
44385diff
changeset | 718 | |
| 46944 
9fc22eb6408c
more recent recent_syntax, e.g. relevant for document rendering during startup;
 wenzelm parents: 
46942diff
changeset | 719 | def recent_finished: Change = history.undo_list.find(_.is_finished) getOrElse fail | 
| 44672 | 720 | def recent_stable: Change = history.undo_list.find(is_stable) getOrElse fail | 
| 60933 
6d03e05ef041
more robust access to stable tip version: take all pending edits into account, don't assume model for current buffer;
 wenzelm parents: 
60916diff
changeset | 721 | def stable_tip_version: Option[Version] = | 
| 
6d03e05ef041
more robust access to stable tip version: take all pending edits into account, don't assume model for current buffer;
 wenzelm parents: 
60916diff
changeset | 722 | if (is_stable(history.tip)) Some(history.tip.version.get_finished) else None | 
| 44436 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 wenzelm parents: 
44385diff
changeset | 723 | |
| 44446 | 724 | def continue_history( | 
| 56711 | 725 | previous: Future[Version], | 
| 726 | edits: List[Edit_Text], | |
| 727 | version: Future[Version]): State = | |
| 38841 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 728 |     {
 | 
| 46678 | 729 | val change = Change.make(previous, edits, version) | 
| 56711 | 730 | copy(history = history + change) | 
| 38841 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 731 | } | 
| 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 732 | |
| 57976 
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
 wenzelm parents: 
57842diff
changeset | 733 | def remove_versions(retain: Int = 0): (List[Version], State) = | 
| 44672 | 734 |     {
 | 
| 46679 | 735 |       history.prune(is_stable, retain) match {
 | 
| 736 | case Some((dropped, history1)) => | |
| 57976 
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
 wenzelm parents: 
57842diff
changeset | 737 | val old_versions = dropped.map(change => change.version.get_finished) | 
| 59319 | 738 | val removing = old_versions.nonEmpty | 
| 57976 
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
 wenzelm parents: 
57842diff
changeset | 739 | val state1 = copy(history = history1, removing_versions = removing) | 
| 
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
 wenzelm parents: 
57842diff
changeset | 740 | (old_versions, state1) | 
| 46679 | 741 | case None => fail | 
| 44672 | 742 | } | 
| 743 | } | |
| 744 | ||
| 52530 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 wenzelm parents: 
52527diff
changeset | 745 | def removed_versions(removed: List[Document_ID.Version]): State = | 
| 44676 | 746 |     {
 | 
| 67112 | 747 | val versions1 = Version.purge(_.purge_hidden, versions -- removed) | 
| 67110 
3156faac30a7
purge hidden nodes more thoroughly: is_hidden may become true only later;
 wenzelm parents: 
67014diff
changeset | 748 | |
| 44676 | 749 | val assignments1 = assignments -- removed | 
| 67112 | 750 | var blobs1_names = Set.empty[Node.Name] | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 751 | var blobs1 = Set.empty[SHA1.Digest] | 
| 52530 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 wenzelm parents: 
52527diff
changeset | 752 | var commands1 = Map.empty[Document_ID.Command, Command.State] | 
| 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 wenzelm parents: 
52527diff
changeset | 753 | var execs1 = Map.empty[Document_ID.Exec, Command.State] | 
| 44676 | 754 |       for {
 | 
| 67112 | 755 | (version_id, version) <- versions1.iterator | 
| 46997 | 756 | command_execs = assignments1(version_id).command_execs | 
| 56372 
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
 wenzelm parents: 
56354diff
changeset | 757 | (_, node) <- version.nodes.iterator | 
| 44676 | 758 | command <- node.commands.iterator | 
| 759 |       } {
 | |
| 67112 | 760 |         for ((name, digest) <- command.blobs_defined) {
 | 
| 761 | blobs1_names += name | |
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 762 | blobs1 += digest | 
| 67112 | 763 | } | 
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 764 | |
| 52568 | 765 | if (!commands1.isDefinedAt(command.id)) | 
| 766 | commands.get(command.id).foreach(st => commands1 += (command.id -> st)) | |
| 54519 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 wenzelm parents: 
54515diff
changeset | 767 | |
| 52568 | 768 |         for (exec_id <- command_execs.getOrElse(command.id, Nil)) {
 | 
| 52527 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 wenzelm parents: 
52508diff
changeset | 769 | if (!execs1.isDefinedAt(exec_id)) | 
| 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 wenzelm parents: 
52508diff
changeset | 770 | execs.get(exec_id).foreach(st => execs1 += (exec_id -> st)) | 
| 44676 | 771 | } | 
| 772 | } | |
| 67112 | 773 | |
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 774 | copy( | 
| 67112 | 775 | versions = Version.purge(_.purge_blobs(blobs1_names), versions1), | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 776 | blobs = blobs1, | 
| 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 777 | commands = commands1, | 
| 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 778 | execs = execs1, | 
| 56475 | 779 | commands_redirection = commands_redirection.restrict(commands1.isDefinedAt(_)), | 
| 57976 
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
 wenzelm parents: 
57842diff
changeset | 780 | assignments = assignments1, | 
| 
bf99106b6672
postpone changes in intermediate state between remove_versions/removed_versions, which is important for handle_change to refer to defined items on prover side;
 wenzelm parents: 
57842diff
changeset | 781 | removing_versions = false) | 
| 44676 | 782 | } | 
| 783 | ||
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 784 | private def command_states_self(version: Version, command: Command) | 
| 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 785 | : List[(Document_ID.Generic, Command.State)] = | 
| 44613 | 786 |     {
 | 
| 787 | require(is_assigned(version)) | |
| 788 |       try {
 | |
| 52527 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 wenzelm parents: 
52508diff
changeset | 789 | the_assignment(version).check_finished.command_execs.getOrElse(command.id, Nil) | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 790 |           .map(id => id -> the_dynamic_state(id)) match {
 | 
| 52527 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 wenzelm parents: 
52508diff
changeset | 791 | case Nil => fail | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 792 | case res => res | 
| 52527 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 wenzelm parents: 
52508diff
changeset | 793 | } | 
| 44613 | 794 | } | 
| 47395 
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
 wenzelm parents: 
47388diff
changeset | 795 |       catch {
 | 
| 
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
 wenzelm parents: 
47388diff
changeset | 796 | case _: State.Fail => | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 797 |           try { List(command.id -> the_static_state(command.id)) }
 | 
| 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 798 |           catch { case _: State.Fail => List(command.id -> command.init_state) }
 | 
| 47395 
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
 wenzelm parents: 
47388diff
changeset | 799 | } | 
| 44613 | 800 | } | 
| 801 | ||
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 802 | def command_states(version: Version, command: Command): List[Command.State] = | 
| 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 803 |     {
 | 
| 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 804 | val self = command_states_self(version, command) | 
| 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 805 | val others = | 
| 56475 | 806 |         if (commands_redirection.defined(command.id)) {
 | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 807 |           (for {
 | 
| 56475 | 808 | command_id <- commands_redirection.imm_succs(command.id).iterator | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 809 | (id, st) <- command_states_self(version, the_static_state(command_id).command) | 
| 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 810 | if !self.exists(_._1 == id) | 
| 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 811 | } yield (id, st)).toMap.valuesIterator.toList | 
| 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 812 | } | 
| 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 813 | else Nil | 
| 56489 | 814 | self.map(_._2) ::: others.flatMap(_.redirect(command)) | 
| 56470 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 815 | } | 
| 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 wenzelm parents: 
56468diff
changeset | 816 | |
| 56299 
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
 wenzelm parents: 
56298diff
changeset | 817 | def command_results(version: Version, command: Command): Command.Results = | 
| 
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
 wenzelm parents: 
56298diff
changeset | 818 | Command.State.merge_results(command_states(version, command)) | 
| 
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
 wenzelm parents: 
56298diff
changeset | 819 | |
| 56301 
1da7b4c33db9
more frugal merge of markup trees: filter wrt. subsequent query;
 wenzelm parents: 
56300diff
changeset | 820 | def command_markup(version: Version, command: Command, index: Command.Markup_Index, | 
| 56743 | 821 | range: Text.Range, elements: Markup.Elements): Markup_Tree = | 
| 56301 
1da7b4c33db9
more frugal merge of markup trees: filter wrt. subsequent query;
 wenzelm parents: 
56300diff
changeset | 822 | Command.State.merge_markup(command_states(version, command), index, range, elements) | 
| 56299 
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
 wenzelm parents: 
56298diff
changeset | 823 | |
| 66041 | 824 | def markup_to_XML( | 
| 825 | version: Version, | |
| 67264 | 826 | node_name: Node.Name, | 
| 66043 | 827 | range: Text.Range, | 
| 66041 | 828 | elements: Markup.Elements): XML.Body = | 
| 829 |     {
 | |
| 67264 | 830 | val node = version.nodes(node_name) | 
| 831 |       if (node_name.is_theory) {
 | |
| 832 | val markup_index = Command.Markup_Index.markup | |
| 833 |         (for {
 | |
| 834 | command <- node.commands.iterator | |
| 835 | command_range <- command.range.try_restrict(range).iterator | |
| 836 | markup = command_markup(version, command, markup_index, command_range, elements) | |
| 837 | tree <- markup.to_XML(command_range, command.source, elements).iterator | |
| 838 | } yield tree).toList | |
| 839 | } | |
| 840 |       else {
 | |
| 67265 
f32287c95432
store full blob source for the sake of markup_to_XML;
 wenzelm parents: 
67264diff
changeset | 841 | val node_source = node.source | 
| 67264 | 842 |         Text.Range(0, node_source.length).try_restrict(range) match {
 | 
| 843 | case None => Nil | |
| 844 | case Some(node_range) => | |
| 845 | val markup = | |
| 846 |               version.nodes.commands_loading(node_name).headOption match {
 | |
| 847 | case None => Markup_Tree.empty | |
| 848 | case Some(command) => | |
| 849 | val chunk_name = Symbol.Text_Chunk.File(node_name.node) | |
| 850 | val markup_index = Command.Markup_Index(false, chunk_name) | |
| 851 | command_markup(version, command, markup_index, node_range, elements) | |
| 852 | } | |
| 853 | markup.to_XML(node_range, node_source, elements) | |
| 854 | } | |
| 855 | } | |
| 66041 | 856 | } | 
| 38841 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 857 | |
| 66379 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66195diff
changeset | 858 | def node_consolidated(version: Version, name: Node.Name): Boolean = | 
| 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66195diff
changeset | 859 | !name.is_theory || | 
| 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66195diff
changeset | 860 | version.nodes(name).commands.reverse.iterator. | 
| 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66195diff
changeset | 861 | flatMap(command_states(version, _)).exists(_.consolidated) | 
| 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66195diff
changeset | 862 | |
| 38841 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 863 | // persistent user-view | 
| 49346 | 864 | def snapshot(name: Node.Name = Node.Name.empty, pending_edits: List[Text.Edit] = Nil) | 
| 865 | : Snapshot = | |
| 38370 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 wenzelm parents: 
38367diff
changeset | 866 |     {
 | 
| 44672 | 867 | val stable = recent_stable | 
| 44436 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 wenzelm parents: 
44385diff
changeset | 868 | val latest = history.tip | 
| 38841 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 869 | |
| 57620 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 wenzelm parents: 
57619diff
changeset | 870 | |
| 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 wenzelm parents: 
57619diff
changeset | 871 | /* pending edits and unstable changes */ | 
| 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 wenzelm parents: 
57619diff
changeset | 872 | |
| 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 wenzelm parents: 
57619diff
changeset | 873 | val rev_pending_changes = | 
| 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 wenzelm parents: 
57619diff
changeset | 874 |         for {
 | 
| 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 wenzelm parents: 
57619diff
changeset | 875 | change <- history.undo_list.takeWhile(_ != stable) | 
| 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 wenzelm parents: 
57619diff
changeset | 876 | (a, edits) <- change.rev_edits | 
| 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 wenzelm parents: 
57619diff
changeset | 877 | if a == name | 
| 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 wenzelm parents: 
57619diff
changeset | 878 | } yield edits | 
| 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 wenzelm parents: 
57619diff
changeset | 879 | |
| 38841 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 880 | val edits = | 
| 64819 | 881 |         (pending_edits /: rev_pending_changes)({
 | 
| 882 | case (edits, Node.Edits(es)) => es ::: edits | |
| 883 | case (edits, _) => edits | |
| 884 | }) | |
| 38841 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 885 | lazy val reverse_edits = edits.reverse | 
| 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 886 | |
| 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 887 | new Snapshot | 
| 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 888 |       {
 | 
| 52972 | 889 | /* global information */ | 
| 890 | ||
| 64798 | 891 | val state: State = State.this | 
| 892 | val version: Version = stable.version.get_finished | |
| 893 | val is_outdated: Boolean = pending_edits.nonEmpty || latest != stable | |
| 38841 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 894 | |
| 55649 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 wenzelm parents: 
55620diff
changeset | 895 | |
| 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 wenzelm parents: 
55620diff
changeset | 896 | /* local node content */ | 
| 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 wenzelm parents: 
55620diff
changeset | 897 | |
| 64819 | 898 | def convert(offset: Text.Offset) = (offset /: edits)((i, edit) => edit.convert(i)) | 
| 899 | def revert(offset: Text.Offset) = (offset /: reverse_edits)((i, edit) => edit.revert(i)) | |
| 57620 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 wenzelm parents: 
57619diff
changeset | 900 | |
| 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 wenzelm parents: 
57619diff
changeset | 901 | def convert(range: Text.Range) = range.map(convert(_)) | 
| 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 wenzelm parents: 
57619diff
changeset | 902 | def revert(range: Text.Range) = range.map(revert(_)) | 
| 39177 
0468964aec11
simplified Markup_Tree.select: Stream instead of Iterator (again), explicit Option instead of default;
 wenzelm parents: 
38976diff
changeset | 903 | |
| 64798 | 904 | val node_name: Node.Name = name | 
| 64799 | 905 | val node: Node = version.nodes(name) | 
| 52972 | 906 | |
| 66379 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66195diff
changeset | 907 | def node_consolidated: Boolean = state.node_consolidated(version, node_name) | 
| 
6392766f3c25
maintain "consolidated" status of theory nodes, which means all evals are finished (but not necessarily prints nor imports);
 wenzelm parents: 
66195diff
changeset | 908 | |
| 64799 | 909 | val commands_loading: List[Command] = | 
| 55432 
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
 wenzelm parents: 
55431diff
changeset | 910 | if (node_name.is_theory) Nil | 
| 64799 | 911 | else version.nodes.commands_loading(node_name) | 
| 55432 
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
 wenzelm parents: 
55431diff
changeset | 912 | |
| 64799 | 913 | def commands_loading_ranges(pred: Node.Name => Boolean): List[Text.Range] = | 
| 914 |           (for {
 | |
| 915 | cmd <- node.load_commands.iterator | |
| 916 | blob_name <- cmd.blobs_names.iterator | |
| 917 | if pred(blob_name) | |
| 918 | start <- node.command_start(cmd) | |
| 919 | } yield convert(cmd.proper_range + start)).toList | |
| 56176 
0bc9b0ad6287
tuned rendering -- avoid flashing background of aux. files that are disconnected from the document model;
 wenzelm parents: 
55820diff
changeset | 920 | |
| 65199 
6bd7081f8319
clarified current_command: index refers to node content, negative index means first command;
 wenzelm parents: 
65196diff
changeset | 921 | def current_command(other_node_name: Node.Name, offset: Text.Offset): Option[Command] = | 
| 
6bd7081f8319
clarified current_command: index refers to node content, negative index means first command;
 wenzelm parents: 
65196diff
changeset | 922 |           if (other_node_name.is_theory) {
 | 
| 
6bd7081f8319
clarified current_command: index refers to node content, negative index means first command;
 wenzelm parents: 
65196diff
changeset | 923 | val other_node = version.nodes(other_node_name) | 
| 
6bd7081f8319
clarified current_command: index refers to node content, negative index means first command;
 wenzelm parents: 
65196diff
changeset | 924 | val iterator = other_node.command_iterator(revert(offset) max 0) | 
| 
6bd7081f8319
clarified current_command: index refers to node content, negative index means first command;
 wenzelm parents: 
65196diff
changeset | 925 |             if (iterator.hasNext) {
 | 
| 
6bd7081f8319
clarified current_command: index refers to node content, negative index means first command;
 wenzelm parents: 
65196diff
changeset | 926 | val (command0, _) = iterator.next | 
| 
6bd7081f8319
clarified current_command: index refers to node content, negative index means first command;
 wenzelm parents: 
65196diff
changeset | 927 | other_node.commands.reverse.iterator(command0).find(command => !command.is_ignored) | 
| 
6bd7081f8319
clarified current_command: index refers to node content, negative index means first command;
 wenzelm parents: 
65196diff
changeset | 928 | } | 
| 
6bd7081f8319
clarified current_command: index refers to node content, negative index means first command;
 wenzelm parents: 
65196diff
changeset | 929 | else other_node.commands.reverse.iterator.find(command => !command.is_ignored) | 
| 
6bd7081f8319
clarified current_command: index refers to node content, negative index means first command;
 wenzelm parents: 
65196diff
changeset | 930 | } | 
| 
6bd7081f8319
clarified current_command: index refers to node content, negative index means first command;
 wenzelm parents: 
65196diff
changeset | 931 | else version.nodes.commands_loading(other_node_name).headOption | 
| 
6bd7081f8319
clarified current_command: index refers to node content, negative index means first command;
 wenzelm parents: 
65196diff
changeset | 932 | |
| 66043 | 933 | def markup_to_XML(range: Text.Range, elements: Markup.Elements): XML.Body = | 
| 67264 | 934 | state.markup_to_XML(version, node_name, range, elements) | 
| 66040 | 935 | |
| 55649 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 wenzelm parents: 
55620diff
changeset | 936 | |
| 64665 | 937 | /* find command */ | 
| 938 | ||
| 939 | def find_command(id: Document_ID.Generic): Option[(Node, Command)] = | |
| 940 |           state.commands.get(id) orElse state.execs.get(id) match {
 | |
| 941 | case None => None | |
| 942 | case Some(st) => | |
| 943 | val command = st.command | |
| 944 | val node = version.nodes(command.node_name) | |
| 945 | if (node.commands.contains(command)) Some((node, command)) else None | |
| 946 | } | |
| 947 | ||
| 948 | def find_command_position(id: Document_ID.Generic, offset: Symbol.Offset) | |
| 949 | : Option[Line.Node_Position] = | |
| 950 | for ((node, command) <- find_command(id)) | |
| 951 |           yield {
 | |
| 952 | val name = command.node_name.node | |
| 953 | val sources_iterator = | |
| 954 | node.commands.iterator.takeWhile(_ != command).map(_.source) ++ | |
| 955 | (if (offset == 0) Iterator.empty | |
| 956 | else Iterator.single(command.source(Text.Range(0, command.chunk.decode(offset))))) | |
| 65196 
e8760a98db78
discontinued pointless Text.Length: Javascript and Java agree in old-fashioned UTF-16;
 wenzelm parents: 
65195diff
changeset | 957 | val pos = (Line.Position.zero /: sources_iterator)(_.advance(_)) | 
| 64665 | 958 | Line.Node_Position(name, pos) | 
| 959 | } | |
| 960 | ||
| 961 | ||
| 55649 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 wenzelm parents: 
55620diff
changeset | 962 | /* cumulate markup */ | 
| 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 wenzelm parents: 
55620diff
changeset | 963 | |
| 55651 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 wenzelm parents: 
55650diff
changeset | 964 | def cumulate[A]( | 
| 55649 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 wenzelm parents: 
55620diff
changeset | 965 | range: Text.Range, | 
| 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 wenzelm parents: 
55620diff
changeset | 966 | info: A, | 
| 56743 | 967 | elements: Markup.Elements, | 
| 56354 
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
 wenzelm parents: 
56337diff
changeset | 968 | result: List[Command.State] => (A, Text.Markup) => Option[A], | 
| 55651 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 wenzelm parents: 
55650diff
changeset | 969 | status: Boolean = false): List[Text.Info[A]] = | 
| 45459 | 970 |         {
 | 
| 56590 
d01d183e84ea
clarified treatment of markup ranges wrt. revert/convert: inflate_singularity allows to retrieve information like language_context more reliably during editing;
 wenzelm parents: 
56514diff
changeset | 971 | val former_range = revert(range).inflate_singularity | 
| 56462 
b64b0cb845fe
more explicit Command.Chunk types, less ooddities;
 wenzelm parents: 
56398diff
changeset | 972 | val (chunk_name, command_iterator) = | 
| 65187 | 973 |             commands_loading.headOption match {
 | 
| 974 | case None => (Symbol.Text_Chunk.Default, node.command_iterator(former_range)) | |
| 975 | case Some(command) => (Symbol.Text_Chunk.File(node_name.node), Iterator((command, 0))) | |
| 56309 | 976 | } | 
| 56462 
b64b0cb845fe
more explicit Command.Chunk types, less ooddities;
 wenzelm parents: 
56398diff
changeset | 977 | val markup_index = Command.Markup_Index(status, chunk_name) | 
| 56309 | 978 |           (for {
 | 
| 56373 
0605d90be6fc
tuned signature -- more explicit iterator terminology;
 wenzelm parents: 
56372diff
changeset | 979 | (command, command_start) <- command_iterator | 
| 56462 
b64b0cb845fe
more explicit Command.Chunk types, less ooddities;
 wenzelm parents: 
56398diff
changeset | 980 | chunk <- command.chunks.get(chunk_name).iterator | 
| 56309 | 981 | states = state.command_states(version, command) | 
| 56354 
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
 wenzelm parents: 
56337diff
changeset | 982 | res = result(states) | 
| 56590 
d01d183e84ea
clarified treatment of markup ranges wrt. revert/convert: inflate_singularity allows to retrieve information like language_context more reliably during editing;
 wenzelm parents: 
56514diff
changeset | 983 | markup_range <- (former_range - command_start).try_restrict(chunk.range).iterator | 
| 
d01d183e84ea
clarified treatment of markup ranges wrt. revert/convert: inflate_singularity allows to retrieve information like language_context more reliably during editing;
 wenzelm parents: 
56514diff
changeset | 984 | markup = Command.State.merge_markup(states, markup_index, markup_range, elements) | 
| 
d01d183e84ea
clarified treatment of markup ranges wrt. revert/convert: inflate_singularity allows to retrieve information like language_context more reliably during editing;
 wenzelm parents: 
56514diff
changeset | 985 | Text.Info(r0, a) <- markup.cumulate[A](markup_range, info, elements, | 
| 56309 | 986 |               {
 | 
| 987 | case (a, Text.Info(r0, b)) => res(a, Text.Info(convert(r0 + command_start), b)) | |
| 988 | }).iterator | |
| 56590 
d01d183e84ea
clarified treatment of markup ranges wrt. revert/convert: inflate_singularity allows to retrieve information like language_context more reliably during editing;
 wenzelm parents: 
56514diff
changeset | 989 | r1 <- convert(r0 + command_start).try_restrict(range).iterator | 
| 
d01d183e84ea
clarified treatment of markup ranges wrt. revert/convert: inflate_singularity allows to retrieve information like language_context more reliably during editing;
 wenzelm parents: 
56514diff
changeset | 990 | } yield Text.Info(r1, a)).toList | 
| 45459 | 991 | } | 
| 992 | ||
| 55651 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 wenzelm parents: 
55650diff
changeset | 993 | def select[A]( | 
| 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 wenzelm parents: 
55650diff
changeset | 994 | range: Text.Range, | 
| 56743 | 995 | elements: Markup.Elements, | 
| 56354 
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
 wenzelm parents: 
56337diff
changeset | 996 | result: List[Command.State] => Text.Markup => Option[A], | 
| 55651 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 wenzelm parents: 
55650diff
changeset | 997 | status: Boolean = false): List[Text.Info[A]] = | 
| 38845 
a9e37daf5bd0
added Document.Snapshot.select_markup, which includes command iteration, range conversion etc.;
 wenzelm parents: 
38841diff
changeset | 998 |         {
 | 
| 56354 
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
 wenzelm parents: 
56337diff
changeset | 999 | def result1(states: List[Command.State]): (Option[A], Text.Markup) => Option[Option[A]] = | 
| 50500 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50204diff
changeset | 1000 |           {
 | 
| 56354 
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
 wenzelm parents: 
56337diff
changeset | 1001 | val res = result(states) | 
| 52889 
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
 wenzelm parents: 
52887diff
changeset | 1002 | (_: Option[A], x: Text.Markup) => | 
| 
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
 wenzelm parents: 
52887diff
changeset | 1003 |               res(x) match {
 | 
| 
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
 wenzelm parents: 
52887diff
changeset | 1004 | case None => None | 
| 
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
 wenzelm parents: 
52887diff
changeset | 1005 | case some => Some(some) | 
| 
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
 wenzelm parents: 
52887diff
changeset | 1006 | } | 
| 50500 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 wenzelm parents: 
50204diff
changeset | 1007 | } | 
| 55651 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 wenzelm parents: 
55650diff
changeset | 1008 | for (Text.Info(r, Some(x)) <- cumulate(range, None, elements, result1 _, status)) | 
| 46198 
cd040c5772de
improved select_markup: include filtering of defined results;
 wenzelm parents: 
46178diff
changeset | 1009 | yield Text.Info(r, x) | 
| 38845 
a9e37daf5bd0
added Document.Snapshot.select_markup, which includes command iteration, range conversion etc.;
 wenzelm parents: 
38841diff
changeset | 1010 | } | 
| 55800 | 1011 | |
| 1012 | ||
| 65332 | 1013 | /* command results */ | 
| 1014 | ||
| 1015 | def command_results(range: Text.Range): Command.Results = | |
| 1016 | Command.State.merge_results( | |
| 1017 | select[List[Command.State]](range, Markup.Elements.full, command_states => | |
| 1018 |               { case _ => Some(command_states) }).flatMap(_.info))
 | |
| 1019 | ||
| 1020 | def command_results(command: Command): Command.Results = | |
| 1021 | state.command_results(version, command) | |
| 1022 | ||
| 1023 | ||
| 55800 | 1024 | /* output */ | 
| 1025 | ||
| 1026 | override def toString: String = | |
| 1027 | "Snapshot(node = " + node_name.node + ", version = " + version.id + | |
| 1028 | (if (is_outdated) ", outdated" else "") + ")" | |
| 38841 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 wenzelm parents: 
38569diff
changeset | 1029 | } | 
| 38150 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 wenzelm parents: 
37849diff
changeset | 1030 | } | 
| 34485 | 1031 | } | 
| 34840 
6c5560d48561
more precise treatment of document/state assigment;
 wenzelm parents: 
34838diff
changeset | 1032 | } |