diff options
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/collection/Set.scala | 4 | ||||
| -rw-r--r-- | src/library/scala/collection/immutable/SortedMap.scala | 32 | ||||
| -rw-r--r-- | src/library/scala/collection/immutable/SortedSet.scala | 10 |
3 files changed, 39 insertions, 7 deletions
diff --git a/src/library/scala/collection/Set.scala b/src/library/scala/collection/Set.scala index 6cc99a0509..44dd8d3b3a 100644 --- a/src/library/scala/collection/Set.scala +++ b/src/library/scala/collection/Set.scala @@ -1,7 +1,7 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** ** / __/ __// _ | / / / _ | (c) 2003-2007, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ @@ -104,7 +104,7 @@ trait Set[A] extends (A => Boolean) with Collection[A] { * contain the same elements. */ override def equals(that: Any): Boolean = that match { - case other: Set[a] => + case other: Set[A] => this.size == other.size && subsetOf(other.asInstanceOf[Set[A]]) case _ => false diff --git a/src/library/scala/collection/immutable/SortedMap.scala b/src/library/scala/collection/immutable/SortedMap.scala index a5c73764c8..bf5c3636bc 100644 --- a/src/library/scala/collection/immutable/SortedMap.scala +++ b/src/library/scala/collection/immutable/SortedMap.scala @@ -1,23 +1,45 @@ -package scala.collection.immutable; +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2007, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + +package scala.collection.immutable trait SortedMap[A,+B] extends Map[A,B] with collection.SortedMap[A,B] { - override def rangeImpl(from : Option[A], until : Option[A]) : SortedMap[A,B]; - override def from(from: A) = rangeImpl(Some(from), None); - override def until(until: A) = rangeImpl(None, Some(until)); - override def range(from: A, until: A) = rangeImpl(Some(from),Some(until)); + + override def rangeImpl(from: Option[A], until: Option[A]): SortedMap[A,B] + + override def from(from: A) = rangeImpl(Some(from), None) + + override def until(until: A) = rangeImpl(None, Some(until)) + + override def range(from: A, until: A) = rangeImpl(Some(from),Some(until)) + override def empty[C]: SortedMap[A, C] + override def update [B1 >: B] (key: A, value: B1): SortedMap[A, B1] + override def + [B1 >: B] (kv: Pair[A, B1]): SortedMap[A, B1] = update(kv._1, kv._2) override def + [B1 >: B] (kv1: Pair[A, B1], kv2: Pair[A, B1], kvs: Pair[A, B1]*): SortedMap[A, B1] = this + kv1 + kv2 ++ kvs + override def ++ [B1 >: B] (kvs: Iterable[Pair[A, B1]]): SortedMap[A, B1] = ((this: SortedMap[A, B1]) /: kvs) ((m, kv) => m + kv) + override def ++ [B1 >: B] (kvs: Iterator[Pair[A, B1]]): SortedMap[A, B1] = ((this: SortedMap[A, B1]) /: kvs) ((m, kv) => m + kv) + override def - (key: A): SortedMap[A, B] + override def - (key1: A, key2: A, keys: A*): SortedMap[A, B] = this - key1 - key2 -- keys + override def -- (keys: Iterable[A]): SortedMap[A, B] = this -- keys.elements override def -- (keys: Iterator[A]): SortedMap[A, B] = diff --git a/src/library/scala/collection/immutable/SortedSet.scala b/src/library/scala/collection/immutable/SortedSet.scala index 05eaefe692..3ff391898d 100644 --- a/src/library/scala/collection/immutable/SortedSet.scala +++ b/src/library/scala/collection/immutable/SortedSet.scala @@ -1,3 +1,13 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2007, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + package scala.collection.immutable trait SortedSet[A] extends scala.collection.SortedSet[A] with Set[A] |