| author | wenzelm | 
| Sun, 02 Oct 2016 14:07:43 +0200 | |
| changeset 63992 | 3aa9837d05c7 | 
| parent 63584 | 68751fe1c036 | 
| child 64665 | 00aa710ff7f0 | 
| 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: 
37849 
diff
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: 
38417 
diff
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: 
34868 
diff
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: 
37849 
diff
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: 
52976 
diff
changeset
 | 
18  | 
/* overlays -- print functions with arguments */  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
19  | 
|
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
20  | 
object Overlays  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
21  | 
  {
 | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
22  | 
val empty = new Overlays(Map.empty)  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
23  | 
}  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
24  | 
|
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
25  | 
final class Overlays private(rep: Map[Node.Name, Node.Overlays])  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
26  | 
  {
 | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
27  | 
def apply(name: Document.Node.Name): Node.Overlays =  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
28  | 
rep.getOrElse(name, Node.Overlays.empty)  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
29  | 
|
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
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: 
52976 
diff
changeset
 | 
31  | 
    {
 | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
32  | 
val node_overlays = f(apply(name))  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
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: 
52976 
diff
changeset
 | 
34  | 
}  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
35  | 
|
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
36  | 
def insert(command: Command, fn: String, args: List[String]): Overlays =  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
37  | 
update(command.node_name, _.insert(command, fn, args))  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
38  | 
|
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
39  | 
def remove(command: Command, fn: String, args: List[String]): Overlays =  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
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: 
52976 
diff
changeset
 | 
43  | 
}  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
44  | 
|
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
45  | 
|
| 55783 | 46  | 
/* document blobs: auxiliary files */  | 
47  | 
||
| 56746 | 48  | 
sealed case class Blob(bytes: Bytes, 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: 
56314 
diff
changeset
 | 
49  | 
  {
 | 
| 
 
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
 
wenzelm 
parents: 
56314 
diff
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: 
56314 
diff
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: 
48706 
diff
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: 
48706 
diff
changeset
 | 
88  | 
    {
 | 
| 
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
89  | 
def error(msg: String): Header = copy(errors = errors ::: List(msg))  | 
| 
54549
 
2a3053472ec3
actually expose errors of cumulative theory dependencies;
 
wenzelm 
parents: 
54530 
diff
changeset
 | 
90  | 
|
| 
 
2a3053472ec3
actually expose errors of cumulative theory dependencies;
 
wenzelm 
parents: 
54530 
diff
changeset
 | 
91  | 
def cat_errors(msg2: String): Header =  | 
| 62492 | 92  | 
copy(errors = errors.map(msg1 => Exn.cat_message(msg1, msg2)))  | 
| 
48707
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
93  | 
}  | 
| 
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
94  | 
|
| 63020 | 95  | 
val no_header = Header()  | 
96  | 
def bad_header(msg: String): Header = Header(errors = List(msg))  | 
|
| 46737 | 97  | 
|
| 
44957
 
098dd95349e7
more elaborate Node_Renderer, which paints node_name.theory only;
 
wenzelm 
parents: 
44676 
diff
changeset
 | 
98  | 
object Name  | 
| 
 
098dd95349e7
more elaborate Node_Renderer, which paints node_name.theory only;
 
wenzelm 
parents: 
44676 
diff
changeset
 | 
99  | 
    {
 | 
| 54515 | 100  | 
      val empty = Name("")
 | 
| 46723 | 101  | 
|
102  | 
object Ordering extends scala.math.Ordering[Name]  | 
|
103  | 
      {
 | 
|
104  | 
def compare(name1: Name, name2: Name): Int = name1.node compare name2.node  | 
|
105  | 
}  | 
|
| 
44957
 
098dd95349e7
more elaborate Node_Renderer, which paints node_name.theory only;
 
wenzelm 
parents: 
44676 
diff
changeset
 | 
106  | 
}  | 
| 52887 | 107  | 
|
| 54515 | 108  | 
sealed case class Name(node: String, master_dir: String = "", theory: String = "")  | 
| 44615 | 109  | 
    {
 | 
110  | 
override def hashCode: Int = node.hashCode  | 
|
111  | 
override def equals(that: Any): Boolean =  | 
|
112  | 
        that match {
 | 
|
113  | 
case other: Name => node == other.node  | 
|
114  | 
case _ => false  | 
|
115  | 
}  | 
|
| 
54509
 
1f77110c94ef
maintain document model for all files, with document view for theory only, and special blob for non-theory files;
 
wenzelm 
parents: 
54462 
diff
changeset
 | 
116  | 
|
| 59319 | 117  | 
def is_theory: Boolean = theory.nonEmpty  | 
| 54510 | 118  | 
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: 
56746 
diff
changeset
 | 
119  | 
|
| 
 
8dd9df88f647
some support for session-qualified theories: allow to refer to resources via qualified name instead of odd file-system path;
 
wenzelm 
parents: 
56746 
diff
changeset
 | 
120  | 
def map(f: String => String): Name = copy(f(node), f(master_dir), theory)  | 
| 44615 | 121  | 
}  | 
122  | 
||
| 52887 | 123  | 
|
| 
52977
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
124  | 
/* node overlays */  | 
| 52887 | 125  | 
|
126  | 
object Overlays  | 
|
127  | 
    {
 | 
|
| 52976 | 128  | 
val empty = new Overlays(Multi_Map.empty)  | 
| 52887 | 129  | 
}  | 
130  | 
||
| 
52977
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
131  | 
final class Overlays private(rep: Multi_Map[Command, (String, List[String])])  | 
| 52887 | 132  | 
    {
 | 
133  | 
def commands: Set[Command] = rep.keySet  | 
|
134  | 
def is_empty: Boolean = rep.isEmpty  | 
|
| 
52977
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
135  | 
def dest: List[(Command, (String, List[String]))] = rep.iterator.toList  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
136  | 
def insert(cmd: Command, fn: String, args: List[String]): Overlays =  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
137  | 
new Overlays(rep.insert(cmd, (fn, args)))  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
138  | 
def remove(cmd: Command, fn: String, args: List[String]): Overlays =  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
139  | 
new Overlays(rep.remove(cmd, (fn, args)))  | 
| 55800 | 140  | 
|
141  | 
      override def toString: String = rep.mkString("Node.Overlays(", ",", ")")
 | 
|
| 52887 | 142  | 
}  | 
143  | 
||
144  | 
||
145  | 
/* edits */  | 
|
146  | 
||
| 44384 | 147  | 
sealed abstract class Edit[A, B]  | 
| 44156 | 148  | 
    {
 | 
| 44383 | 149  | 
def foreach(f: A => Unit)  | 
150  | 
      {
 | 
|
| 44156 | 151  | 
        this match {
 | 
| 44383 | 152  | 
case Edits(es) => es.foreach(f)  | 
153  | 
case _ =>  | 
|
| 44156 | 154  | 
}  | 
| 44383 | 155  | 
}  | 
| 57621 | 156  | 
|
157  | 
def is_void: Boolean =  | 
|
158  | 
        this match {
 | 
|
159  | 
case Edits(Nil) => true  | 
|
160  | 
case _ => false  | 
|
161  | 
}  | 
|
| 44156 | 162  | 
}  | 
| 44384 | 163  | 
case class Clear[A, B]() extends Edit[A, B]  | 
| 
56335
 
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
 
wenzelm 
parents: 
56314 
diff
changeset
 | 
164  | 
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: 
54549 
diff
changeset
 | 
165  | 
|
| 44384 | 166  | 
case class Edits[A, B](edits: List[A]) extends Edit[A, B]  | 
| 
48707
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
167  | 
case class Deps[A, B](header: Header) extends Edit[A, B]  | 
| 52849 | 168  | 
case class Perspective[A, B](required: Boolean, visible: B, overlays: Overlays) extends Edit[A, B]  | 
| 57610 | 169  | 
|
170  | 
||
171  | 
/* perspective */  | 
|
172  | 
||
| 
52808
 
143f225e50f5
allow explicit indication of required node: full eval, no prints;
 
wenzelm 
parents: 
52568 
diff
changeset
 | 
173  | 
type Perspective_Text = Perspective[Text.Edit, Text.Perspective]  | 
| 52849 | 174  | 
type Perspective_Command = Perspective[Command.Edit, Command.Perspective]  | 
| 44156 | 175  | 
|
| 
57615
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
176  | 
val no_perspective_text: Perspective_Text =  | 
| 57610 | 177  | 
Perspective(false, Text.Perspective.empty, Overlays.empty)  | 
178  | 
||
| 
57615
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
179  | 
val no_perspective_command: Perspective_Command =  | 
| 57614 | 180  | 
Perspective(false, Command.Perspective.empty, Overlays.empty)  | 
181  | 
||
| 
57615
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
182  | 
def is_no_perspective_command(perspective: Perspective_Command): Boolean =  | 
| 
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
183  | 
!perspective.required &&  | 
| 
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
184  | 
perspective.visible.is_empty &&  | 
| 
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
185  | 
perspective.overlays.is_empty  | 
| 
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
186  | 
|
| 52887 | 187  | 
|
188  | 
/* commands */  | 
|
189  | 
||
| 
52901
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
190  | 
object Commands  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
191  | 
    {
 | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
192  | 
def apply(commands: Linear_Set[Command]): Commands = new Commands(commands)  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
193  | 
val empty: Commands = apply(Linear_Set.empty)  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
194  | 
|
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
195  | 
def starts(commands: Iterator[Command], offset: Text.Offset = 0)  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
196  | 
: Iterator[(Command, Text.Offset)] =  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
197  | 
      {
 | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
198  | 
var i = offset  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
199  | 
        for (command <- commands) yield {
 | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
200  | 
val start = i  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
201  | 
i += command.length  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
202  | 
(command, start)  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
203  | 
}  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
204  | 
}  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
205  | 
|
| 
56398
 
15d0821c8667
afford larger full_index, to save a few milliseconds during rendering (notably text_overview);
 
wenzelm 
parents: 
56394 
diff
changeset
 | 
206  | 
private val block_size = 256  | 
| 
52901
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
207  | 
}  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
208  | 
|
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
209  | 
final class Commands private(val commands: Linear_Set[Command])  | 
| 
38227
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
210  | 
    {
 | 
| 56314 | 211  | 
lazy val load_commands: List[Command] =  | 
| 59319 | 212  | 
commands.iterator.filter(cmd => cmd.blobs.nonEmpty).toList  | 
| 54462 | 213  | 
|
| 
52901
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
214  | 
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: 
52900 
diff
changeset
 | 
215  | 
      {
 | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
216  | 
val blocks = new mutable.ListBuffer[(Command, Text.Offset)]  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
217  | 
var next_block = 0  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
218  | 
var last_stop = 0  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
219  | 
        for ((command, start) <- Commands.starts(commands.iterator)) {
 | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
220  | 
last_stop = start + command.length  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
221  | 
          while (last_stop + 1 > next_block) {
 | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
222  | 
blocks += (command -> start)  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
223  | 
next_block += Commands.block_size  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
224  | 
}  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
225  | 
}  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
226  | 
(blocks.toArray, Text.Range(0, last_stop))  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
227  | 
}  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
228  | 
|
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
229  | 
private def full_range: Text.Range = full_index._2  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
230  | 
|
| 
56373
 
0605d90be6fc
tuned signature -- more explicit iterator terminology;
 
wenzelm 
parents: 
56372 
diff
changeset
 | 
231  | 
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: 
52900 
diff
changeset
 | 
232  | 
      {
 | 
| 59319 | 233  | 
        if (commands.nonEmpty && full_range.contains(i)) {
 | 
| 
52901
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
234  | 
val (cmd0, start0) = full_index._1(i / Commands.block_size)  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
235  | 
          Node.Commands.starts(commands.iterator(cmd0), start0) dropWhile {
 | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
236  | 
case (cmd, start) => start + cmd.length <= i }  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
237  | 
}  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
238  | 
else Iterator.empty  | 
| 
38227
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
239  | 
}  | 
| 
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
240  | 
}  | 
| 57614 | 241  | 
|
242  | 
val empty: Node = new Node()  | 
|
| 38151 | 243  | 
}  | 
244  | 
||
| 46712 | 245  | 
final class Node private(  | 
| 
56335
 
8953d4cc060a
store blob content within document node: aux. files that were once open are made persistent;
 
wenzelm 
parents: 
56314 
diff
changeset
 | 
246  | 
val get_blob: Option[Document.Blob] = None,  | 
| 
57615
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
247  | 
val header: Node.Header = Node.no_header,  | 
| 
63584
 
68751fe1c036
tuned signature -- prover-independence is presently theoretical;
 
wenzelm 
parents: 
63579 
diff
changeset
 | 
248  | 
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: 
59319 
diff
changeset
 | 
249  | 
val text_perspective: Text.Perspective = Text.Perspective.empty,  | 
| 
57615
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
250  | 
val perspective: Node.Perspective_Command = Node.no_perspective_command,  | 
| 
52901
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
251  | 
_commands: Node.Commands = Node.Commands.empty)  | 
| 38151 | 252  | 
  {
 | 
| 
57615
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
253  | 
def is_empty: Boolean =  | 
| 
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
254  | 
get_blob.isEmpty &&  | 
| 
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
255  | 
header == Node.no_header &&  | 
| 
59372
 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 
wenzelm 
parents: 
59319 
diff
changeset
 | 
256  | 
text_perspective.is_empty &&  | 
| 
57615
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
257  | 
Node.is_no_perspective_command(perspective) &&  | 
| 
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
258  | 
commands.isEmpty  | 
| 
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
259  | 
|
| 
59702
 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 
wenzelm 
parents: 
59695 
diff
changeset
 | 
260  | 
def has_header: Boolean = header != Node.no_header  | 
| 
 
58dfaa369c11
hybrid use of command blobs: inlined errors and auxiliary files;
 
wenzelm 
parents: 
59695 
diff
changeset
 | 
261  | 
|
| 
57615
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
262  | 
def commands: Linear_Set[Command] = _commands.commands  | 
| 
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
263  | 
def load_commands: List[Command] = _commands.load_commands  | 
| 
 
df1b3452d71c
more explicit discrimination of empty nodes -- suppress from Theories panel;
 
wenzelm 
parents: 
57614 
diff
changeset
 | 
264  | 
|
| 
59077
 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 
wenzelm 
parents: 
57976 
diff
changeset
 | 
265  | 
def clear: Node = new Node(header = header, syntax = syntax)  | 
| 46680 | 266  | 
|
| 
59077
 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 
wenzelm 
parents: 
57976 
diff
changeset
 | 
267  | 
def init_blob(blob: Document.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: 
55434 
diff
changeset
 | 
268  | 
|
| 
48707
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
269  | 
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: 
59319 
diff
changeset
 | 
270  | 
new Node(get_blob, new_header, syntax, text_perspective, perspective, _commands)  | 
| 
59077
 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 
wenzelm 
parents: 
57976 
diff
changeset
 | 
271  | 
|
| 
63584
 
68751fe1c036
tuned signature -- prover-independence is presently theoretical;
 
wenzelm 
parents: 
63579 
diff
changeset
 | 
272  | 
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: 
59319 
diff
changeset
 | 
273  | 
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: 
59319 
diff
changeset
 | 
274  | 
|
| 
 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 
wenzelm 
parents: 
59319 
diff
changeset
 | 
275  | 
def update_perspective(  | 
| 
 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 
wenzelm 
parents: 
59319 
diff
changeset
 | 
276  | 
new_text_perspective: Text.Perspective,  | 
| 
 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 
wenzelm 
parents: 
59319 
diff
changeset
 | 
277  | 
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: 
59319 
diff
changeset
 | 
278  | 
new Node(get_blob, header, syntax, new_text_perspective, new_perspective, _commands)  | 
| 46680 | 279  | 
|
| 
59372
 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 
wenzelm 
parents: 
59319 
diff
changeset
 | 
280  | 
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: 
59319 
diff
changeset
 | 
281  | 
Node.Perspective(perspective.required, text_perspective, perspective.overlays)  | 
| 46680 | 282  | 
|
| 
59372
 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 
wenzelm 
parents: 
59319 
diff
changeset
 | 
283  | 
def same_perspective(  | 
| 
 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 
wenzelm 
parents: 
59319 
diff
changeset
 | 
284  | 
other_text_perspective: Text.Perspective,  | 
| 
 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 
wenzelm 
parents: 
59319 
diff
changeset
 | 
285  | 
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: 
59319 
diff
changeset
 | 
286  | 
text_perspective == other_text_perspective &&  | 
| 52849 | 287  | 
perspective.required == other_perspective.required &&  | 
288  | 
perspective.visible.same(other_perspective.visible) &&  | 
|
289  | 
perspective.overlays == other_perspective.overlays  | 
|
| 
52808
 
143f225e50f5
allow explicit indication of required node: full eval, no prints;
 
wenzelm 
parents: 
52568 
diff
changeset
 | 
290  | 
|
| 
52901
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
291  | 
def update_commands(new_commands: Linear_Set[Command]): Node =  | 
| 
52918
 
038458a4d11b
proper low-level comparison -- heed warning by Scala compiler;
 
wenzelm 
parents: 
52901 
diff
changeset
 | 
292  | 
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: 
59319 
diff
changeset
 | 
293  | 
else  | 
| 
 
503739360344
proper update of perspective after implicit edit due to reparse (e.g. ~~/src/HOL/Nat.thy);
 
wenzelm 
parents: 
59319 
diff
changeset
 | 
294  | 
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: 
59319 
diff
changeset
 | 
295  | 
Node.Commands(new_commands))  | 
| 38151 | 296  | 
|
| 
56373
 
0605d90be6fc
tuned signature -- more explicit iterator terminology;
 
wenzelm 
parents: 
56372 
diff
changeset
 | 
297  | 
def command_iterator(i: Text.Offset = 0): Iterator[(Command, Text.Offset)] =  | 
| 
 
0605d90be6fc
tuned signature -- more explicit iterator terminology;
 
wenzelm 
parents: 
56372 
diff
changeset
 | 
298  | 
_commands.iterator(i)  | 
| 38151 | 299  | 
|
| 
56373
 
0605d90be6fc
tuned signature -- more explicit iterator terminology;
 
wenzelm 
parents: 
56372 
diff
changeset
 | 
300  | 
def command_iterator(range: Text.Range): Iterator[(Command, Text.Offset)] =  | 
| 
 
0605d90be6fc
tuned signature -- more explicit iterator terminology;
 
wenzelm 
parents: 
56372 
diff
changeset
 | 
301  | 
      command_iterator(range.start) takeWhile { case (_, start) => start < range.stop }
 | 
| 38151 | 302  | 
|
| 
38879
 
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
 
wenzelm 
parents: 
38872 
diff
changeset
 | 
303  | 
def command_start(cmd: Command): Option[Text.Offset] =  | 
| 
52901
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
304  | 
Node.Commands.starts(commands.iterator).find(_._1 == cmd).map(_._2)  | 
| 38151 | 305  | 
}  | 
306  | 
||
307  | 
||
| 46723 | 308  | 
/* development graph */  | 
309  | 
||
310  | 
object Nodes  | 
|
311  | 
  {
 | 
|
312  | 
val empty: Nodes = new Nodes(Graph.empty(Node.Name.Ordering))  | 
|
313  | 
}  | 
|
314  | 
||
315  | 
final class Nodes private(graph: Graph[Node.Name, Node])  | 
|
316  | 
  {
 | 
|
317  | 
def apply(name: Node.Name): Node =  | 
|
318  | 
graph.default_node(name, Node.empty).get_node(name)  | 
|
319  | 
||
| 57619 | 320  | 
def is_hidden(name: Node.Name): Boolean =  | 
321  | 
    {
 | 
|
322  | 
val graph1 = graph.default_node(name, Node.empty)  | 
|
323  | 
graph1.is_maximal(name) && graph1.get_node(name).is_empty  | 
|
324  | 
}  | 
|
| 57617 | 325  | 
|
| 46723 | 326  | 
def + (entry: (Node.Name, Node)): Nodes =  | 
327  | 
    {
 | 
|
328  | 
val (name, node) = entry  | 
|
| 59695 | 329  | 
val imports = node.header.imports.map(_._1)  | 
| 46723 | 330  | 
val graph1 =  | 
| 
46739
 
6024353549ca
clarified document nodes (full import graph) vs. node_status (non-preloaded theories);
 
wenzelm 
parents: 
46737 
diff
changeset
 | 
331  | 
(graph.default_node(name, Node.empty) /: imports)((g, p) => g.default_node(p, Node.empty))  | 
| 46723 | 332  | 
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: 
46737 
diff
changeset
 | 
333  | 
val graph3 = (graph2 /: imports)((g, dep) => g.add_edge(dep, name))  | 
| 57616 | 334  | 
new Nodes(  | 
335  | 
if (graph3.is_maximal(name) && node.is_empty) graph3.del_node(name)  | 
|
336  | 
else graph3.map_node(name, _ => node)  | 
|
337  | 
)  | 
|
| 46723 | 338  | 
}  | 
339  | 
||
| 
56372
 
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
 
wenzelm 
parents: 
56354 
diff
changeset
 | 
340  | 
def iterator: Iterator[(Node.Name, Node)] =  | 
| 
 
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
 
wenzelm 
parents: 
56354 
diff
changeset
 | 
341  | 
      graph.iterator.map({ case (name, (node, _)) => (name, node) })
 | 
| 46723 | 342  | 
|
| 56314 | 343  | 
def load_commands(file_name: Node.Name): List[Command] =  | 
| 54528 | 344  | 
      (for {
 | 
| 
56372
 
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
 
wenzelm 
parents: 
56354 
diff
changeset
 | 
345  | 
(_, node) <- iterator  | 
| 56314 | 346  | 
cmd <- node.load_commands.iterator  | 
| 
54530
 
2c1440f70028
ranges of thy_load commands count as visible within perspective;
 
wenzelm 
parents: 
54528 
diff
changeset
 | 
347  | 
name <- cmd.blobs_names.iterator  | 
| 54528 | 348  | 
if name == file_name  | 
349  | 
} yield cmd).toList  | 
|
350  | 
||
| 
61023
 
46df28442a80
clarified undefined_blobs: already loaded theories are suppressed;
 
wenzelm 
parents: 
60933 
diff
changeset
 | 
351  | 
def undefined_blobs(pred: Node.Name => Boolean): List[Node.Name] =  | 
| 
60916
 
a6e2a667b0a8
resolve undefined blobs by default, e.g. relevant for ML debugger to avoid reset of breakpoints after reload;
 
wenzelm 
parents: 
60215 
diff
changeset
 | 
352  | 
      (for {
 | 
| 
61023
 
46df28442a80
clarified undefined_blobs: already loaded theories are suppressed;
 
wenzelm 
parents: 
60933 
diff
changeset
 | 
353  | 
(node_name, node) <- iterator  | 
| 
 
46df28442a80
clarified undefined_blobs: already loaded theories are suppressed;
 
wenzelm 
parents: 
60933 
diff
changeset
 | 
354  | 
if pred(node_name)  | 
| 
60916
 
a6e2a667b0a8
resolve undefined blobs by default, e.g. relevant for ML debugger to avoid reset of breakpoints after reload;
 
wenzelm 
parents: 
60215 
diff
changeset
 | 
355  | 
cmd <- node.load_commands.iterator  | 
| 
 
a6e2a667b0a8
resolve undefined blobs by default, e.g. relevant for ML debugger to avoid reset of breakpoints after reload;
 
wenzelm 
parents: 
60215 
diff
changeset
 | 
356  | 
name <- cmd.blobs_undefined.iterator  | 
| 
 
a6e2a667b0a8
resolve undefined blobs by default, e.g. relevant for ML debugger to avoid reset of breakpoints after reload;
 
wenzelm 
parents: 
60215 
diff
changeset
 | 
357  | 
} yield name).toList  | 
| 
 
a6e2a667b0a8
resolve undefined blobs by default, e.g. relevant for ML debugger to avoid reset of breakpoints after reload;
 
wenzelm 
parents: 
60215 
diff
changeset
 | 
358  | 
|
| 
46942
 
f5c2d66faa04
basic support for outer syntax keywords in theory header;
 
wenzelm 
parents: 
46941 
diff
changeset
 | 
359  | 
def descendants(names: List[Node.Name]): List[Node.Name] = graph.all_succs(names)  | 
| 46723 | 360  | 
def topological_order: List[Node.Name] = graph.topological_order  | 
| 56337 | 361  | 
|
362  | 
    override def toString: String = topological_order.mkString("Nodes(", ",", ")")
 | 
|
| 46723 | 363  | 
}  | 
364  | 
||
365  | 
||
| 38424 | 366  | 
|
367  | 
/** versioning **/  | 
|
368  | 
||
369  | 
/* particular document versions */  | 
|
| 34485 | 370  | 
|
| 38417 | 371  | 
object Version  | 
372  | 
  {
 | 
|
| 46681 | 373  | 
val init: Version = new Version()  | 
| 
59077
 
7e0d3da6e6d8
node-specific syntax, with base_syntax as default;
 
wenzelm 
parents: 
57976 
diff
changeset
 | 
374  | 
def make(nodes: Nodes): Version = new Version(Document_ID.make(), nodes)  | 
| 38417 | 375  | 
}  | 
376  | 
||
| 46712 | 377  | 
final class Version private(  | 
| 
52530
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
378  | 
val id: Document_ID.Version = Document_ID.none,  | 
| 46723 | 379  | 
val nodes: Nodes = Nodes.empty)  | 
| 46941 | 380  | 
  {
 | 
| 55777 | 381  | 
    override def toString: String = "Version(" + id + ")"
 | 
| 46941 | 382  | 
}  | 
| 34660 | 383  | 
|
| 34859 | 384  | 
|
| 38424 | 385  | 
/* changes of plain text, eventually resulting in document edits */  | 
| 
38227
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
386  | 
|
| 
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
387  | 
object Change  | 
| 
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
388  | 
  {
 | 
| 46678 | 389  | 
val init: Change = new Change()  | 
390  | 
||
391  | 
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: 
57619 
diff
changeset
 | 
392  | 
new Change(Some(previous), edits.reverse, version)  | 
| 
38227
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
393  | 
}  | 
| 
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
394  | 
|
| 46712 | 395  | 
final class Change private(  | 
| 46677 | 396  | 
val previous: Option[Future[Version]] = Some(Future.value(Version.init)),  | 
| 
57620
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
397  | 
val rev_edits: List[Edit_Text] = Nil,  | 
| 46677 | 398  | 
val version: Future[Version] = Future.value(Version.init))  | 
| 
38227
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
399  | 
  {
 | 
| 44672 | 400  | 
def is_finished: Boolean =  | 
401  | 
      (previous match { case None => true case Some(future) => future.is_finished }) &&
 | 
|
402  | 
version.is_finished  | 
|
403  | 
||
| 46678 | 404  | 
def truncate: Change = new Change(None, Nil, version)  | 
| 
38227
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
405  | 
}  | 
| 
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
406  | 
|
| 
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
407  | 
|
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
408  | 
/* history navigation */  | 
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
409  | 
|
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
410  | 
object History  | 
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
411  | 
  {
 | 
| 46679 | 412  | 
val init: History = new History()  | 
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
413  | 
}  | 
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
414  | 
|
| 46712 | 415  | 
final class History private(  | 
| 46679 | 416  | 
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: 
38569 
diff
changeset
 | 
417  | 
  {
 | 
| 46679 | 418  | 
def tip: Change = undo_list.head  | 
419  | 
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: 
38569 
diff
changeset
 | 
420  | 
|
| 46679 | 421  | 
def prune(check: Change => Boolean, retain: Int): Option[(List[Change], History)] =  | 
422  | 
    {
 | 
|
423  | 
val n = undo_list.iterator.zipWithIndex.find(p => check(p._1)).get._2 + 1  | 
|
424  | 
val (retained, dropped) = undo_list.splitAt(n max retain)  | 
|
425  | 
||
426  | 
      retained.splitAt(retained.length - 1) match {
 | 
|
427  | 
case (prefix, List(last)) => Some(dropped, new History(prefix ::: List(last.truncate)))  | 
|
428  | 
case _ => None  | 
|
429  | 
}  | 
|
430  | 
}  | 
|
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
431  | 
}  | 
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
432  | 
|
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
433  | 
|
| 
55820
 
61869776ce1f
tuned signature -- more explicit Document.Elements;
 
wenzelm 
parents: 
55801 
diff
changeset
 | 
434  | 
/* snapshot */  | 
| 38424 | 435  | 
|
| 52972 | 436  | 
object Snapshot  | 
437  | 
  {
 | 
|
438  | 
val init = State.init.snapshot()  | 
|
439  | 
}  | 
|
440  | 
||
| 38424 | 441  | 
abstract class Snapshot  | 
442  | 
  {
 | 
|
| 44582 | 443  | 
val state: State  | 
| 38424 | 444  | 
val version: Version  | 
445  | 
val is_outdated: Boolean  | 
|
| 
55649
 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 
wenzelm 
parents: 
55620 
diff
changeset
 | 
446  | 
|
| 38427 | 447  | 
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: 
52887 
diff
changeset
 | 
448  | 
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: 
38976 
diff
changeset
 | 
449  | 
def convert(range: Text.Range): Text.Range  | 
| 
 
0468964aec11
simplified Markup_Tree.select: Stream instead of Iterator (again), explicit Option instead of default;
 
wenzelm 
parents: 
38976 
diff
changeset
 | 
450  | 
def revert(range: Text.Range): Text.Range  | 
| 52972 | 451  | 
|
452  | 
val node_name: Node.Name  | 
|
453  | 
val node: Node  | 
|
| 56314 | 454  | 
val load_commands: List[Command]  | 
| 
56176
 
0bc9b0ad6287
tuned rendering -- avoid flashing background of aux. files that are disconnected from the document model;
 
wenzelm 
parents: 
55820 
diff
changeset
 | 
455  | 
def is_loaded: Boolean  | 
| 
55649
 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 
wenzelm 
parents: 
55620 
diff
changeset
 | 
456  | 
|
| 
55651
 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 
wenzelm 
parents: 
55650 
diff
changeset
 | 
457  | 
def cumulate[A](  | 
| 
55649
 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 
wenzelm 
parents: 
55620 
diff
changeset
 | 
458  | 
range: Text.Range,  | 
| 
 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 
wenzelm 
parents: 
55620 
diff
changeset
 | 
459  | 
info: A,  | 
| 56743 | 460  | 
elements: Markup.Elements,  | 
| 
56354
 
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
 
wenzelm 
parents: 
56337 
diff
changeset
 | 
461  | 
result: List[Command.State] => (A, Text.Markup) => Option[A],  | 
| 
55651
 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 
wenzelm 
parents: 
55650 
diff
changeset
 | 
462  | 
status: Boolean = false): List[Text.Info[A]]  | 
| 
 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 
wenzelm 
parents: 
55650 
diff
changeset
 | 
463  | 
|
| 
 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 
wenzelm 
parents: 
55650 
diff
changeset
 | 
464  | 
def select[A](  | 
| 
55649
 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 
wenzelm 
parents: 
55620 
diff
changeset
 | 
465  | 
range: Text.Range,  | 
| 56743 | 466  | 
elements: Markup.Elements,  | 
| 
56354
 
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
 
wenzelm 
parents: 
56337 
diff
changeset
 | 
467  | 
result: List[Command.State] => Text.Markup => Option[A],  | 
| 
55651
 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 
wenzelm 
parents: 
55650 
diff
changeset
 | 
468  | 
status: Boolean = false): List[Text.Info[A]]  | 
| 38424 | 469  | 
}  | 
470  | 
||
| 
55820
 
61869776ce1f
tuned signature -- more explicit Document.Elements;
 
wenzelm 
parents: 
55801 
diff
changeset
 | 
471  | 
|
| 
 
61869776ce1f
tuned signature -- more explicit Document.Elements;
 
wenzelm 
parents: 
55801 
diff
changeset
 | 
472  | 
|
| 
 
61869776ce1f
tuned signature -- more explicit Document.Elements;
 
wenzelm 
parents: 
55801 
diff
changeset
 | 
473  | 
/** global state -- document structure, execution process, editing history **/  | 
| 
 
61869776ce1f
tuned signature -- more explicit Document.Elements;
 
wenzelm 
parents: 
55801 
diff
changeset
 | 
474  | 
|
| 52563 | 475  | 
type Assign_Update =  | 
476  | 
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: 
44475 
diff
changeset
 | 
477  | 
|
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
478  | 
object State  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
479  | 
  {
 | 
| 38373 | 480  | 
class Fail(state: State) extends Exception  | 
481  | 
||
| 
44479
 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 
wenzelm 
parents: 
44477 
diff
changeset
 | 
482  | 
object Assignment  | 
| 
 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 
wenzelm 
parents: 
44477 
diff
changeset
 | 
483  | 
    {
 | 
| 46683 | 484  | 
val init: Assignment = new Assignment()  | 
| 
44479
 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 
wenzelm 
parents: 
44477 
diff
changeset
 | 
485  | 
}  | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
486  | 
|
| 46712 | 487  | 
final class Assignment private(  | 
| 
52530
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
488  | 
val command_execs: Map[Document_ID.Command, List[Document_ID.Exec]] = Map.empty,  | 
| 46677 | 489  | 
val is_finished: Boolean = false)  | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
490  | 
    {
 | 
| 44477 | 491  | 
      def check_finished: Assignment = { require(is_finished); this }
 | 
| 
47388
 
fe4b245af74c
discontinued obsolete last_execs (cf. cd3ab7625519);
 
wenzelm 
parents: 
46997 
diff
changeset
 | 
492  | 
def unfinished: Assignment = new Assignment(command_execs, false)  | 
| 
44479
 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 
wenzelm 
parents: 
44477 
diff
changeset
 | 
493  | 
|
| 52563 | 494  | 
def assign(update: Assign_Update): Assignment =  | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
495  | 
      {
 | 
| 
38976
 
a4a465dc89d9
Document.State.Assignment: eliminated promise in favour of plain values -- signalling is done via event bus in Session;
 
wenzelm 
parents: 
38885 
diff
changeset
 | 
496  | 
require(!is_finished)  | 
| 
44479
 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 
wenzelm 
parents: 
44477 
diff
changeset
 | 
497  | 
val command_execs1 =  | 
| 52563 | 498  | 
          (command_execs /: update) {
 | 
499  | 
case (res, (command_id, exec_ids)) =>  | 
|
500  | 
if (exec_ids.isEmpty) res - command_id  | 
|
501  | 
else res + (command_id -> exec_ids)  | 
|
| 
44479
 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 
wenzelm 
parents: 
44477 
diff
changeset
 | 
502  | 
}  | 
| 
47388
 
fe4b245af74c
discontinued obsolete last_execs (cf. cd3ab7625519);
 
wenzelm 
parents: 
46997 
diff
changeset
 | 
503  | 
new Assignment(command_execs1, true)  | 
| 
38150
 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 
wenzelm 
parents: 
37849 
diff
changeset
 | 
504  | 
}  | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
505  | 
}  | 
| 46682 | 506  | 
|
507  | 
val init: State =  | 
|
| 52563 | 508  | 
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: 
38367 
diff
changeset
 | 
509  | 
}  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
510  | 
|
| 46712 | 511  | 
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: 
56468 
diff
changeset
 | 
512  | 
/*reachable versions*/  | 
| 60215 | 513  | 
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: 
56468 
diff
changeset
 | 
514  | 
/*inlined auxiliary files*/  | 
| 60215 | 515  | 
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: 
56468 
diff
changeset
 | 
516  | 
/*static markup from define_command*/  | 
| 60215 | 517  | 
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: 
56468 
diff
changeset
 | 
518  | 
/*dynamic markup from execution*/  | 
| 60215 | 519  | 
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: 
56468 
diff
changeset
 | 
520  | 
/*command-exec assignment for each version*/  | 
| 60215 | 521  | 
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: 
56468 
diff
changeset
 | 
522  | 
/*commands with markup produced by other commands (imm_succs)*/  | 
| 60215 | 523  | 
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: 
56468 
diff
changeset
 | 
524  | 
/*explicit (linear) history*/  | 
| 60215 | 525  | 
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: 
57842 
diff
changeset
 | 
526  | 
/*intermediate state between remove_versions/removed_versions*/  | 
| 60215 | 527  | 
removing_versions: Boolean = false)  | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
528  | 
  {
 | 
| 38373 | 529  | 
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: 
38367 
diff
changeset
 | 
530  | 
|
| 
44479
 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 
wenzelm 
parents: 
44477 
diff
changeset
 | 
531  | 
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: 
38367 
diff
changeset
 | 
532  | 
    {
 | 
| 38417 | 533  | 
val id = version.id  | 
534  | 
copy(versions = versions + (id -> version),  | 
|
| 
44479
 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 
wenzelm 
parents: 
44477 
diff
changeset
 | 
535  | 
assignments = assignments + (id -> assignment.unfinished))  | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
536  | 
}  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
537  | 
|
| 
54519
 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 
wenzelm 
parents: 
54515 
diff
changeset
 | 
538  | 
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: 
54515 
diff
changeset
 | 
539  | 
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: 
54515 
diff
changeset
 | 
540  | 
|
| 38373 | 541  | 
def define_command(command: Command): State =  | 
542  | 
    {
 | 
|
543  | 
val id = command.id  | 
|
| 49414 | 544  | 
copy(commands = commands + (id -> command.init_state))  | 
| 38373 | 545  | 
}  | 
546  | 
||
| 
52530
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
547  | 
def defined_command(id: Document_ID.Command): Boolean = commands.isDefinedAt(id)  | 
| 44582 | 548  | 
|
| 52531 | 549  | 
def find_command(version: Version, id: Document_ID.Generic): Option[(Node, Command)] =  | 
| 44582 | 550  | 
      commands.get(id) orElse execs.get(id) match {
 | 
551  | 
case None => None  | 
|
552  | 
case Some(st) =>  | 
|
553  | 
val command = st.command  | 
|
| 46681 | 554  | 
val node = version.nodes(command.node_name)  | 
| 
54328
 
ffa4e0b1701e
more strict find_command -- avoid invalid hyperlink_command;
 
wenzelm 
parents: 
52978 
diff
changeset
 | 
555  | 
if (node.commands.contains(command)) Some((node, command)) else None  | 
| 44582 | 556  | 
}  | 
| 38373 | 557  | 
|
| 
52530
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
558  | 
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: 
52563 
diff
changeset
 | 
559  | 
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: 
52563 
diff
changeset
 | 
560  | 
def the_dynamic_state(id: Document_ID.Exec): Command.State = execs.getOrElse(id, fail)  | 
| 52563 | 561  | 
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: 
38367 
diff
changeset
 | 
562  | 
|
| 
56470
 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 
wenzelm 
parents: 
56468 
diff
changeset
 | 
563  | 
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: 
56176 
diff
changeset
 | 
564  | 
id == st.command.id ||  | 
| 
 
a40e67ce4f84
clarified valid_id: always standardize towards static command.id;
 
wenzelm 
parents: 
56176 
diff
changeset
 | 
565  | 
      (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: 
56176 
diff
changeset
 | 
566  | 
|
| 56746 | 567  | 
private def other_id(id: Document_ID.Generic)  | 
| 
63032
 
e0fa59bbc956
reactivated other_id reports (see also db929027e701, 8eda56033203);
 
wenzelm 
parents: 
63020 
diff
changeset
 | 
568  | 
: 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: 
56468 
diff
changeset
 | 
569  | 
(execs.get(id) orElse commands.get(id)).map(st =>  | 
| 56746 | 570  | 
((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: 
56468 
diff
changeset
 | 
571  | 
|
| 56475 | 572  | 
private def redirection(st: Command.State): Graph[Document_ID.Command, Unit] =  | 
573  | 
      (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: 
56468 
diff
changeset
 | 
574  | 
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: 
56468 
diff
changeset
 | 
575  | 
|
| 52531 | 576  | 
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: 
56468 
diff
changeset
 | 
577  | 
    {
 | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
578  | 
      execs.get(id) match {
 | 
| 44446 | 579  | 
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: 
56468 
diff
changeset
 | 
580  | 
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: 
56468 
diff
changeset
 | 
581  | 
val execs1 = execs + (id -> new_st)  | 
| 56475 | 582  | 
(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: 
38367 
diff
changeset
 | 
583  | 
case None =>  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
584  | 
          commands.get(id) match {
 | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
585  | 
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: 
56468 
diff
changeset
 | 
586  | 
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: 
56468 
diff
changeset
 | 
587  | 
val commands1 = commands + (id -> new_st)  | 
| 56475 | 588  | 
(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: 
38367 
diff
changeset
 | 
589  | 
case None => fail  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
590  | 
}  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
591  | 
}  | 
| 
56470
 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 
wenzelm 
parents: 
56468 
diff
changeset
 | 
592  | 
}  | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
593  | 
|
| 52563 | 594  | 
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: 
38367 
diff
changeset
 | 
595  | 
    {
 | 
| 38417 | 596  | 
val version = the_version(id)  | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
597  | 
|
| 
52566
 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 
wenzelm 
parents: 
52564 
diff
changeset
 | 
598  | 
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: 
52564 
diff
changeset
 | 
599  | 
: Option[(Document_ID.Exec, Command.State)] =  | 
| 
 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 
wenzelm 
parents: 
52564 
diff
changeset
 | 
600  | 
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: 
52564 
diff
changeset
 | 
601  | 
|
| 44543 | 602  | 
val (changed_commands, new_execs) =  | 
| 52563 | 603  | 
        ((Nil: List[Command], execs) /: update) {
 | 
| 
52566
 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 
wenzelm 
parents: 
52564 
diff
changeset
 | 
604  | 
case ((commands1, execs1), (command_id, exec)) =>  | 
| 
 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 
wenzelm 
parents: 
52564 
diff
changeset
 | 
605  | 
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: 
52564 
diff
changeset
 | 
606  | 
val command = st.command  | 
| 
52527
 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 
wenzelm 
parents: 
52508 
diff
changeset
 | 
607  | 
val commands2 = command :: commands1  | 
| 44543 | 608  | 
val execs2 =  | 
609  | 
              exec match {
 | 
|
| 
52527
 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 
wenzelm 
parents: 
52508 
diff
changeset
 | 
610  | 
case Nil => execs1  | 
| 
 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 
wenzelm 
parents: 
52508 
diff
changeset
 | 
611  | 
case eval_id :: print_ids =>  | 
| 
52566
 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 
wenzelm 
parents: 
52564 
diff
changeset
 | 
612  | 
execs1 ++ upd(eval_id, st) ++  | 
| 
 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 
wenzelm 
parents: 
52564 
diff
changeset
 | 
613  | 
(for (id <- print_ids; up <- upd(id, command.empty_state)) yield up)  | 
| 44543 | 614  | 
}  | 
615  | 
(commands2, execs2)  | 
|
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
616  | 
}  | 
| 52563 | 617  | 
val new_assignment = the_assignment(version).assign(update)  | 
| 43722 | 618  | 
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: 
44475 
diff
changeset
 | 
619  | 
|
| 44543 | 620  | 
(changed_commands, new_state)  | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
621  | 
}  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
622  | 
|
| 38417 | 623  | 
def is_assigned(version: Version): Boolean =  | 
| 43722 | 624  | 
      assignments.get(version.id) match {
 | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
625  | 
case Some(assgn) => assgn.is_finished  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
626  | 
case None => false  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
627  | 
}  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
628  | 
|
| 
44436
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44385 
diff
changeset
 | 
629  | 
def is_stable(change: Change): Boolean =  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44385 
diff
changeset
 | 
630  | 
change.is_finished && is_assigned(change.version.get_finished)  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44385 
diff
changeset
 | 
631  | 
|
| 
46944
 
9fc22eb6408c
more recent recent_syntax, e.g. relevant for document rendering during startup;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
632  | 
def recent_finished: Change = history.undo_list.find(_.is_finished) getOrElse fail  | 
| 44672 | 633  | 
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: 
60916 
diff
changeset
 | 
634  | 
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: 
60916 
diff
changeset
 | 
635  | 
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: 
44385 
diff
changeset
 | 
636  | 
|
| 44446 | 637  | 
def continue_history(  | 
| 56711 | 638  | 
previous: Future[Version],  | 
639  | 
edits: List[Edit_Text],  | 
|
640  | 
version: Future[Version]): State =  | 
|
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
641  | 
    {
 | 
| 46678 | 642  | 
val change = Change.make(previous, edits, version)  | 
| 56711 | 643  | 
copy(history = history + change)  | 
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
644  | 
}  | 
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
645  | 
|
| 
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: 
57842 
diff
changeset
 | 
646  | 
def remove_versions(retain: Int = 0): (List[Version], State) =  | 
| 44672 | 647  | 
    {
 | 
| 46679 | 648  | 
      history.prune(is_stable, retain) match {
 | 
649  | 
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: 
57842 
diff
changeset
 | 
650  | 
val old_versions = dropped.map(change => change.version.get_finished)  | 
| 59319 | 651  | 
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: 
57842 
diff
changeset
 | 
652  | 
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: 
57842 
diff
changeset
 | 
653  | 
(old_versions, state1)  | 
| 46679 | 654  | 
case None => fail  | 
| 44672 | 655  | 
}  | 
656  | 
}  | 
|
657  | 
||
| 
52530
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
658  | 
def removed_versions(removed: List[Document_ID.Version]): State =  | 
| 44676 | 659  | 
    {
 | 
660  | 
val versions1 = versions -- removed  | 
|
661  | 
val assignments1 = assignments -- removed  | 
|
| 
54519
 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 
wenzelm 
parents: 
54515 
diff
changeset
 | 
662  | 
var blobs1 = Set.empty[SHA1.Digest]  | 
| 
52530
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
663  | 
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: 
52527 
diff
changeset
 | 
664  | 
var execs1 = Map.empty[Document_ID.Exec, Command.State]  | 
| 44676 | 665  | 
      for {
 | 
666  | 
(version_id, version) <- versions1.iterator  | 
|
| 46997 | 667  | 
command_execs = assignments1(version_id).command_execs  | 
| 
56372
 
fadb0fef09d7
more explicit iterator terminology, in accordance to Scala 2.8 library;
 
wenzelm 
parents: 
56354 
diff
changeset
 | 
668  | 
(_, node) <- version.nodes.iterator  | 
| 44676 | 669  | 
command <- node.commands.iterator  | 
670  | 
      } {
 | 
|
| 
57842
 
8e4ae2db1849
more direct access to persistent blobs (see also 8953d4cc060a), avoiding fragile digest lookup from later version (which might have removed unused blobs already);
 
wenzelm 
parents: 
57621 
diff
changeset
 | 
671  | 
for ((_, digest) <- command.blobs_defined; if !blobs1.contains(digest))  | 
| 
54519
 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 
wenzelm 
parents: 
54515 
diff
changeset
 | 
672  | 
blobs1 += digest  | 
| 
 
5fed81762406
maintain blobs within document state: digest + text in ML, digest-only in Scala;
 
wenzelm 
parents: 
54515 
diff
changeset
 | 
673  | 
|
| 52568 | 674  | 
if (!commands1.isDefinedAt(command.id))  | 
675  | 
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: 
54515 
diff
changeset
 | 
676  | 
|
| 52568 | 677  | 
        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: 
52508 
diff
changeset
 | 
678  | 
if (!execs1.isDefinedAt(exec_id))  | 
| 
 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 
wenzelm 
parents: 
52508 
diff
changeset
 | 
679  | 
execs.get(exec_id).foreach(st => execs1 += (exec_id -> st))  | 
| 44676 | 680  | 
}  | 
681  | 
}  | 
|
| 
56470
 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 
wenzelm 
parents: 
56468 
diff
changeset
 | 
682  | 
copy(  | 
| 
 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 
wenzelm 
parents: 
56468 
diff
changeset
 | 
683  | 
versions = versions1,  | 
| 
 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 
wenzelm 
parents: 
56468 
diff
changeset
 | 
684  | 
blobs = blobs1,  | 
| 
 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 
wenzelm 
parents: 
56468 
diff
changeset
 | 
685  | 
commands = commands1,  | 
| 
 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 
wenzelm 
parents: 
56468 
diff
changeset
 | 
686  | 
execs = execs1,  | 
| 56475 | 687  | 
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: 
57842 
diff
changeset
 | 
688  | 
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: 
57842 
diff
changeset
 | 
689  | 
removing_versions = false)  | 
| 44676 | 690  | 
}  | 
691  | 
||
| 
56470
 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 
wenzelm 
parents: 
56468 
diff
changeset
 | 
692  | 
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: 
56468 
diff
changeset
 | 
693  | 
: List[(Document_ID.Generic, Command.State)] =  | 
| 44613 | 694  | 
    {
 | 
695  | 
require(is_assigned(version))  | 
|
696  | 
      try {
 | 
|
| 
52527
 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 
wenzelm 
parents: 
52508 
diff
changeset
 | 
697  | 
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: 
56468 
diff
changeset
 | 
698  | 
          .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: 
52508 
diff
changeset
 | 
699  | 
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: 
56468 
diff
changeset
 | 
700  | 
case res => res  | 
| 
52527
 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 
wenzelm 
parents: 
52508 
diff
changeset
 | 
701  | 
}  | 
| 44613 | 702  | 
}  | 
| 
47395
 
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
 
wenzelm 
parents: 
47388 
diff
changeset
 | 
703  | 
      catch {
 | 
| 
 
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
 
wenzelm 
parents: 
47388 
diff
changeset
 | 
704  | 
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: 
56468 
diff
changeset
 | 
705  | 
          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: 
56468 
diff
changeset
 | 
706  | 
          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: 
47388 
diff
changeset
 | 
707  | 
}  | 
| 44613 | 708  | 
}  | 
709  | 
||
| 
56470
 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 
wenzelm 
parents: 
56468 
diff
changeset
 | 
710  | 
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: 
56468 
diff
changeset
 | 
711  | 
    {
 | 
| 
 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 
wenzelm 
parents: 
56468 
diff
changeset
 | 
712  | 
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: 
56468 
diff
changeset
 | 
713  | 
val others =  | 
| 56475 | 714  | 
        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: 
56468 
diff
changeset
 | 
715  | 
          (for {
 | 
| 56475 | 716  | 
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: 
56468 
diff
changeset
 | 
717  | 
(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: 
56468 
diff
changeset
 | 
718  | 
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: 
56468 
diff
changeset
 | 
719  | 
} 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: 
56468 
diff
changeset
 | 
720  | 
}  | 
| 
 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 
wenzelm 
parents: 
56468 
diff
changeset
 | 
721  | 
else Nil  | 
| 56489 | 722  | 
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: 
56468 
diff
changeset
 | 
723  | 
}  | 
| 
 
8eda56033203
accumulate markup reports for "other" command ids, which are later retargeted and merged for rendering (in erratic order);
 
wenzelm 
parents: 
56468 
diff
changeset
 | 
724  | 
|
| 
56299
 
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
 
wenzelm 
parents: 
56298 
diff
changeset
 | 
725  | 
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: 
56298 
diff
changeset
 | 
726  | 
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: 
56298 
diff
changeset
 | 
727  | 
|
| 
56301
 
1da7b4c33db9
more frugal merge of markup trees: filter wrt. subsequent query;
 
wenzelm 
parents: 
56300 
diff
changeset
 | 
728  | 
def command_markup(version: Version, command: Command, index: Command.Markup_Index,  | 
| 56743 | 729  | 
range: Text.Range, elements: Markup.Elements): Markup_Tree =  | 
| 
56301
 
1da7b4c33db9
more frugal merge of markup trees: filter wrt. subsequent query;
 
wenzelm 
parents: 
56300 
diff
changeset
 | 
730  | 
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: 
56298 
diff
changeset
 | 
731  | 
|
| 56743 | 732  | 
def markup_to_XML(version: Version, node: Node, elements: Markup.Elements): XML.Body =  | 
| 
56299
 
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
 
wenzelm 
parents: 
56298 
diff
changeset
 | 
733  | 
      (for {
 | 
| 
 
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
 
wenzelm 
parents: 
56298 
diff
changeset
 | 
734  | 
command <- node.commands.iterator  | 
| 
56301
 
1da7b4c33db9
more frugal merge of markup trees: filter wrt. subsequent query;
 
wenzelm 
parents: 
56300 
diff
changeset
 | 
735  | 
markup =  | 
| 
 
1da7b4c33db9
more frugal merge of markup trees: filter wrt. subsequent query;
 
wenzelm 
parents: 
56300 
diff
changeset
 | 
736  | 
command_markup(version, command, Command.Markup_Index.markup, command.range, elements)  | 
| 56300 | 737  | 
tree <- markup.to_XML(command.range, command.source, elements)  | 
| 
56299
 
8201790fdeb9
more careful treatment of multiple command states (eval + prints): merge content that is actually required;
 
wenzelm 
parents: 
56298 
diff
changeset
 | 
738  | 
} yield tree).toList  | 
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
739  | 
|
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
740  | 
// persistent user-view  | 
| 49346 | 741  | 
def snapshot(name: Node.Name = Node.Name.empty, pending_edits: List[Text.Edit] = Nil)  | 
742  | 
: Snapshot =  | 
|
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
743  | 
    {
 | 
| 44672 | 744  | 
val stable = recent_stable  | 
| 
44436
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44385 
diff
changeset
 | 
745  | 
val latest = history.tip  | 
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
746  | 
|
| 
57620
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
747  | 
|
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
748  | 
/* pending edits and unstable changes */  | 
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
749  | 
|
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
750  | 
val rev_pending_changes =  | 
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
751  | 
        for {
 | 
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
752  | 
change <- history.undo_list.takeWhile(_ != stable)  | 
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
753  | 
(a, edits) <- change.rev_edits  | 
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
754  | 
if a == name  | 
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
755  | 
} yield edits  | 
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
756  | 
|
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
757  | 
      val is_cleared = rev_pending_changes.exists({ case Node.Clear() => true case _ => false })
 | 
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
758  | 
val edits =  | 
| 
57620
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
759  | 
if (is_cleared) Nil  | 
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
760  | 
else  | 
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
761  | 
          (pending_edits /: rev_pending_changes)({
 | 
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
762  | 
case (edits, Node.Edits(es)) => es ::: edits  | 
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
763  | 
case (edits, _) => edits  | 
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
764  | 
})  | 
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
765  | 
lazy val reverse_edits = edits.reverse  | 
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
766  | 
|
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
767  | 
new Snapshot  | 
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
768  | 
      {
 | 
| 52972 | 769  | 
/* global information */  | 
770  | 
||
| 44582 | 771  | 
val state = State.this  | 
| 39698 | 772  | 
val version = stable.version.get_finished  | 
| 59319 | 773  | 
val is_outdated = pending_edits.nonEmpty || latest != stable  | 
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
774  | 
|
| 
55649
 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 
wenzelm 
parents: 
55620 
diff
changeset
 | 
775  | 
|
| 
 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 
wenzelm 
parents: 
55620 
diff
changeset
 | 
776  | 
/* local node content */  | 
| 
 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 
wenzelm 
parents: 
55620 
diff
changeset
 | 
777  | 
|
| 
57620
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
778  | 
def convert(offset: Text.Offset) =  | 
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
779  | 
if (is_cleared) 0 else (offset /: edits)((i, edit) => edit.convert(i))  | 
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
780  | 
def revert(offset: Text.Offset) =  | 
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
781  | 
if (is_cleared) 0 else (offset /: reverse_edits)((i, edit) => edit.revert(i))  | 
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
782  | 
|
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
783  | 
def convert(range: Text.Range) = range.map(convert(_))  | 
| 
 
c30ab960875e
more explicit treatment of cleared nodes (removal is implicit);
 
wenzelm 
parents: 
57619 
diff
changeset
 | 
784  | 
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: 
38976 
diff
changeset
 | 
785  | 
|
| 52972 | 786  | 
val node_name = name  | 
787  | 
val node = version.nodes(name)  | 
|
788  | 
||
| 56314 | 789  | 
val load_commands: List[Command] =  | 
| 
55432
 
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
 
wenzelm 
parents: 
55431 
diff
changeset
 | 
790  | 
if (node_name.is_theory) Nil  | 
| 56314 | 791  | 
else version.nodes.load_commands(node_name)  | 
| 
55432
 
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
 
wenzelm 
parents: 
55431 
diff
changeset
 | 
792  | 
|
| 59319 | 793  | 
val is_loaded: Boolean = node_name.is_theory || load_commands.nonEmpty  | 
| 
56176
 
0bc9b0ad6287
tuned rendering -- avoid flashing background of aux. files that are disconnected from the document model;
 
wenzelm 
parents: 
55820 
diff
changeset
 | 
794  | 
|
| 
55649
 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 
wenzelm 
parents: 
55620 
diff
changeset
 | 
795  | 
|
| 
 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 
wenzelm 
parents: 
55620 
diff
changeset
 | 
796  | 
/* cumulate markup */  | 
| 
 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 
wenzelm 
parents: 
55620 
diff
changeset
 | 
797  | 
|
| 
55651
 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 
wenzelm 
parents: 
55650 
diff
changeset
 | 
798  | 
def cumulate[A](  | 
| 
55649
 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 
wenzelm 
parents: 
55620 
diff
changeset
 | 
799  | 
range: Text.Range,  | 
| 
 
1532ab0dc67b
more general / abstract Command.Markups, with separate index for status elements;
 
wenzelm 
parents: 
55620 
diff
changeset
 | 
800  | 
info: A,  | 
| 56743 | 801  | 
elements: Markup.Elements,  | 
| 
56354
 
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
 
wenzelm 
parents: 
56337 
diff
changeset
 | 
802  | 
result: List[Command.State] => (A, Text.Markup) => Option[A],  | 
| 
55651
 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 
wenzelm 
parents: 
55650 
diff
changeset
 | 
803  | 
status: Boolean = false): List[Text.Info[A]] =  | 
| 45459 | 804  | 
        {
 | 
| 
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: 
56514 
diff
changeset
 | 
805  | 
val former_range = revert(range).inflate_singularity  | 
| 
56462
 
b64b0cb845fe
more explicit Command.Chunk types, less ooddities;
 
wenzelm 
parents: 
56398 
diff
changeset
 | 
806  | 
val (chunk_name, command_iterator) =  | 
| 56314 | 807  | 
            load_commands match {
 | 
| 56746 | 808  | 
case command :: _ => (Symbol.Text_Chunk.File(node_name.node), Iterator((command, 0)))  | 
809  | 
case _ => (Symbol.Text_Chunk.Default, node.command_iterator(former_range))  | 
|
| 56309 | 810  | 
}  | 
| 
56462
 
b64b0cb845fe
more explicit Command.Chunk types, less ooddities;
 
wenzelm 
parents: 
56398 
diff
changeset
 | 
811  | 
val markup_index = Command.Markup_Index(status, chunk_name)  | 
| 56309 | 812  | 
          (for {
 | 
| 
56373
 
0605d90be6fc
tuned signature -- more explicit iterator terminology;
 
wenzelm 
parents: 
56372 
diff
changeset
 | 
813  | 
(command, command_start) <- command_iterator  | 
| 
56462
 
b64b0cb845fe
more explicit Command.Chunk types, less ooddities;
 
wenzelm 
parents: 
56398 
diff
changeset
 | 
814  | 
chunk <- command.chunks.get(chunk_name).iterator  | 
| 56309 | 815  | 
states = state.command_states(version, command)  | 
| 
56354
 
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
 
wenzelm 
parents: 
56337 
diff
changeset
 | 
816  | 
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: 
56514 
diff
changeset
 | 
817  | 
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: 
56514 
diff
changeset
 | 
818  | 
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: 
56514 
diff
changeset
 | 
819  | 
Text.Info(r0, a) <- markup.cumulate[A](markup_range, info, elements,  | 
| 56309 | 820  | 
              {
 | 
821  | 
case (a, Text.Info(r0, b)) => res(a, Text.Info(convert(r0 + command_start), b))  | 
|
822  | 
}).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: 
56514 
diff
changeset
 | 
823  | 
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: 
56514 
diff
changeset
 | 
824  | 
} yield Text.Info(r1, a)).toList  | 
| 45459 | 825  | 
}  | 
826  | 
||
| 
55651
 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 
wenzelm 
parents: 
55650 
diff
changeset
 | 
827  | 
def select[A](  | 
| 
 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 
wenzelm 
parents: 
55650 
diff
changeset
 | 
828  | 
range: Text.Range,  | 
| 56743 | 829  | 
elements: Markup.Elements,  | 
| 
56354
 
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
 
wenzelm 
parents: 
56337 
diff
changeset
 | 
830  | 
result: List[Command.State] => Text.Markup => Option[A],  | 
| 
55651
 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 
wenzelm 
parents: 
55650 
diff
changeset
 | 
831  | 
status: Boolean = false): List[Text.Info[A]] =  | 
| 
38845
 
a9e37daf5bd0
added Document.Snapshot.select_markup, which includes command iteration, range conversion etc.;
 
wenzelm 
parents: 
38841 
diff
changeset
 | 
832  | 
        {
 | 
| 
56354
 
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
 
wenzelm 
parents: 
56337 
diff
changeset
 | 
833  | 
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: 
50204 
diff
changeset
 | 
834  | 
          {
 | 
| 
56354
 
a6f8c3566560
more direct command states -- merge_results is hardly ever needed;
 
wenzelm 
parents: 
56337 
diff
changeset
 | 
835  | 
val res = result(states)  | 
| 
52889
 
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
 
wenzelm 
parents: 
52887 
diff
changeset
 | 
836  | 
(_: Option[A], x: Text.Markup) =>  | 
| 
 
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
 
wenzelm 
parents: 
52887 
diff
changeset
 | 
837  | 
              res(x) match {
 | 
| 
 
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
 
wenzelm 
parents: 
52887 
diff
changeset
 | 
838  | 
case None => None  | 
| 
 
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
 
wenzelm 
parents: 
52887 
diff
changeset
 | 
839  | 
case some => Some(some)  | 
| 
 
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
 
wenzelm 
parents: 
52887 
diff
changeset
 | 
840  | 
}  | 
| 
50500
 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 
wenzelm 
parents: 
50204 
diff
changeset
 | 
841  | 
}  | 
| 
55651
 
fa42cf3fe79b
tuned signature -- avoid redundancy and confusion of flags;
 
wenzelm 
parents: 
55650 
diff
changeset
 | 
842  | 
for (Text.Info(r, Some(x)) <- cumulate(range, None, elements, result1 _, status))  | 
| 
46198
 
cd040c5772de
improved select_markup: include filtering of defined results;
 
wenzelm 
parents: 
46178 
diff
changeset
 | 
843  | 
yield Text.Info(r, x)  | 
| 
38845
 
a9e37daf5bd0
added Document.Snapshot.select_markup, which includes command iteration, range conversion etc.;
 
wenzelm 
parents: 
38841 
diff
changeset
 | 
844  | 
}  | 
| 55800 | 845  | 
|
846  | 
||
847  | 
/* output */  | 
|
848  | 
||
849  | 
override def toString: String =  | 
|
850  | 
"Snapshot(node = " + node_name.node + ", version = " + version.id +  | 
|
851  | 
(if (is_outdated) ", outdated" else "") + ")"  | 
|
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
852  | 
}  | 
| 
38150
 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 
wenzelm 
parents: 
37849 
diff
changeset
 | 
853  | 
}  | 
| 34485 | 854  | 
}  | 
| 
34840
 
6c5560d48561
more precise treatment of document/state assigment;
 
wenzelm 
parents: 
34838 
diff
changeset
 | 
855  | 
}  | 
| 
 
6c5560d48561
more precise treatment of document/state assigment;
 
wenzelm 
parents: 
34838 
diff
changeset
 | 
856  |