author | wenzelm |
Sun, 26 Feb 2012 17:54:35 +0100 | |
changeset 46682 | 4a74fbd6f28b |
parent 46681 | c083a3f621c0 |
child 46683 | fb160aa7a9a8 |
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 |
{ |
38227
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
16 |
/* formal identifiers */ |
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
17 |
|
38363
af7f41a8a0a8
clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents:
38361
diff
changeset
|
18 |
type ID = Long |
43780 | 19 |
val ID = Properties.Value.Long |
38414
49f1f657adc2
more basic Markup.parse_int/print_int (using signed_string_of_int) (ML);
wenzelm
parents:
38374
diff
changeset
|
20 |
|
38373 | 21 |
type Version_ID = ID |
38363
af7f41a8a0a8
clarified "state" (accumulated data) vs. "exec" (execution that produces data);
wenzelm
parents:
38361
diff
changeset
|
22 |
type Command_ID = ID |
38373 | 23 |
type Exec_ID = ID |
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
24 |
|
43662
e3175ec00311
Document.no_id/new_id as in ML (new_id *could* be session-specific but it isn't right now);
wenzelm
parents:
43427
diff
changeset
|
25 |
val no_id: ID = 0 |
45243 | 26 |
val new_id = Counter() |
38355
8cb265fb12fe
represent document ids by (long) int, to benefit from the somewhat faster Inttab in ML (LinearSet in Scala is invariably indexed by native object ids);
wenzelm
parents:
38227
diff
changeset
|
27 |
|
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
28 |
|
34818
7df68a8f0e3e
register Proof_Document instances as session entities -- handle Markup.EDIT messages locally;
wenzelm
parents:
34815
diff
changeset
|
29 |
|
38424 | 30 |
/** document structure **/ |
31 |
||
32 |
/* named nodes -- development graph */ |
|
33 |
||
44615 | 34 |
type Edit[A, B] = (Node.Name, Node.Edit[A, B]) |
44384 | 35 |
type Edit_Text = Edit[Text.Edit, Text.Perspective] |
36 |
type Edit_Command = Edit[(Option[Command], Option[Command]), Command.Perspective] |
|
38151 | 37 |
|
44182 | 38 |
type Node_Header = Exn.Result[Thy_Header] |
39 |
||
38151 | 40 |
object Node |
41 |
{ |
|
44957
098dd95349e7
more elaborate Node_Renderer, which paints node_name.theory only;
wenzelm
parents:
44676
diff
changeset
|
42 |
object Name |
098dd95349e7
more elaborate Node_Renderer, which paints node_name.theory only;
wenzelm
parents:
44676
diff
changeset
|
43 |
{ |
098dd95349e7
more elaborate Node_Renderer, which paints node_name.theory only;
wenzelm
parents:
44676
diff
changeset
|
44 |
val empty = Name("", "", "") |
44959 | 45 |
def apply(path: Path): Name = |
46 |
{ |
|
47 |
val node = path.implode |
|
48 |
val dir = path.dir.implode |
|
49 |
val theory = Thy_Header.thy_name(node) getOrElse error("Bad theory file name: " + path) |
|
50 |
Name(node, dir, theory) |
|
51 |
} |
|
44957
098dd95349e7
more elaborate Node_Renderer, which paints node_name.theory only;
wenzelm
parents:
44676
diff
changeset
|
52 |
} |
44616 | 53 |
sealed case class Name(node: String, dir: String, theory: String) |
44615 | 54 |
{ |
55 |
override def hashCode: Int = node.hashCode |
|
56 |
override def equals(that: Any): Boolean = |
|
57 |
that match { |
|
58 |
case other: Name => node == other.node |
|
59 |
case _ => false |
|
60 |
} |
|
44642 | 61 |
override def toString: String = theory |
44615 | 62 |
} |
63 |
||
44384 | 64 |
sealed abstract class Edit[A, B] |
44156 | 65 |
{ |
44383 | 66 |
def foreach(f: A => Unit) |
67 |
{ |
|
44156 | 68 |
this match { |
44383 | 69 |
case Edits(es) => es.foreach(f) |
70 |
case _ => |
|
44156 | 71 |
} |
44383 | 72 |
} |
44156 | 73 |
} |
44384 | 74 |
case class Clear[A, B]() extends Edit[A, B] |
75 |
case class Edits[A, B](edits: List[A]) extends Edit[A, B] |
|
76 |
case class Header[A, B](header: Node_Header) extends Edit[A, B] |
|
77 |
case class Perspective[A, B](perspective: B) extends Edit[A, B] |
|
44156 | 78 |
|
44442
cb18e4f09053
clarified norm_header/header_edit -- disallow update of loaded theories;
wenzelm
parents:
44436
diff
changeset
|
79 |
def norm_header(f: String => String, g: String => String, header: Node_Header): Node_Header = |
44182 | 80 |
header match { |
44442
cb18e4f09053
clarified norm_header/header_edit -- disallow update of loaded theories;
wenzelm
parents:
44436
diff
changeset
|
81 |
case Exn.Res(h) => Exn.capture { h.norm_deps(f, g) } |
cb18e4f09053
clarified norm_header/header_edit -- disallow update of loaded theories;
wenzelm
parents:
44436
diff
changeset
|
82 |
case exn => exn |
44182 | 83 |
} |
43697
77ce24aa1770
explicit Document.Node.Header, with master_dir and thy_name;
wenzelm
parents:
43662
diff
changeset
|
84 |
|
38426 | 85 |
def command_starts(commands: Iterator[Command], offset: Text.Offset = 0) |
86 |
: Iterator[(Command, Text.Offset)] = |
|
38227
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
87 |
{ |
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
88 |
var i = offset |
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
89 |
for (command <- commands) yield { |
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
90 |
val start = i |
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
91 |
i += command.length |
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
92 |
(command, start) |
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
93 |
} |
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
94 |
} |
46680 | 95 |
|
96 |
private val block_size = 1024 |
|
97 |
||
98 |
val empty: Node = new Node() |
|
38151 | 99 |
} |
100 |
||
46680 | 101 |
class Node private( |
46677 | 102 |
val header: Node_Header = Exn.Exn(ERROR("Bad theory header")), |
103 |
val perspective: Command.Perspective = Command.Perspective.empty, |
|
104 |
val blobs: Map[String, Blob] = Map.empty, |
|
105 |
val commands: Linear_Set[Command] = Linear_Set.empty) |
|
38151 | 106 |
{ |
46680 | 107 |
def clear: Node = new Node(header = header) |
108 |
||
109 |
def update_header(new_header: Node_Header): Node = |
|
110 |
new Node(new_header, perspective, blobs, commands) |
|
111 |
||
112 |
def update_perspective(new_perspective: Command.Perspective): Node = |
|
113 |
new Node(header, new_perspective, blobs, commands) |
|
114 |
||
115 |
def update_blobs(new_blobs: Map[String, Blob]): Node = |
|
116 |
new Node(header, perspective, new_blobs, commands) |
|
117 |
||
118 |
def update_commands(new_commands: Linear_Set[Command]): Node = |
|
119 |
new Node(header, perspective, blobs, new_commands) |
|
44443
35d67b2056cc
clarified Document.Node.clear -- retain header (cf. ML version);
wenzelm
parents:
44442
diff
changeset
|
120 |
|
35d67b2056cc
clarified Document.Node.clear -- retain header (cf. ML version);
wenzelm
parents:
44442
diff
changeset
|
121 |
|
43697
77ce24aa1770
explicit Document.Node.Header, with master_dir and thy_name;
wenzelm
parents:
43662
diff
changeset
|
122 |
/* commands */ |
77ce24aa1770
explicit Document.Node.Header, with master_dir and thy_name;
wenzelm
parents:
43662
diff
changeset
|
123 |
|
38879
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
124 |
private lazy val full_index: (Array[(Command, Text.Offset)], Text.Range) = |
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
125 |
{ |
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
126 |
val blocks = new mutable.ListBuffer[(Command, Text.Offset)] |
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
127 |
var next_block = 0 |
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
128 |
var last_stop = 0 |
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
129 |
for ((command, start) <- Node.command_starts(commands.iterator)) { |
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
130 |
last_stop = start + command.length |
38885
06582837872b
Node.full_index: allow command spans larger than block_size;
wenzelm
parents:
38882
diff
changeset
|
131 |
while (last_stop + 1 > next_block) { |
38879
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
132 |
blocks += (command -> start) |
46680 | 133 |
next_block += Node.block_size |
38879
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
134 |
} |
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
135 |
} |
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
136 |
(blocks.toArray, Text.Range(0, last_stop)) |
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
137 |
} |
38151 | 138 |
|
38879
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
139 |
def full_range: Text.Range = full_index._2 |
38151 | 140 |
|
38569 | 141 |
def command_range(i: Text.Offset = 0): Iterator[(Command, Text.Offset)] = |
38879
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
142 |
{ |
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
143 |
if (!commands.isEmpty && full_range.contains(i)) { |
46680 | 144 |
val (cmd0, start0) = full_index._1(i / Node.block_size) |
38879
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
145 |
Node.command_starts(commands.iterator(cmd0), start0) dropWhile { |
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
146 |
case (cmd, start) => start + cmd.length <= i } |
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
147 |
} |
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
148 |
else Iterator.empty |
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
149 |
} |
38151 | 150 |
|
38569 | 151 |
def command_range(range: Text.Range): Iterator[(Command, Text.Offset)] = |
152 |
command_range(range.start) takeWhile { case (_, start) => start < range.stop } |
|
38151 | 153 |
|
38426 | 154 |
def command_at(i: Text.Offset): Option[(Command, Text.Offset)] = |
38151 | 155 |
{ |
156 |
val range = command_range(i) |
|
157 |
if (range.hasNext) Some(range.next) else None |
|
158 |
} |
|
159 |
||
38426 | 160 |
def proper_command_at(i: Text.Offset): Option[Command] = |
38151 | 161 |
command_at(i) match { |
162 |
case Some((command, _)) => |
|
163 |
commands.reverse_iterator(command).find(cmd => !cmd.is_ignored) |
|
164 |
case None => None |
|
165 |
} |
|
38879
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
166 |
|
dde403450419
Document.Node: significant speedup of command_range etc. via lazy full_index;
wenzelm
parents:
38872
diff
changeset
|
167 |
def command_start(cmd: Command): Option[Text.Offset] = |
46677 | 168 |
Node.command_starts(commands.iterator).find(_._1 == cmd).map(_._2) |
38151 | 169 |
} |
170 |
||
171 |
||
38424 | 172 |
|
173 |
/** versioning **/ |
|
174 |
||
175 |
/* particular document versions */ |
|
34485 | 176 |
|
46677 | 177 |
type Nodes = Map[Node.Name, Node] |
178 |
||
38417 | 179 |
object Version |
180 |
{ |
|
46681 | 181 |
val init: Version = new Version() |
182 |
||
183 |
def make(nodes: Nodes): Version = new Version(new_id(), nodes) |
|
38417 | 184 |
} |
185 |
||
46681 | 186 |
class Version private( |
46677 | 187 |
val id: Version_ID = no_id, |
188 |
val nodes: Nodes = Map.empty.withDefaultValue(Node.empty)) |
|
44960 | 189 |
{ |
190 |
def topological_order: List[Node.Name] = |
|
191 |
{ |
|
192 |
val names = nodes.map({ case (name, node) => (name.node -> name) }) |
|
193 |
def next(x: Node.Name): List[Node.Name] = |
|
194 |
nodes(x).header match { |
|
195 |
case Exn.Res(header) => |
|
196 |
for (imp <- header.imports; name <- names.get(imp)) yield(name) |
|
197 |
case Exn.Exn(_) => Nil |
|
198 |
} |
|
45900 | 199 |
Library.topological_order(next, nodes.keys.toList.sortBy(_.node)) |
44960 | 200 |
} |
201 |
} |
|
34660 | 202 |
|
34859 | 203 |
|
38424 | 204 |
/* changes of plain text, eventually resulting in document edits */ |
38227
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
205 |
|
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
206 |
object Change |
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
207 |
{ |
46678 | 208 |
val init: Change = new Change() |
209 |
||
210 |
def make(previous: Future[Version], edits: List[Edit_Text], version: Future[Version]): Change = |
|
211 |
new Change(Some(previous), edits, version) |
|
38227
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
212 |
} |
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
213 |
|
46678 | 214 |
class Change private( |
46677 | 215 |
val previous: Option[Future[Version]] = Some(Future.value(Version.init)), |
216 |
val edits: List[Edit_Text] = Nil, |
|
217 |
val version: Future[Version] = Future.value(Version.init)) |
|
38227
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
218 |
{ |
44672 | 219 |
def is_finished: Boolean = |
220 |
(previous match { case None => true case Some(future) => future.is_finished }) && |
|
221 |
version.is_finished |
|
222 |
||
46678 | 223 |
def truncate: Change = new Change(None, Nil, version) |
38227
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
224 |
} |
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
225 |
|
6bbb42843b6e
concentrate structural document notions in document.scala;
wenzelm
parents:
38220
diff
changeset
|
226 |
|
38841
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
227 |
/* history navigation */ |
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
228 |
|
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
229 |
object History |
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
230 |
{ |
46679 | 231 |
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
|
232 |
} |
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
233 |
|
46679 | 234 |
class History private( |
235 |
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
|
236 |
{ |
46679 | 237 |
def tip: Change = undo_list.head |
238 |
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
|
239 |
|
46679 | 240 |
def prune(check: Change => Boolean, retain: Int): Option[(List[Change], History)] = |
241 |
{ |
|
242 |
val n = undo_list.iterator.zipWithIndex.find(p => check(p._1)).get._2 + 1 |
|
243 |
val (retained, dropped) = undo_list.splitAt(n max retain) |
|
244 |
||
245 |
retained.splitAt(retained.length - 1) match { |
|
246 |
case (prefix, List(last)) => Some(dropped, new History(prefix ::: List(last.truncate))) |
|
247 |
case _ => None |
|
248 |
} |
|
249 |
} |
|
38841
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
250 |
} |
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
251 |
|
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
252 |
|
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
253 |
|
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
254 |
/** global state -- document structure, execution process, editing history **/ |
38424 | 255 |
|
256 |
abstract class Snapshot |
|
257 |
{ |
|
44582 | 258 |
val state: State |
38424 | 259 |
val version: Version |
260 |
val node: Node |
|
261 |
val is_outdated: Boolean |
|
38427 | 262 |
def convert(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
|
263 |
def convert(range: Text.Range): Text.Range |
38427 | 264 |
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
|
265 |
def revert(range: Text.Range): Text.Range |
46178
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
46152
diff
changeset
|
266 |
def cumulate_markup[A](range: Text.Range, info: A, elements: Option[Set[String]], |
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
46152
diff
changeset
|
267 |
result: PartialFunction[(A, Text.Markup), A]): Stream[Text.Info[A]] |
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
46152
diff
changeset
|
268 |
def select_markup[A](range: Text.Range, elements: Option[Set[String]], |
46198
cd040c5772de
improved select_markup: include filtering of defined results;
wenzelm
parents:
46178
diff
changeset
|
269 |
result: PartialFunction[Text.Markup, A]): Stream[Text.Info[A]] |
38424 | 270 |
} |
271 |
||
44476
e8a87398f35d
propagate information about last command with exec state assignment through document model;
wenzelm
parents:
44475
diff
changeset
|
272 |
type Assign = |
44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
273 |
(List[(Document.Command_ID, Option[Document.Exec_ID])], // exec state assignment |
44476
e8a87398f35d
propagate information about last command with exec state assignment through document model;
wenzelm
parents:
44475
diff
changeset
|
274 |
List[(String, Option[Document.Command_ID])]) // last exec |
e8a87398f35d
propagate information about last command with exec state assignment through document model;
wenzelm
parents:
44475
diff
changeset
|
275 |
|
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
276 |
object State |
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
277 |
{ |
38373 | 278 |
class Fail(state: State) extends Exception |
279 |
||
44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
280 |
object Assignment |
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
281 |
{ |
46677 | 282 |
val init: Assignment = Assignment() |
44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
283 |
} |
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
284 |
|
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
|
285 |
case class Assignment( |
46677 | 286 |
val command_execs: Map[Command_ID, Exec_ID] = Map.empty, |
287 |
val last_execs: Map[String, Option[Command_ID]] = Map.empty, |
|
288 |
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
|
289 |
{ |
44477 | 290 |
def check_finished: Assignment = { require(is_finished); this } |
44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
291 |
def unfinished: Assignment = copy(is_finished = false) |
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
292 |
|
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
293 |
def assign(add_command_execs: List[(Command_ID, Option[Exec_ID])], |
44477 | 294 |
add_last_execs: List[(String, Option[Command_ID])]): Assignment = |
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
295 |
{ |
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
|
296 |
require(!is_finished) |
44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
297 |
val command_execs1 = |
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
298 |
(command_execs /: add_command_execs) { |
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
299 |
case (res, (command_id, None)) => res - command_id |
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
300 |
case (res, (command_id, Some(exec_id))) => res + (command_id -> exec_id) |
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
301 |
} |
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
302 |
Assignment(command_execs1, last_execs ++ add_last_execs, true) |
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
303 |
} |
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
304 |
} |
46682 | 305 |
|
306 |
val init: State = |
|
307 |
State().define_version(Version.init, Assignment.init).assign(Version.init.id)._2 |
|
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
308 |
} |
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
309 |
|
43715
518e44a0ee15
some support for blobs (arbitrary text files) within document nodes;
wenzelm
parents:
43697
diff
changeset
|
310 |
sealed case class State( |
46677 | 311 |
val versions: Map[Version_ID, Version] = Map.empty, |
312 |
val commands: Map[Command_ID, Command.State] = Map.empty, // static markup from define_command |
|
313 |
val execs: Map[Exec_ID, Command.State] = Map.empty, // dynamic markup from execution |
|
314 |
val assignments: Map[Version_ID, 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
|
315 |
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
|
316 |
{ |
38373 | 317 |
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
|
318 |
|
44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
319 |
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
|
320 |
{ |
38417 | 321 |
val id = version.id |
322 |
copy(versions = versions + (id -> version), |
|
44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
323 |
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
|
324 |
} |
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
325 |
|
38373 | 326 |
def define_command(command: Command): State = |
327 |
{ |
|
328 |
val id = command.id |
|
329 |
copy(commands = commands + (id -> command.empty_state)) |
|
330 |
} |
|
331 |
||
44582 | 332 |
def defined_command(id: Command_ID): Boolean = commands.isDefinedAt(id) |
333 |
||
44607
274eff0ea12e
maintain name of *the* enclosing node as part of command -- avoid full document traversal;
wenzelm
parents:
44582
diff
changeset
|
334 |
def find_command(version: Version, id: ID): Option[(Node, Command)] = |
44582 | 335 |
commands.get(id) orElse execs.get(id) match { |
336 |
case None => None |
|
337 |
case Some(st) => |
|
338 |
val command = st.command |
|
46681 | 339 |
val node = version.nodes(command.node_name) |
340 |
Some((node, command)) |
|
44582 | 341 |
} |
38373 | 342 |
|
38417 | 343 |
def the_version(id: Version_ID): Version = versions.getOrElse(id, fail) |
44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
344 |
def the_command(id: Command_ID): Command.State = commands.getOrElse(id, fail) // FIXME rename |
44446 | 345 |
def the_exec(id: Exec_ID): Command.State = execs.getOrElse(id, fail) |
43722 | 346 |
def the_assignment(version: Version): State.Assignment = |
347 |
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
|
348 |
|
38872 | 349 |
def accumulate(id: ID, 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
|
350 |
execs.get(id) match { |
44446 | 351 |
case Some(st) => |
46152
793cecd4ffc0
accumulate status as regular markup for command range;
wenzelm
parents:
45900
diff
changeset
|
352 |
val new_st = st + message |
44446 | 353 |
(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
|
354 |
case None => |
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
355 |
commands.get(id) match { |
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
356 |
case Some(st) => |
46152
793cecd4ffc0
accumulate status as regular markup for command range;
wenzelm
parents:
45900
diff
changeset
|
357 |
val new_st = st + message |
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
358 |
(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
|
359 |
case None => fail |
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
360 |
} |
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
361 |
} |
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
362 |
|
46682 | 363 |
def assign(id: Version_ID, arg: Assign = (Nil, Nil)): (List[Command], State) = |
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
364 |
{ |
38417 | 365 |
val version = the_version(id) |
44477 | 366 |
val (command_execs, last_execs) = arg |
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
367 |
|
44543 | 368 |
val (changed_commands, new_execs) = |
44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
369 |
((Nil: List[Command], execs) /: command_execs) { |
44543 | 370 |
case ((commands1, execs1), (cmd_id, exec)) => |
44479
9a04e7502e22
refined document state assignment: observe perspective, more explicit assignment message;
wenzelm
parents:
44477
diff
changeset
|
371 |
val st = the_command(cmd_id) |
44543 | 372 |
val commands2 = st.command :: commands1 |
373 |
val execs2 = |
|
374 |
exec match { |
|
375 |
case None => execs1 |
|
376 |
case Some(exec_id) => execs1 + (exec_id -> st) |
|
377 |
} |
|
378 |
(commands2, execs2) |
|
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
379 |
} |
44477 | 380 |
val new_assignment = the_assignment(version).assign(command_execs, last_execs) |
43722 | 381 |
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
|
382 |
|
44543 | 383 |
(changed_commands, new_state) |
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
384 |
} |
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
385 |
|
38417 | 386 |
def is_assigned(version: Version): Boolean = |
43722 | 387 |
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
|
388 |
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
|
389 |
case None => false |
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
390 |
} |
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
391 |
|
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44385
diff
changeset
|
392 |
def is_stable(change: Change): Boolean = |
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44385
diff
changeset
|
393 |
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
|
394 |
|
44672 | 395 |
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
|
396 |
def tip_stable: Boolean = is_stable(history.tip) |
44475 | 397 |
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
|
398 |
|
44615 | 399 |
def last_exec_offset(name: Node.Name): Text.Offset = |
44484
470f2ee5950e
tuned Session.edit_node: update_perspective based on last_exec_offset;
wenzelm
parents:
44479
diff
changeset
|
400 |
{ |
470f2ee5950e
tuned Session.edit_node: update_perspective based on last_exec_offset;
wenzelm
parents:
44479
diff
changeset
|
401 |
val version = tip_version |
44615 | 402 |
the_assignment(version).last_execs.get(name.node) match { |
44484
470f2ee5950e
tuned Session.edit_node: update_perspective based on last_exec_offset;
wenzelm
parents:
44479
diff
changeset
|
403 |
case Some(Some(id)) => |
470f2ee5950e
tuned Session.edit_node: update_perspective based on last_exec_offset;
wenzelm
parents:
44479
diff
changeset
|
404 |
val node = version.nodes(name) |
470f2ee5950e
tuned Session.edit_node: update_perspective based on last_exec_offset;
wenzelm
parents:
44479
diff
changeset
|
405 |
val cmd = the_command(id).command |
470f2ee5950e
tuned Session.edit_node: update_perspective based on last_exec_offset;
wenzelm
parents:
44479
diff
changeset
|
406 |
node.command_start(cmd) match { |
470f2ee5950e
tuned Session.edit_node: update_perspective based on last_exec_offset;
wenzelm
parents:
44479
diff
changeset
|
407 |
case None => 0 |
470f2ee5950e
tuned Session.edit_node: update_perspective based on last_exec_offset;
wenzelm
parents:
44479
diff
changeset
|
408 |
case Some(start) => start + cmd.length |
470f2ee5950e
tuned Session.edit_node: update_perspective based on last_exec_offset;
wenzelm
parents:
44479
diff
changeset
|
409 |
} |
470f2ee5950e
tuned Session.edit_node: update_perspective based on last_exec_offset;
wenzelm
parents:
44479
diff
changeset
|
410 |
case _ => 0 |
470f2ee5950e
tuned Session.edit_node: update_perspective based on last_exec_offset;
wenzelm
parents:
44479
diff
changeset
|
411 |
} |
470f2ee5950e
tuned Session.edit_node: update_perspective based on last_exec_offset;
wenzelm
parents:
44479
diff
changeset
|
412 |
} |
470f2ee5950e
tuned Session.edit_node: update_perspective based on last_exec_offset;
wenzelm
parents:
44479
diff
changeset
|
413 |
|
44446 | 414 |
def continue_history( |
415 |
previous: Future[Version], |
|
40479 | 416 |
edits: List[Edit_Text], |
43722 | 417 |
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
|
418 |
{ |
46678 | 419 |
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
|
420 |
(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
|
421 |
} |
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
422 |
|
44672 | 423 |
def prune_history(retain: Int = 0): (List[Version], State) = |
424 |
{ |
|
46679 | 425 |
history.prune(is_stable, retain) match { |
426 |
case Some((dropped, history1)) => |
|
44672 | 427 |
val dropped_versions = dropped.map(change => change.version.get_finished) |
46679 | 428 |
val state1 = copy(history = history1) |
44672 | 429 |
(dropped_versions, state1) |
46679 | 430 |
case None => fail |
44672 | 431 |
} |
432 |
} |
|
433 |
||
44676 | 434 |
def removed_versions(removed: List[Version_ID]): State = |
435 |
{ |
|
436 |
val versions1 = versions -- removed |
|
437 |
val assignments1 = assignments -- removed |
|
438 |
var commands1 = Map.empty[Command_ID, Command.State] |
|
439 |
var execs1 = Map.empty[Exec_ID, Command.State] |
|
440 |
for { |
|
441 |
(version_id, version) <- versions1.iterator |
|
442 |
val command_execs = assignments1(version_id).command_execs |
|
443 |
(_, node) <- version.nodes.iterator |
|
444 |
command <- node.commands.iterator |
|
445 |
} { |
|
446 |
val id = command.id |
|
447 |
if (!commands1.isDefinedAt(id) && commands.isDefinedAt(id)) |
|
448 |
commands1 += (id -> commands(id)) |
|
449 |
if (command_execs.isDefinedAt(id)) { |
|
450 |
val exec_id = command_execs(id) |
|
451 |
if (!execs1.isDefinedAt(exec_id) && execs.isDefinedAt(exec_id)) |
|
452 |
execs1 += (exec_id -> execs(exec_id)) |
|
453 |
} |
|
454 |
} |
|
455 |
copy(versions = versions1, commands = commands1, execs = execs1, assignments = assignments1) |
|
456 |
} |
|
457 |
||
44613 | 458 |
def command_state(version: Version, command: Command): Command.State = |
459 |
{ |
|
460 |
require(is_assigned(version)) |
|
461 |
try { |
|
462 |
the_exec(the_assignment(version).check_finished.command_execs |
|
463 |
.getOrElse(command.id, fail)) |
|
464 |
} |
|
465 |
catch { case _: State.Fail => command.empty_state } |
|
466 |
} |
|
467 |
||
38841
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
468 |
|
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
469 |
// persistent user-view |
44615 | 470 |
def snapshot(name: Node.Name, pending_edits: List[Text.Edit]): Snapshot = |
38370
8b15d0f98962
explicit Document.State value, instead of individual state variables in Session, Command, Document;
wenzelm
parents:
38367
diff
changeset
|
471 |
{ |
44672 | 472 |
val stable = recent_stable |
44436
546adfa8a6fc
update_perspective without actual edits, bypassing the full state assignment protocol;
wenzelm
parents:
44385
diff
changeset
|
473 |
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
|
474 |
|
44156 | 475 |
// 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
|
476 |
val edits = |
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
477 |
(pending_edits /: history.undo_list.takeWhile(_ != stable))((edits, change) => |
44156 | 478 |
(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
|
479 |
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
|
480 |
|
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
481 |
new Snapshot |
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
482 |
{ |
44582 | 483 |
val state = State.this |
39698 | 484 |
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
|
485 |
val node = version.nodes(name) |
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
486 |
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
|
487 |
|
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
488 |
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
|
489 |
def revert(offset: Text.Offset) = (offset /: reverse_edits)((i, edit) => edit.revert(i)) |
43425 | 490 |
def convert(range: Text.Range) = (range /: edits)((r, edit) => edit.convert(r)) |
491 |
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
|
492 |
|
46178
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
46152
diff
changeset
|
493 |
def cumulate_markup[A](range: Text.Range, info: A, elements: Option[Set[String]], |
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
46152
diff
changeset
|
494 |
result: PartialFunction[(A, Text.Markup), A]): Stream[Text.Info[A]] = |
45459 | 495 |
{ |
45467 | 496 |
val former_range = revert(range) |
45459 | 497 |
for { |
498 |
(command, command_start) <- node.command_range(former_range).toStream |
|
46208 | 499 |
Text.Info(r0, a) <- state.command_state(version, command).markup. |
46178
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
46152
diff
changeset
|
500 |
cumulate[A]((former_range - command_start).restrict(command.range), info, elements, |
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
46152
diff
changeset
|
501 |
{ |
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
46152
diff
changeset
|
502 |
case (a, Text.Info(r0, b)) |
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
46152
diff
changeset
|
503 |
if result.isDefinedAt((a, Text.Info(convert(r0 + command_start), b))) => |
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
46152
diff
changeset
|
504 |
result((a, Text.Info(convert(r0 + command_start), b))) |
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
46152
diff
changeset
|
505 |
}) |
45459 | 506 |
} yield Text.Info(convert(r0 + command_start), a) |
507 |
} |
|
508 |
||
46178
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
46152
diff
changeset
|
509 |
def select_markup[A](range: Text.Range, elements: Option[Set[String]], |
46198
cd040c5772de
improved select_markup: include filtering of defined results;
wenzelm
parents:
46178
diff
changeset
|
510 |
result: PartialFunction[Text.Markup, A]): Stream[Text.Info[A]] = |
38845
a9e37daf5bd0
added Document.Snapshot.select_markup, which includes command iteration, range conversion etc.;
wenzelm
parents:
38841
diff
changeset
|
511 |
{ |
45468 | 512 |
val result1 = |
513 |
new PartialFunction[(Option[A], Text.Markup), Option[A]] { |
|
514 |
def isDefinedAt(arg: (Option[A], Text.Markup)): Boolean = result.isDefinedAt(arg._2) |
|
515 |
def apply(arg: (Option[A], Text.Markup)): Option[A] = Some(result(arg._2)) |
|
516 |
} |
|
46198
cd040c5772de
improved select_markup: include filtering of defined results;
wenzelm
parents:
46178
diff
changeset
|
517 |
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
|
518 |
yield Text.Info(r, x) |
38845
a9e37daf5bd0
added Document.Snapshot.select_markup, which includes command iteration, range conversion etc.;
wenzelm
parents:
38841
diff
changeset
|
519 |
} |
38841
4df7b76249a0
include Document.History in Document.State -- just one universal session state maintained by main actor;
wenzelm
parents:
38569
diff
changeset
|
520 |
} |
38150
67fc24df3721
simplified/refined document model: collection of named nodes, without proper dependencies yet;
wenzelm
parents:
37849
diff
changeset
|
521 |
} |
34485 | 522 |
} |
34840
6c5560d48561
more precise treatment of document/state assigment;
wenzelm
parents:
34838
diff
changeset
|
523 |
} |
6c5560d48561
more precise treatment of document/state assigment;
wenzelm
parents:
34838
diff
changeset
|
524 |