| author | wenzelm | 
| Mon, 02 Jan 2017 11:42:15 +0100 | |
| changeset 64748 | 155bf8632104 | 
| parent 64370 | 865b39487b5d | 
| child 65371 | ce09e947c1d5 | 
| permissions | -rw-r--r-- | 
| 32464 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 1 | /* Title: Pure/General/linear_set.scala | 
| 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 2 | Author: Makarius | 
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 3 | Author: Fabian Immler, TU Munich | 
| 32464 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 4 | |
| 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 5 | Sets with canonical linear order, or immutable linked-lists. | 
| 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 6 | */ | 
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 7 | |
| 32464 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 8 | package isabelle | 
| 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 9 | |
| 55618 | 10 | |
| 36011 
3ff725ac13a4
adapted to Scala 2.8.0 Beta1 -- with notable changes to scala.collection;
 wenzelm parents: 
34304diff
changeset | 11 | import scala.collection.SetLike | 
| 56658 
86f9c6912965
accomodate scala-2.11.0: evade somewhat erratic fix of ImmutableSetFactory in Scala/bfa70315d72d;
 wenzelm parents: 
55618diff
changeset | 12 | import scala.collection.generic.{SetFactory, CanBuildFrom, GenericSetTemplate, GenericCompanion}
 | 
| 
86f9c6912965
accomodate scala-2.11.0: evade somewhat erratic fix of ImmutableSetFactory in Scala/bfa70315d72d;
 wenzelm parents: 
55618diff
changeset | 13 | import scala.collection.mutable.{Builder, SetBuilder}
 | 
| 
86f9c6912965
accomodate scala-2.11.0: evade somewhat erratic fix of ImmutableSetFactory in Scala/bfa70315d72d;
 wenzelm parents: 
55618diff
changeset | 14 | import scala.language.higherKinds | 
| 32464 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 15 | |
| 36011 
3ff725ac13a4
adapted to Scala 2.8.0 Beta1 -- with notable changes to scala.collection;
 wenzelm parents: 
34304diff
changeset | 16 | |
| 56658 
86f9c6912965
accomodate scala-2.11.0: evade somewhat erratic fix of ImmutableSetFactory in Scala/bfa70315d72d;
 wenzelm parents: 
55618diff
changeset | 17 | object Linear_Set extends SetFactory[Linear_Set] | 
| 32464 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 18 | {
 | 
| 46621 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 19 | private val empty_val: Linear_Set[Nothing] = new Linear_Set[Nothing](None, None, Map(), Map()) | 
| 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 20 | override def empty[A] = empty_val.asInstanceOf[Linear_Set[A]] | 
| 32465 | 21 | |
| 36011 
3ff725ac13a4
adapted to Scala 2.8.0 Beta1 -- with notable changes to scala.collection;
 wenzelm parents: 
34304diff
changeset | 22 | implicit def canBuildFrom[A]: CanBuildFrom[Coll, A, Linear_Set[A]] = setCanBuildFrom[A] | 
| 56658 
86f9c6912965
accomodate scala-2.11.0: evade somewhat erratic fix of ImmutableSetFactory in Scala/bfa70315d72d;
 wenzelm parents: 
55618diff
changeset | 23 | def newBuilder[A]: Builder[A, Linear_Set[A]] = new SetBuilder[A, Linear_Set[A]](empty[A]) | 
| 32464 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 24 | |
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38368diff
changeset | 25 | class Duplicate[A](x: A) extends Exception | 
| 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38368diff
changeset | 26 | class Undefined[A](x: A) extends Exception | 
| 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38368diff
changeset | 27 | class Next_Undefined[A](x: Option[A]) extends Exception | 
| 32464 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 28 | } | 
| 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 29 | |
| 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 30 | |
| 46712 | 31 | final class Linear_Set[A] private( | 
| 46621 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 32 | start: Option[A], end: Option[A], val nexts: Map[A, A], prevs: Map[A, A]) | 
| 36011 
3ff725ac13a4
adapted to Scala 2.8.0 Beta1 -- with notable changes to scala.collection;
 wenzelm parents: 
