| author | wenzelm | 
| Sat, 24 Aug 2013 17:39:18 +0200 | |
| changeset 53182 | 61b983193dc1 | 
| parent 52978 | 37fbb3fde380 | 
| child 54328 | ffa4e0b1701e | 
| 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))  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
41  | 
}  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
42  | 
|
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
43  | 
|
| 46723 | 44  | 
/* individual nodes */  | 
| 38424 | 45  | 
|
| 44615 | 46  | 
type Edit[A, B] = (Node.Name, Node.Edit[A, B])  | 
| 44384 | 47  | 
type Edit_Text = Edit[Text.Edit, Text.Perspective]  | 
| 52849 | 48  | 
type Edit_Command = Edit[Command.Edit, Command.Perspective]  | 
| 38151 | 49  | 
|
50  | 
object Node  | 
|
51  | 
  {
 | 
|
| 52887 | 52  | 
val empty: Node = new Node()  | 
53  | 
||
54  | 
||
55  | 
/* header and name */  | 
|
56  | 
||
| 
48707
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
57  | 
sealed case class Header(  | 
| 
46938
 
cda018294515
some support for outer syntax keyword declarations within theory header;
 
wenzelm 
parents: 
46814 
diff
changeset
 | 
58  | 
imports: List[Name],  | 
| 48706 | 59  | 
keywords: Thy_Header.Keywords,  | 
| 
48707
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
60  | 
errors: List[String] = Nil)  | 
| 
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
61  | 
    {
 | 
| 
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
62  | 
def error(msg: String): Header = copy(errors = errors ::: List(msg))  | 
| 
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
63  | 
}  | 
| 
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
64  | 
|
| 
51294
 
0850d43cb355
discontinued obsolete header "files" -- these are loaded explicitly after exploring dependencies;
 
wenzelm 
parents: 
51293 
diff
changeset
 | 
65  | 
def bad_header(msg: String): Header = Header(Nil, Nil, List(msg))  | 
| 46737 | 66  | 
|
| 
44957
 
098dd95349e7
more elaborate Node_Renderer, which paints node_name.theory only;
 
wenzelm 
parents: 
44676 
diff
changeset
 | 
67  | 
object Name  | 
| 
 
098dd95349e7
more elaborate Node_Renderer, which paints node_name.theory only;
 
wenzelm 
parents: 
44676 
diff
changeset
 | 
68  | 
    {
 | 
| 
 
098dd95349e7
more elaborate Node_Renderer, which paints node_name.theory only;
 
wenzelm 
parents: 
44676 
diff
changeset
 | 
69  | 
      val empty = Name("", "", "")
 | 
| 46723 | 70  | 
|
71  | 
object Ordering extends scala.math.Ordering[Name]  | 
|
72  | 
      {
 | 
|
73  | 
def compare(name1: Name, name2: Name): Int = name1.node compare name2.node  | 
|
74  | 
}  | 
|
| 
44957
 
098dd95349e7
more elaborate Node_Renderer, which paints node_name.theory only;
 
wenzelm 
parents: 
44676 
diff
changeset
 | 
75  | 
}  | 
| 52887 | 76  | 
|
| 44616 | 77  | 
sealed case class Name(node: String, dir: String, theory: String)  | 
| 44615 | 78  | 
    {
 | 
79  | 
override def hashCode: Int = node.hashCode  | 
|
80  | 
override def equals(that: Any): Boolean =  | 
|
81  | 
        that match {
 | 
|
82  | 
case other: Name => node == other.node  | 
|
83  | 
case _ => false  | 
|
84  | 
}  | 
|
| 44642 | 85  | 
override def toString: String = theory  | 
| 44615 | 86  | 
}  | 
87  | 
||
| 52887 | 88  | 
|
| 
52977
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
89  | 
/* node overlays */  | 
| 52887 | 90  | 
|
91  | 
object Overlays  | 
|
92  | 
    {
 | 
|
| 52976 | 93  | 
val empty = new Overlays(Multi_Map.empty)  | 
| 52887 | 94  | 
}  | 
95  | 
||
| 
52977
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
96  | 
final class Overlays private(rep: Multi_Map[Command, (String, List[String])])  | 
| 52887 | 97  | 
    {
 | 
98  | 
def commands: Set[Command] = rep.keySet  | 
|
99  | 
def is_empty: Boolean = rep.isEmpty  | 
|
| 
52977
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
100  | 
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
 | 
101  | 
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
 | 
102  | 
new Overlays(rep.insert(cmd, (fn, args)))  | 
| 
 
15254e32d299
central management of Document.Overlays, independent of Document_Model;
 
wenzelm 
parents: 
52976 
diff
changeset
 | 
103  | 
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
 | 
104  | 
new Overlays(rep.remove(cmd, (fn, args)))  | 
| 52887 | 105  | 
}  | 
106  | 
||
107  | 
||
108  | 
/* edits */  | 
|
109  | 
||
| 44384 | 110  | 
sealed abstract class Edit[A, B]  | 
| 44156 | 111  | 
    {
 | 
| 44383 | 112  | 
def foreach(f: A => Unit)  | 
113  | 
      {
 | 
|
| 44156 | 114  | 
        this match {
 | 
| 44383 | 115  | 
case Edits(es) => es.foreach(f)  | 
116  | 
case _ =>  | 
|
| 44156 | 117  | 
}  | 
| 44383 | 118  | 
}  | 
| 44156 | 119  | 
}  | 
| 44384 | 120  | 
case class Clear[A, B]() extends Edit[A, B]  | 
121  | 
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
 | 
122  | 
case class Deps[A, B](header: Header) extends Edit[A, B]  | 
| 52849 | 123  | 
case class Perspective[A, B](required: Boolean, visible: B, overlays: Overlays) extends Edit[A, B]  | 
| 
52808
 
143f225e50f5
allow explicit indication of required node: full eval, no prints;
 
wenzelm 
parents: 
52568 
diff
changeset
 | 
124  | 
type Perspective_Text = Perspective[Text.Edit, Text.Perspective]  | 
| 52849 | 125  | 
type Perspective_Command = Perspective[Command.Edit, Command.Perspective]  | 
| 44156 | 126  | 
|
| 52887 | 127  | 
|
128  | 
/* commands */  | 
|
129  | 
||
| 
52901
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
130  | 
object Commands  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
131  | 
    {
 | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
132  | 
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
 | 
133  | 
val empty: Commands = apply(Linear_Set.empty)  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
134  | 
|
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
135  | 
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
 | 
136  | 
: Iterator[(Command, Text.Offset)] =  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
137  | 
      {
 | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
138  | 
var i = offset  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
139  | 
        for (command <- commands) yield {
 | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
140  | 
val start = i  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
141  | 
i += command.length  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
142  | 
(command, start)  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
143  | 
}  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
144  | 
}  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
145  | 
|
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
146  | 
private val block_size = 1024  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
147  | 
}  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
148  | 
|
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
149  | 
final class Commands private(val commands: Linear_Set[Command])  | 
| 
38227
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
150  | 
    {
 | 
| 
52901
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
151  | 
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
 | 
152  | 
      {
 | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
153  | 
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
 | 
154  | 
var next_block = 0  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
155  | 
var last_stop = 0  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
156  | 
        for ((command, start) <- Commands.starts(commands.iterator)) {
 | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
157  | 
last_stop = start + command.length  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
158  | 
          while (last_stop + 1 > next_block) {
 | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
159  | 
blocks += (command -> start)  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
160  | 
next_block += Commands.block_size  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
161  | 
}  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
162  | 
}  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
163  | 
(blocks.toArray, Text.Range(0, last_stop))  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
164  | 
}  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
165  | 
|
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
166  | 
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
 | 
167  | 
|
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
168  | 
def range(i: Text.Offset = 0): Iterator[(Command, Text.Offset)] =  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
169  | 
      {
 | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
170  | 
        if (!commands.isEmpty && full_range.contains(i)) {
 | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
171  | 
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
 | 
172  | 
          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
 | 
173  | 
case (cmd, start) => start + cmd.length <= i }  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
174  | 
}  | 
| 
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
175  | 
else Iterator.empty  | 
| 
38227
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
176  | 
}  | 
| 
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
177  | 
}  | 
| 38151 | 178  | 
}  | 
179  | 
||
| 46712 | 180  | 
final class Node private(  | 
| 
48707
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
181  | 
    val header: Node.Header = Node.bad_header("Bad theory header"),
 | 
| 52849 | 182  | 
val perspective: Node.Perspective_Command =  | 
| 52887 | 183  | 
Node.Perspective(false, Command.Perspective.empty, Node.Overlays.empty),  | 
| 
52901
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
184  | 
_commands: Node.Commands = Node.Commands.empty)  | 
| 38151 | 185  | 
  {
 | 
| 46680 | 186  | 
def clear: Node = new Node(header = header)  | 
187  | 
||
| 
48707
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
188  | 
def update_header(new_header: Node.Header): Node =  | 
| 
52901
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
189  | 
new Node(new_header, perspective, _commands)  | 
| 46680 | 190  | 
|
| 52849 | 191  | 
def update_perspective(new_perspective: Node.Perspective_Command): Node =  | 
| 
52901
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
192  | 
new Node(header, new_perspective, _commands)  | 
| 46680 | 193  | 
|
| 52849 | 194  | 
def same_perspective(other_perspective: Node.Perspective_Command): Boolean =  | 
195  | 
perspective.required == other_perspective.required &&  | 
|
196  | 
perspective.visible.same(other_perspective.visible) &&  | 
|
197  | 
perspective.overlays == other_perspective.overlays  | 
|
| 
52808
 
143f225e50f5
allow explicit indication of required node: full eval, no prints;
 
wenzelm 
parents: 
52568 
diff
changeset
 | 
198  | 
|
| 
52901
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
199  | 
def commands: Linear_Set[Command] = _commands.commands  | 
| 
43697
 
77ce24aa1770
explicit Document.Node.Header, with master_dir and thy_name;
 
wenzelm 
parents: 
43662 
diff
changeset
 | 
200  | 
|
| 
52901
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
201  | 
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
 | 
202  | 
if (new_commands eq _commands.commands) this  | 
| 
52901
 
8be75f53db82
maintain commands together with index -- avoid redundant reconstruction of full_index;
 
wenzelm 
parents: 
52900 
diff
changeset
 | 
203  | 
else new Node(header, perspective, Node.Commands(new_commands))  | 
| 38151 | 204  | 
|
| 38569 | 205  | 
def command_range(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
 | 
206  | 
_commands.range(i)  | 
| 38151 | 207  | 
|
| 38569 | 208  | 
def command_range(range: Text.Range): Iterator[(Command, Text.Offset)] =  | 
209  | 
      command_range(range.start) takeWhile { case (_, start) => start < range.stop }
 | 
|
| 38151 | 210  | 
|
| 
38879
 
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
 
wenzelm 
parents: 
38872 
diff
changeset
 | 
211  | 
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
 | 
212  | 
Node.Commands.starts(commands.iterator).find(_._1 == cmd).map(_._2)  | 
| 38151 | 213  | 
}  | 
214  | 
||
215  | 
||
| 46723 | 216  | 
/* development graph */  | 
217  | 
||
218  | 
object Nodes  | 
|
219  | 
  {
 | 
|
220  | 
val empty: Nodes = new Nodes(Graph.empty(Node.Name.Ordering))  | 
|
221  | 
}  | 
|
222  | 
||
223  | 
final class Nodes private(graph: Graph[Node.Name, Node])  | 
|
224  | 
  {
 | 
|
225  | 
def get_name(s: String): Option[Node.Name] =  | 
|
226  | 
graph.keys.find(name => name.node == s)  | 
|
227  | 
||
228  | 
def apply(name: Node.Name): Node =  | 
|
229  | 
graph.default_node(name, Node.empty).get_node(name)  | 
|
230  | 
||
231  | 
def + (entry: (Node.Name, Node)): Nodes =  | 
|
232  | 
    {
 | 
|
233  | 
val (name, node) = entry  | 
|
| 
48707
 
ba531af91148
simplified Document.Node.Header -- internalized errors;
 
wenzelm 
parents: 
48706 
diff
changeset
 | 
234  | 
val imports = node.header.imports  | 
| 46723 | 235  | 
val graph1 =  | 
| 
46739
 
6024353549ca
clarified document nodes (full import graph) vs. node_status (non-preloaded theories);
 
wenzelm 
parents: 
46737 
diff
changeset
 | 
236  | 
(graph.default_node(name, Node.empty) /: imports)((g, p) => g.default_node(p, Node.empty))  | 
| 46723 | 237  | 
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
 | 
238  | 
val graph3 = (graph2 /: imports)((g, dep) => g.add_edge(dep, name))  | 
| 46723 | 239  | 
new Nodes(graph3.map_node(name, _ => node))  | 
240  | 
}  | 
|
241  | 
||
242  | 
def entries: Iterator[(Node.Name, Node)] =  | 
|
243  | 
      graph.entries.map({ case (name, (node, _)) => (name, node) })
 | 
|
244  | 
||
| 
46942
 
f5c2d66faa04
basic support for outer syntax keywords in theory header;
 
wenzelm 
parents: 
46941 
diff
changeset
 | 
245  | 
def descendants(names: List[Node.Name]): List[Node.Name] = graph.all_succs(names)  | 
| 46723 | 246  | 
def topological_order: List[Node.Name] = graph.topological_order  | 
247  | 
}  | 
|
248  | 
||
249  | 
||
| 38424 | 250  | 
|
251  | 
/** versioning **/  | 
|
252  | 
||
253  | 
/* particular document versions */  | 
|
| 34485 | 254  | 
|
| 38417 | 255  | 
object Version  | 
256  | 
  {
 | 
|
| 46681 | 257  | 
val init: Version = new Version()  | 
258  | 
||
| 46941 | 259  | 
def make(syntax: Outer_Syntax, nodes: Nodes): Version =  | 
| 
52530
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
260  | 
new Version(Document_ID.make(), syntax, nodes)  | 
| 38417 | 261  | 
}  | 
262  | 
||
| 46712 | 263  | 
final class Version private(  | 
| 
52530
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
264  | 
val id: Document_ID.Version = Document_ID.none,  | 
| 46941 | 265  | 
val syntax: Outer_Syntax = Outer_Syntax.empty,  | 
| 46723 | 266  | 
val nodes: Nodes = Nodes.empty)  | 
| 46941 | 267  | 
  {
 | 
| 
52530
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
268  | 
def is_init: Boolean = id == Document_ID.none  | 
| 46941 | 269  | 
}  | 
| 34660 | 270  | 
|
| 34859 | 271  | 
|
| 38424 | 272  | 
/* changes of plain text, eventually resulting in document edits */  | 
| 
38227
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
273  | 
|
| 
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
274  | 
object Change  | 
| 
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
275  | 
  {
 | 
| 46678 | 276  | 
val init: Change = new Change()  | 
277  | 
||
278  | 
def make(previous: Future[Version], edits: List[Edit_Text], version: Future[Version]): Change =  | 
|
279  | 
new Change(Some(previous), edits, version)  | 
|
| 
38227
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
280  | 
}  | 
| 
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
281  | 
|
| 46712 | 282  | 
final class Change private(  | 
| 46677 | 283  | 
val previous: Option[Future[Version]] = Some(Future.value(Version.init)),  | 
284  | 
val edits: List[Edit_Text] = Nil,  | 
|
285  | 
val version: Future[Version] = Future.value(Version.init))  | 
|
| 
38227
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
286  | 
  {
 | 
| 44672 | 287  | 
def is_finished: Boolean =  | 
288  | 
      (previous match { case None => true case Some(future) => future.is_finished }) &&
 | 
|
289  | 
version.is_finished  | 
|
290  | 
||
| 46678 | 291  | 
def truncate: Change = new Change(None, Nil, version)  | 
| 
38227
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
292  | 
}  | 
| 
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
293  | 
|
| 
 
6bbb42843b6e
concentrate structural document notions in document.scala;
 
wenzelm 
parents: 
38220 
diff
changeset
 | 
294  | 
|
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
295  | 
/* history navigation */  | 
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
296  | 
|
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
297  | 
object History  | 
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
298  | 
  {
 | 
| 46679 | 299  | 
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
 | 
300  | 
}  | 
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
301  | 
|
| 46712 | 302  | 
final class History private(  | 
| 46679 | 303  | 
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
 | 
304  | 
  {
 | 
| 46679 | 305  | 
def tip: Change = undo_list.head  | 
306  | 
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
 | 
307  | 
|
| 46679 | 308  | 
def prune(check: Change => Boolean, retain: Int): Option[(List[Change], History)] =  | 
309  | 
    {
 | 
|
310  | 
val n = undo_list.iterator.zipWithIndex.find(p => check(p._1)).get._2 + 1  | 
|
311  | 
val (retained, dropped) = undo_list.splitAt(n max retain)  | 
|
312  | 
||
313  | 
      retained.splitAt(retained.length - 1) match {
 | 
|
314  | 
case (prefix, List(last)) => Some(dropped, new History(prefix ::: List(last.truncate)))  | 
|
315  | 
case _ => None  | 
|
316  | 
}  | 
|
317  | 
}  | 
|
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
318  | 
}  | 
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
319  | 
|
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
320  | 
|
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
321  | 
|
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
322  | 
/** global state -- document structure, execution process, editing history **/  | 
| 38424 | 323  | 
|
| 52972 | 324  | 
object Snapshot  | 
325  | 
  {
 | 
|
326  | 
val init = State.init.snapshot()  | 
|
327  | 
}  | 
|
328  | 
||
| 38424 | 329  | 
abstract class Snapshot  | 
330  | 
  {
 | 
|
| 44582 | 331  | 
val state: State  | 
| 38424 | 332  | 
val version: Version  | 
333  | 
val is_outdated: Boolean  | 
|
| 38427 | 334  | 
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
 | 
335  | 
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
 | 
336  | 
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
 | 
337  | 
def revert(range: Text.Range): Text.Range  | 
| 52972 | 338  | 
|
339  | 
val node_name: Node.Name  | 
|
340  | 
val node: Node  | 
|
| 51494 | 341  | 
def eq_content(other: Snapshot): Boolean  | 
| 52508 | 342  | 
def cumulate_markup[A](  | 
343  | 
range: Text.Range,  | 
|
344  | 
info: A,  | 
|
345  | 
elements: Option[Set[String]],  | 
|
| 
52900
 
d29bf6db8a2d
more elementary list structures for markup tree traversal;
 
wenzelm 
parents: 
52889 
diff
changeset
 | 
346  | 
result: Command.State => (A, Text.Markup) => Option[A]): List[Text.Info[A]]  | 
| 52508 | 347  | 
def select_markup[A](  | 
348  | 
range: Text.Range,  | 
|
349  | 
elements: Option[Set[String]],  | 
|
| 
52900
 
d29bf6db8a2d
more elementary list structures for markup tree traversal;
 
wenzelm 
parents: 
52889 
diff
changeset
 | 
350  | 
result: Command.State => Text.Markup => Option[A]): List[Text.Info[A]]  | 
| 38424 | 351  | 
}  | 
352  | 
||
| 52563 | 353  | 
type Assign_Update =  | 
354  | 
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
 | 
355  | 
|
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
356  | 
object State  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
357  | 
  {
 | 
| 38373 | 358  | 
class Fail(state: State) extends Exception  | 
359  | 
||
| 
44479
 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 
wenzelm 
parents: 
44477 
diff
changeset
 | 
360  | 
object Assignment  | 
| 
 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 
wenzelm 
parents: 
44477 
diff
changeset
 | 
361  | 
    {
 | 
| 46683 | 362  | 
val init: Assignment = new Assignment()  | 
| 
44479
 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 
wenzelm 
parents: 
44477 
diff
changeset
 | 
363  | 
}  | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
364  | 
|
| 46712 | 365  | 
final class Assignment private(  | 
| 
52530
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
366  | 
val command_execs: Map[Document_ID.Command, List[Document_ID.Exec]] = Map.empty,  | 
| 46677 | 367  | 
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
 | 
368  | 
    {
 | 
| 44477 | 369  | 
      def check_finished: Assignment = { require(is_finished); this }
 | 
| 
47388
 
fe4b245af74c
discontinued obsolete last_execs (cf. cd3ab7625519);
 
wenzelm 
parents: 
46997 
diff
changeset
 | 
370  | 
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
 | 
371  | 
|
| 52563 | 372  | 
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
 | 
373  | 
      {
 | 
| 
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
 | 
374  | 
require(!is_finished)  | 
| 
44479
 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 
wenzelm 
parents: 
44477 
diff
changeset
 | 
375  | 
val command_execs1 =  | 
| 52563 | 376  | 
          (command_execs /: update) {
 | 
377  | 
case (res, (command_id, exec_ids)) =>  | 
|
378  | 
if (exec_ids.isEmpty) res - command_id  | 
|
379  | 
else res + (command_id -> exec_ids)  | 
|
| 
44479
 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 
wenzelm 
parents: 
44477 
diff
changeset
 | 
380  | 
}  | 
| 
47388
 
fe4b245af74c
discontinued obsolete last_execs (cf. cd3ab7625519);
 
wenzelm 
parents: 
46997 
diff
changeset
 | 
381  | 
new Assignment(command_execs1, true)  | 
| 
38150
 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 
wenzelm 
parents: 
37849 
diff
changeset
 | 
382  | 
}  | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
383  | 
}  | 
| 46682 | 384  | 
|
385  | 
val init: State =  | 
|
| 52563 | 386  | 
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
 | 
387  | 
}  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
388  | 
|
| 46712 | 389  | 
final case class State private(  | 
| 
52530
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
390  | 
val versions: Map[Document_ID.Version, Version] = Map.empty,  | 
| 
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
391  | 
val commands: Map[Document_ID.Command, Command.State] = Map.empty, // static markup from define_command  | 
| 
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
392  | 
val execs: Map[Document_ID.Exec, Command.State] = Map.empty, // dynamic markup from execution  | 
| 
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
393  | 
val assignments: Map[Document_ID.Version, State.Assignment] = Map.empty,  | 
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
394  | 
val history: History = History.init)  | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
395  | 
  {
 | 
| 38373 | 396  | 
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
 | 
397  | 
|
| 
44479
 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 
wenzelm 
parents: 
44477 
diff
changeset
 | 
398  | 
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
 | 
399  | 
    {
 | 
| 38417 | 400  | 
val id = version.id  | 
401  | 
copy(versions = versions + (id -> version),  | 
|
| 
44479
 
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
 
wenzelm 
parents: 
44477 
diff
changeset
 | 
402  | 
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
 | 
403  | 
}  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
404  | 
|
| 38373 | 405  | 
def define_command(command: Command): State =  | 
406  | 
    {
 | 
|
407  | 
val id = command.id  | 
|
| 49414 | 408  | 
copy(commands = commands + (id -> command.init_state))  | 
| 38373 | 409  | 
}  | 
410  | 
||
| 
52530
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
411  | 
def defined_command(id: Document_ID.Command): Boolean = commands.isDefinedAt(id)  | 
| 44582 | 412  | 
|
| 52531 | 413  | 
def find_command(version: Version, id: Document_ID.Generic): Option[(Node, Command)] =  | 
| 44582 | 414  | 
      commands.get(id) orElse execs.get(id) match {
 | 
415  | 
case None => None  | 
|
416  | 
case Some(st) =>  | 
|
417  | 
val command = st.command  | 
|
| 46681 | 418  | 
val node = version.nodes(command.node_name)  | 
419  | 
Some((node, command))  | 
|
| 44582 | 420  | 
}  | 
| 38373 | 421  | 
|
| 
52530
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
422  | 
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
 | 
423  | 
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
 | 
424  | 
def the_dynamic_state(id: Document_ID.Exec): Command.State = execs.getOrElse(id, fail)  | 
| 52563 | 425  | 
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
 | 
426  | 
|
| 52531 | 427  | 
def accumulate(id: Document_ID.Generic, message: XML.Elem): (Command.State, State) =  | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
428  | 
      execs.get(id) match {
 | 
| 44446 | 429  | 
case Some(st) =>  | 
| 49527 | 430  | 
val new_st = st + (id, message)  | 
| 44446 | 431  | 
(new_st, copy(execs = execs + (id -> new_st)))  | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
432  | 
case None =>  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
433  | 
          commands.get(id) match {
 | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
434  | 
case Some(st) =>  | 
| 49527 | 435  | 
val new_st = st + (id, message)  | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
436  | 
(new_st, copy(commands = commands + (id -> new_st)))  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
437  | 
case None => fail  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
438  | 
}  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
439  | 
}  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
440  | 
|
| 52563 | 441  | 
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
 | 
442  | 
    {
 | 
| 38417 | 443  | 
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
 | 
444  | 
|
| 
52566
 
52a0eacf04d1
more formal type assign_update: avoid duplicate results and redundant update of global State.execs;
 
wenzelm 
parents: 
52564 
diff
changeset
 | 
445  | 
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
 | 
446  | 
: 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
 | 
447  | 
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
 | 
448  | 
|
| 44543 | 449  | 
val (changed_commands, new_execs) =  | 
| 52563 | 450  | 
        ((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
 | 
451  | 
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
 | 
452  | 
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
 | 
453  | 
val command = st.command  | 
| 
52527
 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 
wenzelm 
parents: 
52508 
diff
changeset
 | 
454  | 
val commands2 = command :: commands1  | 
| 44543 | 455  | 
val execs2 =  | 
456  | 
              exec match {
 | 
|
| 
52527
 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 
wenzelm 
parents: 
52508 
diff
changeset
 | 
457  | 
case Nil => execs1  | 
| 
 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 
wenzelm 
parents: 
52508 
diff
changeset
 | 
458  | 
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
 | 
459  | 
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
 | 
460  | 
(for (id <- print_ids; up <- upd(id, command.empty_state)) yield up)  | 
| 44543 | 461  | 
}  | 
462  | 
(commands2, execs2)  | 
|
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
463  | 
}  | 
| 52563 | 464  | 
val new_assignment = the_assignment(version).assign(update)  | 
| 43722 | 465  | 
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
 | 
466  | 
|
| 44543 | 467  | 
(changed_commands, new_state)  | 
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
468  | 
}  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
469  | 
|
| 38417 | 470  | 
def is_assigned(version: Version): Boolean =  | 
| 43722 | 471  | 
      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
 | 
472  | 
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
 | 
473  | 
case None => false  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
474  | 
}  | 
| 
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
475  | 
|
| 
44436
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44385 
diff
changeset
 | 
476  | 
def is_stable(change: Change): Boolean =  | 
| 
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44385 
diff
changeset
 | 
477  | 
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
 | 
478  | 
|
| 
46944
 
9fc22eb6408c
more recent recent_syntax, e.g. relevant for document rendering during startup;
 
wenzelm 
parents: 
46942 
diff
changeset
 | 
479  | 
def recent_finished: Change = history.undo_list.find(_.is_finished) getOrElse fail  | 
| 44672 | 480  | 
def recent_stable: Change = history.undo_list.find(is_stable) getOrElse fail  | 
| 
44436
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44385 
diff
changeset
 | 
481  | 
def tip_stable: Boolean = is_stable(history.tip)  | 
| 44475 | 482  | 
def tip_version: Version = history.tip.version.get_finished  | 
| 
44436
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44385 
diff
changeset
 | 
483  | 
|
| 44446 | 484  | 
def continue_history(  | 
485  | 
previous: Future[Version],  | 
|
| 40479 | 486  | 
edits: List[Edit_Text],  | 
| 43722 | 487  | 
version: Future[Version]): (Change, State) =  | 
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
488  | 
    {
 | 
| 46678 | 489  | 
val change = Change.make(previous, edits, version)  | 
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
490  | 
(change, copy(history = history + change))  | 
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
491  | 
}  | 
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
492  | 
|
| 44672 | 493  | 
def prune_history(retain: Int = 0): (List[Version], State) =  | 
494  | 
    {
 | 
|
| 46679 | 495  | 
      history.prune(is_stable, retain) match {
 | 
496  | 
case Some((dropped, history1)) =>  | 
|
| 44672 | 497  | 
val dropped_versions = dropped.map(change => change.version.get_finished)  | 
| 46679 | 498  | 
val state1 = copy(history = history1)  | 
| 44672 | 499  | 
(dropped_versions, state1)  | 
| 46679 | 500  | 
case None => fail  | 
| 44672 | 501  | 
}  | 
502  | 
}  | 
|
503  | 
||
| 
52530
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
504  | 
def removed_versions(removed: List[Document_ID.Version]): State =  | 
| 44676 | 505  | 
    {
 | 
506  | 
val versions1 = versions -- removed  | 
|
507  | 
val assignments1 = assignments -- removed  | 
|
| 
52530
 
99dd8b4ef3fe
explicit module Document_ID as source of globally unique identifiers across ML/Scala;
 
wenzelm 
parents: 
52527 
diff
changeset
 | 
508  | 
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
 | 
509  | 
var execs1 = Map.empty[Document_ID.Exec, Command.State]  | 
| 44676 | 510  | 
      for {
 | 
511  | 
(version_id, version) <- versions1.iterator  | 
|
| 46997 | 512  | 
command_execs = assignments1(version_id).command_execs  | 
| 46723 | 513  | 
(_, node) <- version.nodes.entries  | 
| 44676 | 514  | 
command <- node.commands.iterator  | 
515  | 
      } {
 | 
|
| 52568 | 516  | 
if (!commands1.isDefinedAt(command.id))  | 
517  | 
commands.get(command.id).foreach(st => commands1 += (command.id -> st))  | 
|
518  | 
        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
 | 
519  | 
if (!execs1.isDefinedAt(exec_id))  | 
| 
 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 
wenzelm 
parents: 
52508 
diff
changeset
 | 
520  | 
execs.get(exec_id).foreach(st => execs1 += (exec_id -> st))  | 
| 44676 | 521  | 
}  | 
522  | 
}  | 
|
523  | 
copy(versions = versions1, commands = commands1, execs = execs1, assignments = assignments1)  | 
|
524  | 
}  | 
|
525  | 
||
| 44613 | 526  | 
def command_state(version: Version, command: Command): Command.State =  | 
527  | 
    {
 | 
|
528  | 
require(is_assigned(version))  | 
|
529  | 
      try {
 | 
|
| 
52527
 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 
wenzelm 
parents: 
52508 
diff
changeset
 | 
530  | 
the_assignment(version).check_finished.command_execs.getOrElse(command.id, Nil)  | 
| 
52564
 
4e855c120f6a
tuned signature -- NB: Command.read is actually part of Command.eval;
 
wenzelm 
parents: 
52563 
diff
changeset
 | 
531  | 
          .map(the_dynamic_state(_)) match {
 | 
| 
52527
 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 
wenzelm 
parents: 
52508 
diff
changeset
 | 
532  | 
case eval_state :: print_states => (eval_state /: print_states)(_ ++ _)  | 
| 
 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 
wenzelm 
parents: 
52508 
diff
changeset
 | 
533  | 
case Nil => fail  | 
| 
 
dbac84eab3bc
separate exec_id assignment for Command.print states, without affecting result of eval;
 
wenzelm 
parents: 
52508 
diff
changeset
 | 
534  | 
}  | 
| 44613 | 535  | 
}  | 
| 
47395
 
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
 
wenzelm 
parents: 
47388 
diff
changeset
 | 
536  | 
      catch {
 | 
| 
 
e6261a493f04
added static command status markup, to emphasize accepted but unassigned/unparsed commands (notably in overview panel);
 
wenzelm 
parents: 
47388 
diff
changeset
 | 
537  | 
case _: State.Fail =>  | 
| 
52564
 
4e855c120f6a
tuned signature -- NB: Command.read is actually part of Command.eval;
 
wenzelm 
parents: 
52563 
diff
changeset
 | 
538  | 
          try { the_static_state(command.id) }
 | 
| 49414 | 539  | 
          catch { case _: State.Fail => 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
 | 
540  | 
}  | 
| 44613 | 541  | 
}  | 
542  | 
||
| 49645 | 543  | 
def markup_to_XML(version: Version, node: Node, filter: XML.Elem => Boolean): XML.Body =  | 
544  | 
node.commands.toList.map(cmd => command_state(version, cmd).markup_to_XML(filter)).flatten  | 
|
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
545  | 
|
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
546  | 
// persistent user-view  | 
| 49346 | 547  | 
def snapshot(name: Node.Name = Node.Name.empty, pending_edits: List[Text.Edit] = Nil)  | 
548  | 
: Snapshot =  | 
|
| 
38370
 
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
 
wenzelm 
parents: 
38367 
diff
changeset
 | 
549  | 
    {
 | 
| 44672 | 550  | 
val stable = recent_stable  | 
| 
44436
 
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
 
wenzelm 
parents: 
44385 
diff
changeset
 | 
551  | 
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
 | 
552  | 
|
| 44156 | 553  | 
// FIXME proper treatment of removed nodes  | 
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
554  | 
val edits =  | 
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
555  | 
(pending_edits /: history.undo_list.takeWhile(_ != stable))((edits, change) =>  | 
| 44156 | 556  | 
(for ((a, Node.Edits(es)) <- change.edits if a == name) yield es).flatten ::: edits)  | 
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
557  | 
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
 | 
558  | 
|
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
559  | 
new Snapshot  | 
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
560  | 
      {
 | 
| 52972 | 561  | 
/* global information */  | 
562  | 
||
| 44582 | 563  | 
val state = State.this  | 
| 39698 | 564  | 
val version = stable.version.get_finished  | 
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
565  | 
val is_outdated = !(pending_edits.isEmpty && latest == stable)  | 
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
566  | 
|
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
567  | 
def convert(offset: Text.Offset) = (offset /: edits)((i, edit) => edit.convert(i))  | 
| 
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
568  | 
def revert(offset: Text.Offset) = (offset /: reverse_edits)((i, edit) => edit.revert(i))  | 
| 43425 | 569  | 
def convert(range: Text.Range) = (range /: edits)((r, edit) => edit.convert(r))  | 
570  | 
def revert(range: Text.Range) = (range /: reverse_edits)((r, edit) => edit.revert(r))  | 
|
| 
39177
 
0468964aec11
simplified Markup_Tree.select: Stream instead of Iterator (again), explicit Option instead of default;
 
wenzelm 
parents: 
38976 
diff
changeset
 | 
571  | 
|
| 52972 | 572  | 
|
573  | 
/* local node content */  | 
|
574  | 
||
575  | 
val node_name = name  | 
|
576  | 
val node = version.nodes(name)  | 
|
577  | 
||
| 51494 | 578  | 
def eq_content(other: Snapshot): Boolean =  | 
| 49346 | 579  | 
!is_outdated && !other.is_outdated &&  | 
580  | 
node.commands.size == other.node.commands.size &&  | 
|
581  | 
            ((node.commands.iterator zip other.node.commands.iterator) forall {
 | 
|
582  | 
case (cmd1, cmd2) =>  | 
|
| 51494 | 583  | 
state.command_state(version, cmd1) eq_content  | 
584  | 
other.state.command_state(other.version, cmd2)  | 
|
| 49346 | 585  | 
})  | 
586  | 
||
| 
46178
 
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
 
wenzelm 
parents: 
46152 
diff
changeset
 | 
587  | 
def cumulate_markup[A](range: Text.Range, info: A, elements: Option[Set[String]],  | 
| 
52900
 
d29bf6db8a2d
more elementary list structures for markup tree traversal;
 
wenzelm 
parents: 
52889 
diff
changeset
 | 
588  | 
result: Command.State => (A, Text.Markup) => Option[A]): List[Text.Info[A]] =  | 
| 45459 | 589  | 
        {
 | 
| 45467 | 590  | 
val former_range = revert(range)  | 
| 
52900
 
d29bf6db8a2d
more elementary list structures for markup tree traversal;
 
wenzelm 
parents: 
52889 
diff
changeset
 | 
591  | 
          (for {
 | 
| 
 
d29bf6db8a2d
more elementary list structures for markup tree traversal;
 
wenzelm 
parents: 
52889 
diff
changeset
 | 
592  | 
(command, command_start) <- node.command_range(former_range)  | 
| 
50500
 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 
wenzelm 
parents: 
50204 
diff
changeset
 | 
593  | 
st = state.command_state(version, command)  | 
| 
 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 
wenzelm 
parents: 
50204 
diff
changeset
 | 
594  | 
res = result(st)  | 
| 
52889
 
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
 
wenzelm 
parents: 
52887 
diff
changeset
 | 
595  | 
Text.Info(r0, a) <- st.markup.cumulate[A](  | 
| 
 
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
 
wenzelm 
parents: 
52887 
diff
changeset
 | 
596  | 
(former_range - command_start).restrict(command.range), info, elements,  | 
| 
52900
 
d29bf6db8a2d
more elementary list structures for markup tree traversal;
 
wenzelm 
parents: 
52889 
diff
changeset
 | 
597  | 
              { case (a, Text.Info(r0, b)) => res(a, Text.Info(convert(r0 + command_start), b)) }
 | 
| 
 
d29bf6db8a2d
more elementary list structures for markup tree traversal;
 
wenzelm 
parents: 
52889 
diff
changeset
 | 
598  | 
).iterator  | 
| 
 
d29bf6db8a2d
more elementary list structures for markup tree traversal;
 
wenzelm 
parents: 
52889 
diff
changeset
 | 
599  | 
} yield Text.Info(convert(r0 + command_start), a)).toList  | 
| 45459 | 600  | 
}  | 
601  | 
||
| 
46178
 
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
 
wenzelm 
parents: 
46152 
diff
changeset
 | 
602  | 
def select_markup[A](range: Text.Range, elements: Option[Set[String]],  | 
| 
52900
 
d29bf6db8a2d
more elementary list structures for markup tree traversal;
 
wenzelm 
parents: 
52889 
diff
changeset
 | 
603  | 
result: Command.State => Text.Markup => Option[A]): List[Text.Info[A]] =  | 
| 
38845
 
a9e37daf5bd0
added Document.Snapshot.select_markup, which includes command iteration, range conversion etc.;
 
wenzelm 
parents: 
38841 
diff
changeset
 | 
604  | 
        {
 | 
| 
52889
 
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
 
wenzelm 
parents: 
52887 
diff
changeset
 | 
605  | 
def result1(st: 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
 | 
606  | 
          {
 | 
| 
 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 
wenzelm 
parents: 
50204 
diff
changeset
 | 
607  | 
val res = result(st)  | 
| 
52889
 
ea3338812e67
more tight interface for markup cumulate/select: avoid duplicate application, allow to defer decision about definedness;
 
wenzelm 
parents: 
52887 
diff
changeset
 | 
608  | 
(_: 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
 | 
609  | 
              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
 | 
610  | 
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
 | 
611  | 
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
 | 
612  | 
}  | 
| 
50500
 
c94bba7906d2
identify dialogs via official serial and maintain as result message;
 
wenzelm 
parents: 
50204 
diff
changeset
 | 
613  | 
}  | 
| 
46198
 
cd040c5772de
improved select_markup: include filtering of defined results;
 
wenzelm 
parents: 
46178 
diff
changeset
 | 
614  | 
for (Text.Info(r, Some(x)) <- cumulate_markup(range, None, elements, result1))  | 
| 
 
cd040c5772de
improved select_markup: include filtering of defined results;
 
wenzelm 
parents: 
46178 
diff
changeset
 | 
615  | 
yield Text.Info(r, x)  | 
| 
38845
 
a9e37daf5bd0
added Document.Snapshot.select_markup, which includes command iteration, range conversion etc.;
 
wenzelm 
parents: 
38841 
diff
changeset
 | 
616  | 
}  | 
| 
38841
 
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
 
wenzelm 
parents: 
38569 
diff
changeset
 | 
617  | 
}  | 
| 
38150
 
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
 
wenzelm 
parents: 
37849 
diff
changeset
 | 
618  | 
}  | 
| 34485 | 619  | 
}  | 
| 
34840
 
6c5560d48561
more precise treatment of document/state assigment;
 
wenzelm 
parents: 
34838 
diff
changeset
 | 
620  | 
}  | 
| 
 
6c5560d48561
more precise treatment of document/state assigment;
 
wenzelm 
parents: 
34838 
diff
changeset
 | 
621  |