author | wenzelm |
Sun, 30 Dec 2012 20:15:02 +0100 | |
changeset 50642 | aca12f646772 |
parent 50552 | 2b7fd8c9c4ac |
child 51618 | a3577cd80c41 |
permissions | -rw-r--r-- |
38479
e628da370072
more efficient Markup_Tree, based on branches sorted by quasi-order;
wenzelm
parents:
38478
diff
changeset
|
1 |
/* Title: Pure/PIDE/markup_tree.scala |
45673
cd41e3903fbf
separate compilation of PIDE vs. Pure sources, which enables independent Scala library;
wenzelm
parents:
45667
diff
changeset
|
2 |
Module: PIDE |
36676 | 3 |
Author: Fabian Immler, TU Munich |
4 |
Author: Makarius |
|
5 |
||
38479
e628da370072
more efficient Markup_Tree, based on branches sorted by quasi-order;
wenzelm
parents:
38478
diff
changeset
|
6 |
Markup trees over nested / non-overlapping text ranges. |
36676 | 7 |
*/ |
34393 | 8 |
|
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:
34760
diff
changeset
|
9 |
package isabelle |
34393 | 10 |
|
43520
cec9b95fa35d
explicit import java.lang.System to prevent odd scope problems;
wenzelm
parents:
39178
diff
changeset
|
11 |
import java.lang.System |
34701
80b0add08eef
IsabelleSideKickParser: incorporate former MarkupNode.markup2default_node, observe stopped flag;
wenzelm
parents:
34676
diff
changeset
|
12 |
import javax.swing.tree.DefaultMutableTreeNode |
80b0add08eef
IsabelleSideKickParser: incorporate former MarkupNode.markup2default_node, observe stopped flag;
wenzelm
parents:
34676
diff
changeset
|
13 |
|
38479
e628da370072
more efficient Markup_Tree, based on branches sorted by quasi-order;
wenzelm
parents:
38478
diff
changeset
|
14 |
import scala.collection.immutable.SortedMap |
49614 | 15 |
import scala.collection.mutable |
49467 | 16 |
import scala.annotation.tailrec |
38479
e628da370072
more efficient Markup_Tree, based on branches sorted by quasi-order;
wenzelm
parents:
38478
diff
changeset
|
17 |
|
e628da370072
more efficient Markup_Tree, based on branches sorted by quasi-order;
wenzelm
parents:
38478
diff
changeset
|
18 |
|
e628da370072
more efficient Markup_Tree, based on branches sorted by quasi-order;
wenzelm
parents:
38478
diff
changeset
|
19 |
object Markup_Tree |
e628da370072
more efficient Markup_Tree, based on branches sorted by quasi-order;
wenzelm
parents:
38478
diff
changeset
|
20 |
{ |
50551 | 21 |
/* construct trees */ |
22 |
||
45456 | 23 |
val empty: Markup_Tree = new Markup_Tree(Branches.empty) |
38479
e628da370072
more efficient Markup_Tree, based on branches sorted by quasi-order;
wenzelm
parents:
38478
diff
changeset
|
24 |
|
49467 | 25 |
def merge_disjoint(trees: List[Markup_Tree]): Markup_Tree = |
26 |
trees match { |
|
27 |
case Nil => empty |
|
28 |
case head :: tail => |
|
29 |
new Markup_Tree( |
|
30 |
(head.branches /: tail) { |
|
31 |
case (branches, tree) => |
|
32 |
(branches /: tree.branches) { |
|
33 |
case (bs, (r, entry)) => |
|
34 |
require(!bs.isDefinedAt(r)) |
|
35 |
bs + (r -> entry) |
|
36 |
} |
|
37 |
}) |
|
38 |
} |
|
39 |
||
50551 | 40 |
|
41 |
/* tree building blocks */ |
|
42 |
||
43 |
object Elements |
|
44 |
{ |
|
45 |
val empty = new Elements(Set.empty) |
|
46 |
} |
|
47 |
||
48 |
final class Elements private(private val rep: Set[String]) |
|
49 |
{ |
|
50 |
def contains(name: String): Boolean = rep.contains(name) |
|
51 |
||
52 |
def + (name: String): Elements = |
|
53 |
if (contains(name)) this |
|
54 |
else new Elements(rep + name) |
|
55 |
||
56 |
def + (elem: XML.Elem): Elements = this + elem.markup.name |
|
57 |
def ++ (elems: Iterable[XML.Elem]): Elements = (this /: elems.iterator)(_ + _) |
|
58 |
||
59 |
def ++ (other: Elements): Elements = |
|
60 |
if (this eq other) this |
|
61 |
else if (rep.isEmpty) other |
|
62 |
else (this /: other.rep)(_ + _) |
|
63 |
} |
|
64 |
||
45473 | 65 |
object Entry |
66 |
{ |
|
67 |
def apply(markup: Text.Markup, subtree: Markup_Tree): Entry = |
|
50552
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
68 |
Entry(markup.range, List(markup.info), Elements.empty + markup.info, |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
69 |
subtree, subtree.make_elements) |
49469 | 70 |
|
71 |
def apply(range: Text.Range, rev_markups: List[XML.Elem], subtree: Markup_Tree): Entry = |
|
50552
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
72 |
Entry(range, rev_markups, Elements.empty ++ rev_markups, |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
73 |
subtree, subtree.make_elements) |
45473 | 74 |
} |
75 |
||
45474
f793dd5d84b2
index markup elements for more efficient cumulate/select operations;
wenzelm
parents:
45473
diff
changeset
|
76 |
sealed case class Entry( |
f793dd5d84b2
index markup elements for more efficient cumulate/select operations;
wenzelm
parents:
45473
diff
changeset
|
77 |
range: Text.Range, |
f793dd5d84b2
index markup elements for more efficient cumulate/select operations;
wenzelm
parents:
45473
diff
changeset
|
78 |
rev_markup: List[XML.Elem], |
50551 | 79 |
elements: Elements, |
50552
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
80 |
subtree: Markup_Tree, |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
81 |
subtree_elements: Elements) |
45469
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
82 |
{ |
50552
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
83 |
def markup: List[XML.Elem] = rev_markup.reverse |
45474
f793dd5d84b2
index markup elements for more efficient cumulate/select operations;
wenzelm
parents:
45473
diff
changeset
|
84 |
|
50552
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
85 |
def + (markup: Text.Markup): Entry = |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
86 |
copy(rev_markup = markup.info :: rev_markup, elements = elements + markup.info) |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
87 |
|
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
88 |
def \ (markup: Text.Markup): Entry = |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
89 |
copy(subtree = subtree + markup, subtree_elements = subtree_elements + markup.info) |
45469
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
90 |
} |
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
91 |
|
38479
e628da370072
more efficient Markup_Tree, based on branches sorted by quasi-order;
wenzelm
parents:
38478
diff
changeset
|
92 |
object Branches |
e628da370072
more efficient Markup_Tree, based on branches sorted by quasi-order;
wenzelm
parents:
38478
diff
changeset
|
93 |
{ |
38578 | 94 |
type T = SortedMap[Text.Range, Entry] |
45456 | 95 |
val empty: T = SortedMap.empty(Text.Range.Ordering) |
38479
e628da370072
more efficient Markup_Tree, based on branches sorted by quasi-order;
wenzelm
parents:
38478
diff
changeset
|
96 |
} |
49466 | 97 |
|
98 |
||
99 |
/* XML representation */ |
|
100 |
||
49650
9fad6480300d
support for wrapped XML elements, which allows to preserve full markup tree information in to_XML/from_XML conversion;
wenzelm
parents:
49614
diff
changeset
|
101 |
@tailrec private def strip_elems( |
9fad6480300d
support for wrapped XML elements, which allows to preserve full markup tree information in to_XML/from_XML conversion;
wenzelm
parents:
49614
diff
changeset
|
102 |
elems: List[XML.Elem], body: XML.Body): (List[XML.Elem], XML.Body) = |
49467 | 103 |
body match { |
49650
9fad6480300d
support for wrapped XML elements, which allows to preserve full markup tree information in to_XML/from_XML conversion;
wenzelm
parents:
49614
diff
changeset
|
104 |
case List(XML.Wrapped_Elem(markup1, body1, body2)) => |
9fad6480300d
support for wrapped XML elements, which allows to preserve full markup tree information in to_XML/from_XML conversion;
wenzelm
parents:
49614
diff
changeset
|
105 |
strip_elems(XML.Elem(markup1, body1) :: elems, body2) |
9fad6480300d
support for wrapped XML elements, which allows to preserve full markup tree information in to_XML/from_XML conversion;
wenzelm
parents:
49614
diff
changeset
|
106 |
case List(XML.Elem(markup1, body1)) => |
9fad6480300d
support for wrapped XML elements, which allows to preserve full markup tree information in to_XML/from_XML conversion;
wenzelm
parents:
49614
diff
changeset
|
107 |
strip_elems(XML.Elem(markup1, Nil) :: elems, body1) |
9fad6480300d
support for wrapped XML elements, which allows to preserve full markup tree information in to_XML/from_XML conversion;
wenzelm
parents:
49614
diff
changeset
|
108 |
case _ => (elems, body) |
49467 | 109 |
} |
110 |
||
111 |
private def make_trees(acc: (Int, List[Markup_Tree]), tree: XML.Tree): (Int, List[Markup_Tree]) = |
|
112 |
{ |
|
113 |
val (offset, markup_trees) = acc |
|
114 |
||
115 |
strip_elems(Nil, List(tree)) match { |
|
116 |
case (Nil, body) => |
|
117 |
(offset + XML.text_length(body), markup_trees) |
|
49466 | 118 |
|
49469 | 119 |
case (elems, body) => |
120 |
val (end_offset, subtrees) = ((offset, Nil: List[Markup_Tree]) /: body)(make_trees) |
|
50642
aca12f646772
ignore markup elements over empty body, which are not well-defined within markup tree and fail to work with merge_disjoint (e.g. multiple inlined positions);
wenzelm
parents:
50552
diff
changeset
|
121 |
if (offset == end_offset) acc |
aca12f646772
ignore markup elements over empty body, which are not well-defined within markup tree and fail to work with merge_disjoint (e.g. multiple inlined positions);
wenzelm
parents:
50552
diff
changeset
|
122 |
else { |
aca12f646772
ignore markup elements over empty body, which are not well-defined within markup tree and fail to work with merge_disjoint (e.g. multiple inlined positions);
wenzelm
parents:
50552
diff
changeset
|
123 |
val range = Text.Range(offset, end_offset) |
aca12f646772
ignore markup elements over empty body, which are not well-defined within markup tree and fail to work with merge_disjoint (e.g. multiple inlined positions);
wenzelm
parents:
50552
diff
changeset
|
124 |
val entry = Entry(range, elems, merge_disjoint(subtrees)) |
aca12f646772
ignore markup elements over empty body, which are not well-defined within markup tree and fail to work with merge_disjoint (e.g. multiple inlined positions);
wenzelm
parents:
50552
diff
changeset
|
125 |
(end_offset, new Markup_Tree(Branches.empty, entry) :: markup_trees) |
aca12f646772
ignore markup elements over empty body, which are not well-defined within markup tree and fail to work with merge_disjoint (e.g. multiple inlined positions);
wenzelm
parents:
50552
diff
changeset
|
126 |
} |
49466 | 127 |
} |
49467 | 128 |
} |
49466 | 129 |
|
49467 | 130 |
def from_XML(body: XML.Body): Markup_Tree = |
131 |
merge_disjoint(((0, Nil: List[Markup_Tree]) /: body)(make_trees)._2) |
|
38479
e628da370072
more efficient Markup_Tree, based on branches sorted by quasi-order;
wenzelm
parents:
38478
diff
changeset
|
132 |
} |
34554
7dc6c231da40
abs. stops, markup nodes depend on doc-version;
immler@in.tum.de
parents:
34517
diff
changeset
|
133 |
|
34393 | 134 |
|
49467 | 135 |
final class Markup_Tree private(private val branches: Markup_Tree.Branches.T) |
34717
3f32e08bbb6c
sidekick root data: set buffer length to avoid crash of initial caret move;
wenzelm
parents:
34708
diff
changeset
|
136 |
{ |
49417 | 137 |
import Markup_Tree._ |
138 |
||
45469
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
139 |
private def this(branches: Markup_Tree.Branches.T, entry: Markup_Tree.Entry) = |
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
140 |
this(branches + (entry.range -> entry)) |
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
141 |
|
38563 | 142 |
override def toString = |
143 |
branches.toList.map(_._2) match { |
|
144 |
case Nil => "Empty" |
|
145 |
case list => list.mkString("Tree(", ",", ")") |
|
146 |
} |
|
147 |
||
45469
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
148 |
private def overlapping(range: Text.Range): Branches.T = |
45457 | 149 |
{ |
150 |
val start = Text.Range(range.start) |
|
151 |
val stop = Text.Range(range.stop) |
|
152 |
val bs = branches.range(start, stop) |
|
153 |
branches.get(stop) match { |
|
45469
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
154 |
case Some(end) if range overlaps end.range => bs + (end.range -> end) |
45457 | 155 |
case _ => bs |
156 |
} |
|
157 |
} |
|
158 |
||
50552
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
159 |
def make_elements: Elements = |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
160 |
(Elements.empty /: branches)( |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
161 |
{ case (elements, (_, entry)) => elements ++ entry.subtree_elements ++ entry.elements }) |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
162 |
|
45469
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
163 |
def + (new_markup: Text.Markup): Markup_Tree = |
34703 | 164 |
{ |
45469
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
165 |
val new_range = new_markup.range |
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
166 |
|
38578 | 167 |
branches.get(new_range) match { |
45473 | 168 |
case None => new Markup_Tree(branches, Entry(new_markup, empty)) |
45469
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
169 |
case Some(entry) => |
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
170 |
if (entry.range == new_range) |
50552
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
171 |
new Markup_Tree(branches, entry + new_markup) |
45469
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
172 |
else if (entry.range.contains(new_range)) |
50552
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
173 |
new Markup_Tree(branches, entry \ new_markup) |
38578 | 174 |
else if (new_range.contains(branches.head._1) && new_range.contains(branches.last._1)) |
45473 | 175 |
new Markup_Tree(Branches.empty, Entry(new_markup, this)) |
38482
7b6ee937b75f
tuned Markup_Tree, using SortedMap more carefully;
wenzelm
parents:
38479
diff
changeset
|
176 |
else { |
45457 | 177 |
val body = overlapping(new_range) |
49607
b610c0d52bfa
updated to consolidated SortedMap in scala-2.9.x;
wenzelm
parents:
49469
diff
changeset
|
178 |
if (body.forall(e => new_range.contains(e._1))) |
b610c0d52bfa
updated to consolidated SortedMap in scala-2.9.x;
wenzelm
parents:
49469
diff
changeset
|
179 |
new Markup_Tree(branches -- body.keys, Entry(new_markup, new Markup_Tree(body))) |
49608 | 180 |
else { |
181 |
java.lang.System.err.println("Ignored overlapping markup information: " + new_markup + |
|
48762 | 182 |
body.filter(e => !new_range.contains(e._1)).mkString("\n")) |
38482
7b6ee937b75f
tuned Markup_Tree, using SortedMap more carefully;
wenzelm
parents:
38479
diff
changeset
|
183 |
this |
7b6ee937b75f
tuned Markup_Tree, using SortedMap more carefully;
wenzelm
parents:
38479
diff
changeset
|
184 |
} |
7b6ee937b75f
tuned Markup_Tree, using SortedMap more carefully;
wenzelm
parents:
38479
diff
changeset
|
185 |
} |
34703 | 186 |
} |
187 |
} |
|
188 |
||
49614 | 189 |
def to_XML(root_range: Text.Range, text: CharSequence, filter: XML.Elem => Boolean): XML.Body = |
190 |
{ |
|
191 |
def make_text(start: Text.Offset, stop: Text.Offset): XML.Body = |
|
192 |
if (start == stop) Nil |
|
193 |
else List(XML.Text(text.subSequence(start, stop).toString)) |
|
194 |
||
195 |
def make_elems(rev_markups: List[XML.Elem], body: XML.Body): XML.Body = |
|
196 |
(body /: rev_markups) { |
|
49650
9fad6480300d
support for wrapped XML elements, which allows to preserve full markup tree information in to_XML/from_XML conversion;
wenzelm
parents:
49614
diff
changeset
|
197 |
case (b, elem) => |
9fad6480300d
support for wrapped XML elements, which allows to preserve full markup tree information in to_XML/from_XML conversion;
wenzelm
parents:
49614
diff
changeset
|
198 |
if (!filter(elem)) b |
9fad6480300d
support for wrapped XML elements, which allows to preserve full markup tree information in to_XML/from_XML conversion;
wenzelm
parents:
49614
diff
changeset
|
199 |
else if (elem.body.isEmpty) List(XML.Elem(elem.markup, b)) |
9fad6480300d
support for wrapped XML elements, which allows to preserve full markup tree information in to_XML/from_XML conversion;
wenzelm
parents:
49614
diff
changeset
|
200 |
else List(XML.Wrapped_Elem(elem.markup, elem.body, b)) |
49614 | 201 |
} |
202 |
||
203 |
def make_body(elem_range: Text.Range, elem_markup: List[XML.Elem], entries: Branches.T) |
|
204 |
: XML.Body = |
|
205 |
{ |
|
206 |
val body = new mutable.ListBuffer[XML.Tree] |
|
207 |
var last = elem_range.start |
|
208 |
for ((range, entry) <- entries) { |
|
209 |
val subrange = range.restrict(elem_range) |
|
210 |
body ++= make_text(last, subrange.start) |
|
211 |
body ++= make_body(subrange, entry.rev_markup, entry.subtree.overlapping(subrange)) |
|
212 |
last = subrange.stop |
|
213 |
} |
|
214 |
body ++= make_text(last, elem_range.stop) |
|
215 |
make_elems(elem_markup, body.toList) |
|
216 |
} |
|
217 |
make_body(root_range, Nil, overlapping(root_range)) |
|
218 |
} |
|
219 |
||
220 |
def to_XML(text: CharSequence): XML.Body = |
|
221 |
to_XML(Text.Range(0, text.length), text, (_: XML.Elem) => true) |
|
222 |
||
46178
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
46165
diff
changeset
|
223 |
def cumulate[A](root_range: Text.Range, root_info: A, result_elements: Option[Set[String]], |
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
46165
diff
changeset
|
224 |
result: PartialFunction[(A, Text.Markup), A]): Stream[Text.Info[A]] = |
45459 | 225 |
{ |
50551 | 226 |
val notable: Elements => Boolean = |
227 |
result_elements match { |
|
228 |
case Some(res) => (elements: Elements) => res.exists(elements.contains) |
|
229 |
case None => (elements: Elements) => true |
|
230 |
} |
|
231 |
||
46178
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
46165
diff
changeset
|
232 |
def results(x: A, entry: Entry): Option[A] = |
50552
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
233 |
{ |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
234 |
val (y, changed) = |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
235 |
// FIXME proper cumulation order (including status markup) (!?) |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
236 |
((x, false) /: entry.rev_markup)((res, info) => |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
237 |
{ |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
238 |
val (y, changed) = res |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
239 |
val arg = (y, Text.Info(entry.range, info)) |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
240 |
if (result.isDefinedAt(arg)) (result(arg), true) |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
241 |
else res |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
242 |
}) |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
243 |
if (changed) Some(y) else None |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
244 |
} |
45467 | 245 |
|
45459 | 246 |
def stream( |
247 |
last: Text.Offset, |
|
45469
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
248 |
stack: List[(Text.Info[A], Stream[(Text.Range, Entry)])]): Stream[Text.Info[A]] = |
45459 | 249 |
{ |
250 |
stack match { |
|
45469
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
251 |
case (parent, (range, entry) #:: more) :: rest => |
45467 | 252 |
val subrange = range.restrict(root_range) |
50552
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
253 |
val subtree = |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
254 |
if (notable(entry.subtree_elements)) |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
255 |
entry.subtree.overlapping(subrange).toStream |
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
256 |
else Stream.empty |
45459 | 257 |
val start = subrange.start |
258 |
||
50552
2b7fd8c9c4ac
maintain subtree_elements for improved performance of cumulate operator;
wenzelm
parents:
50551
diff
changeset
|
259 |
(if (notable(entry.elements)) results(parent.info, entry) else None) match { |
45469
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
260 |
case Some(res) => |
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
261 |
val next = Text.Info(subrange, res) |
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
262 |
val nexts = stream(start, (next, subtree) :: (parent, more) :: rest) |
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
263 |
if (last < start) parent.restrict(Text.Range(last, start)) #:: nexts |
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
264 |
else nexts |
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
265 |
case None => stream(last, (parent, subtree #::: more) :: rest) |
45459 | 266 |
} |
267 |
||
268 |
case (parent, Stream.Empty) :: rest => |
|
269 |
val stop = parent.range.stop |
|
270 |
val nexts = stream(stop, rest) |
|
271 |
if (last < stop) parent.restrict(Text.Range(last, stop)) #:: nexts |
|
272 |
else nexts |
|
273 |
||
274 |
case Nil => |
|
45467 | 275 |
val stop = root_range.stop |
276 |
if (last < stop) Stream(Text.Info(Text.Range(last, stop), root_info)) |
|
45459 | 277 |
else Stream.empty |
278 |
} |
|
279 |
} |
|
45467 | 280 |
stream(root_range.start, |
281 |
List((Text.Info(root_range, root_info), overlapping(root_range).toStream))) |
|
45459 | 282 |
} |
283 |
||
49465 | 284 |
def swing_tree(parent: DefaultMutableTreeNode, |
285 |
swing_node: Text.Info[List[XML.Elem]] => DefaultMutableTreeNode) |
|
38479
e628da370072
more efficient Markup_Tree, based on branches sorted by quasi-order;
wenzelm
parents:
38478
diff
changeset
|
286 |
{ |
45469
25306d92f4ad
refined Markup_Tree implementation: stacked markup within each entry;
wenzelm
parents:
45468
diff
changeset
|
287 |
for ((_, entry) <- branches) { |
47539 | 288 |
val node = swing_node(Text.Info(entry.range, entry.markup)) |
49465 | 289 |
entry.subtree.swing_tree(node, swing_node) |
290 |
parent.add(node) |
|
34514
2104a836b415
renamed fields of MarkupNode; implemented flatten and leafs
immler@in.tum.de
parents:
34503
diff
changeset
|
291 |
} |
2104a836b415
renamed fields of MarkupNode; implemented flatten and leafs
immler@in.tum.de
parents:
34503
diff
changeset
|
292 |
} |
34717
3f32e08bbb6c
sidekick root data: set buffer length to avoid crash of initial caret move;
wenzelm
parents:
34708
diff
changeset
|
293 |
} |
34514
2104a836b415
renamed fields of MarkupNode; implemented flatten and leafs
immler@in.tum.de
parents:
34503
diff
changeset
|
294 |