34304diff
changeset | 33 | extends scala.collection.immutable.Set[A] | 
| 
3ff725ac13a4
adapted to Scala 2.8.0 Beta1 -- with notable changes to scala.collection;
 wenzelm parents: 
34304diff
changeset | 34 | with GenericSetTemplate[A, Linear_Set] | 
| 
3ff725ac13a4
adapted to Scala 2.8.0 Beta1 -- with notable changes to scala.collection;
 wenzelm parents: 
34304diff
changeset | 35 | with SetLike[A, Linear_Set[A]] | 
| 32464 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 36 | {
 | 
| 36011 
3ff725ac13a4
adapted to Scala 2.8.0 Beta1 -- with notable changes to scala.collection;
 wenzelm parents: 
34304diff
changeset | 37 | override def companion: GenericCompanion[Linear_Set] = Linear_Set | 
| 
3ff725ac13a4
adapted to Scala 2.8.0 Beta1 -- with notable changes to scala.collection;
 wenzelm parents: 
34304diff
changeset | 38 | |
| 
3ff725ac13a4
adapted to Scala 2.8.0 Beta1 -- with notable changes to scala.collection;
 wenzelm parents: 
34304diff
changeset | 39 | |
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38368diff
changeset | 40 | /* relative addressing */ | 
| 32464 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 41 | |
| 48761 
6a355b4b6a59
clarified Linear_Set.next/prev: check definedness;
 wenzelm parents: 
48753diff
changeset | 42 | def next(elem: A): Option[A] = | 
| 
6a355b4b6a59
clarified Linear_Set.next/prev: check definedness;
 wenzelm parents: 
48753diff
changeset | 43 | if (contains(elem)) nexts.get(elem) | 
| 
6a355b4b6a59
clarified Linear_Set.next/prev: check definedness;
 wenzelm parents: 
48753diff
changeset | 44 | else throw new Linear_Set.Undefined(elem) | 
| 
6a355b4b6a59
clarified Linear_Set.next/prev: check definedness;
 wenzelm parents: 
48753diff
changeset | 45 | |
| 
6a355b4b6a59
clarified Linear_Set.next/prev: check definedness;
 wenzelm parents: 
48753diff
changeset | 46 | def prev(elem: A): Option[A] = | 
| 
6a355b4b6a59
clarified Linear_Set.next/prev: check definedness;
 wenzelm parents: 
48753diff
changeset | 47 | if (contains(elem)) prevs.get(elem) | 
| 
6a355b4b6a59
clarified Linear_Set.next/prev: check definedness;
 wenzelm parents: 
48753diff
changeset | 48 | else throw new Linear_Set.Undefined(elem) | 
| 32464 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 49 | |
| 38368 | 50 | def get_after(hook: Option[A]): Option[A] = | 
| 51 |     hook match {
 | |
| 46621 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 52 | case None => start | 
| 48761 
6a355b4b6a59
clarified Linear_Set.next/prev: check definedness;
 wenzelm parents: 
48753diff
changeset | 53 | case Some(elem) => next(elem) | 
| 38368 | 54 | } | 
| 55 | ||
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 56 | def insert_after(hook: Option[A], elem: A): Linear_Set[A] = | 
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38368diff
changeset | 57 | if (contains(elem)) throw new Linear_Set.Duplicate(elem) | 
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 58 | else | 
| 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 59 |       hook match {
 | 
| 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 60 | case None => | 
| 46621 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 61 |           start match {
 | 
| 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 62 | case None => new Linear_Set[A](Some(elem), Some(elem), Map(), Map()) | 
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 63 | case Some(elem1) => | 
| 46621 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 64 | new Linear_Set[A](Some(elem), end, | 
| 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 65 | nexts + (elem -> elem1), prevs + (elem1 -> elem)) | 
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 66 | } | 
| 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 67 | case Some(elem1) => | 
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38368diff
changeset | 68 | if (!contains(elem1)) throw new Linear_Set.Undefined(elem1) | 
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 69 | else | 
| 46621 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 70 |             nexts.get(elem1) match {
 | 
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 71 | case None => | 
| 46621 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 72 | new Linear_Set[A](start, Some(elem), | 
| 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 73 | nexts + (elem1 -> elem), prevs + (elem -> elem1)) | 
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 74 | case Some(elem2) => | 
| 46621 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 75 | new Linear_Set[A](start, end, | 
| 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 76 | nexts + (elem1 -> elem) + (elem -> elem2), | 
| 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 77 | prevs + (elem2 -> elem) + (elem -> elem1)) | 
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 78 | } | 
| 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 79 | } | 
| 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 80 | |
| 48753 | 81 | def append_after(hook: Option[A], elems: Seq[A]): Linear_Set[A] = // FIXME reverse fold | 
| 48748 
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
 wenzelm parents: 
48747diff
changeset | 82 |     ((hook, this) /: elems) {
 | 
| 
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
 wenzelm parents: 
48747diff
changeset | 83 | case ((last, set), elem) => (Some(elem), set.insert_after(last, elem)) | 
| 
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
 wenzelm parents: 
48747diff
changeset | 84 | }._2 | 
| 
89b4e7d83d6f
refined recover_spans: take visible range into account, reparse and trim results -- to improve editing experience wrt. unbalanced quotations etc.;
 wenzelm parents: 
48747diff
changeset | 85 | |
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 86 | def delete_after(hook: Option[A]): Linear_Set[A] = | 
| 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 87 |     hook match {
 | 
| 32464 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 88 | case None => | 
| 46621 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 89 |         start match {
 | 
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38368diff
changeset | 90 | case None => throw new Linear_Set.Next_Undefined[A](None) | 
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 91 | case Some(elem1) => | 
| 46621 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 92 |             nexts.get(elem1) match {
 | 
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 93 | case None => empty | 
| 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 94 | case Some(elem2) => | 
| 46621 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 95 | new Linear_Set[A](Some(elem2), end, nexts - elem1, prevs - elem2) | 
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 96 | } | 
| 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 97 | } | 
| 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 98 | case Some(elem1) => | 
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38368diff
changeset | 99 | if (!contains(elem1)) throw new Linear_Set.Undefined(elem1) | 
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 100 | else | 
| 46621 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 101 |           nexts.get(elem1) match {
 | 
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38368diff
changeset | 102 | case None => throw new Linear_Set.Next_Undefined(Some(elem1)) | 
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 103 | case Some(elem2) => | 
| 46621 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 104 |               nexts.get(elem2) match {
 | 
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 105 | case None => | 
| 46621 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 106 | new Linear_Set[A](start, Some(elem1), nexts - elem1, prevs - elem2) | 
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 107 | case Some(elem3) => | 
| 46621 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 108 | new Linear_Set[A](start, end, | 
| 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 109 | nexts - elem2 + (elem1 -> elem3), | 
| 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 110 | prevs - elem2 + (elem3 -> elem1)) | 
| 32576 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 111 | } | 
| 
20b261654e33
double linking for improved performance of "prev";
 wenzelm parents: 
32465diff
changeset | 112 | } | 
| 32464 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 113 | } | 
| 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 114 | |
| 32465 | 115 | |
| 116 | /* Set methods */ | |
| 117 | ||
| 118 | override def stringPrefix = "Linear_Set" | |
| 119 | ||
| 46621 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 120 | override def isEmpty: Boolean = !start.isDefined | 
| 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 121 | override def size: Int = if (isEmpty) 0 else nexts.size + 1 | 
| 32464 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 122 | |
| 34304 | 123 | def contains(elem: A): Boolean = | 
| 59319 | 124 | nonEmpty && (end.get == elem || nexts.isDefinedAt(elem)) | 
| 34304 | 125 | |
| 48746 
9e1b2aafbc7f
more direct Linear_Set.reverse, swapping orientation of the graph;
 wenzelm parents: 
46712diff
changeset | 126 |   private def make_iterator(from: Option[A]): Iterator[A] = new Iterator[A] {
 | 
| 46620 | 127 | private var next_elem = from | 
| 38583 | 128 | def hasNext(): Boolean = next_elem.isDefined | 
| 129 | def next(): A = | |
| 34301 | 130 |       next_elem match {
 | 
| 131 | case Some(elem) => | |
| 48746 
9e1b2aafbc7f
more direct Linear_Set.reverse, swapping orientation of the graph;
 wenzelm parents: 
46712diff
changeset | 132 | next_elem = nexts.get(elem) | 
| 34301 | 133 | elem | 
| 38583 | 134 | case None => Iterator.empty.next() | 
| 34301 | 135 | } | 
| 32464 
5b9731f83569
added linear_set.scala from http://isabelle.in.tum.de/repos/isabelle-jedit/rev/d567692f9717
 wenzelm parents: diff
changeset | 136 | } | 
| 32465 | 137 | |
| 48746 
9e1b2aafbc7f
more direct Linear_Set.reverse, swapping orientation of the graph;
 wenzelm parents: 
46712diff
changeset | 138 | override def iterator: Iterator[A] = make_iterator(start) | 
| 34304 | 139 | |
| 36011 
3ff725ac13a4
adapted to Scala 2.8.0 Beta1 -- with notable changes to scala.collection;
 wenzelm parents: 
34304diff
changeset | 140 | def iterator(elem: A): Iterator[A] = | 
| 48746 
9e1b2aafbc7f
more direct Linear_Set.reverse, swapping orientation of the graph;
 wenzelm parents: 
46712diff
changeset | 141 | if (contains(elem)) make_iterator(Some(elem)) | 
| 38448 
62d16c415019
added functor Linear_Set, based on former adhoc structures in document.ML;
 wenzelm parents: 
38368diff
changeset | 142 | else throw new Linear_Set.Undefined(elem) | 
| 32465 | 143 | |
| 48747 | 144 | def iterator(from: A, to: A): Iterator[A] = | 
| 48761 
6a355b4b6a59
clarified Linear_Set.next/prev: check definedness;
 wenzelm parents: 
48753diff
changeset | 145 | if (contains(to)) | 
| 48747 | 146 |       nexts.get(to) match {
 | 
| 147 | case None => iterator(from) | |
| 148 | case Some(stop) => iterator(from).takeWhile(_ != stop) | |
| 149 | } | |
| 48761 
6a355b4b6a59
clarified Linear_Set.next/prev: check definedness;
 wenzelm parents: 
48753diff
changeset | 150 | else throw new Linear_Set.Undefined(to) | 
| 48747 | 151 | |
| 48753 | 152 | def reverse: Linear_Set[A] = new Linear_Set(end, start, prevs, nexts) | 
| 153 | ||
| 154 | override def last: A = reverse.head | |
| 155 | ||
| 46621 
7a8dd77c9f93
streamlined abstract datatype, eliminating odd representation class;
 wenzelm parents: 
46620diff
changeset | 156 | def + (elem: A): Linear_Set[A] = insert_after(end, elem) | 
| 32465 | 157 | |
| 48761 
6a355b4b6a59
clarified Linear_Set.next/prev: check definedness;
 wenzelm parents: 
48753diff
changeset | 158 | def - (elem: A): Linear_Set[A] = delete_after(prev(elem)) | 
| 
6a355b4b6a59
clarified Linear_Set.next/prev: check definedness;
 wenzelm parents: 
48753diff
changeset | 159 | } |