diff options
author | Philipp Haller <hallerp@gmail.com> | 2009-07-28 09:57:42 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2009-07-28 09:57:42 +0000 |
commit | cc711eef357d5461f4987e7a78f852ac11700532 (patch) | |
tree | f4c167d67dc43059413a9c70e09277aed8e905dc | |
parent | cbadb522f1161ae289ee9cf3332788298a26edb0 (diff) | |
download | scala-cc711eef357d5461f4987e7a78f852ac11700532.tar.gz scala-cc711eef357d5461f4987e7a78f852ac11700532.tar.bz2 scala-cc711eef357d5461f4987e7a78f852ac11700532.zip |
Reintegrated `ImmutableMapAdaptor` and `Immutab...
Reintegrated `ImmutableMapAdaptor` and `ImmutableSetAdaptor`.
-rw-r--r-- | src/library/scala/collection/mutable/ImmutableMapAdaptor.scala | 25 | ||||
-rw-r--r-- | src/library/scala/collection/mutable/ImmutableSetAdaptor.scala | 10 |
2 files changed, 19 insertions, 16 deletions
diff --git a/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala b/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala index 91da716f9d..27e7b412e1 100644 --- a/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala +++ b/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala @@ -1,5 +1,4 @@ -/* TODO: Reintegrate -* /* __ *\ +/* __ *\ ** ________ ___ / / ___ Scala API ** ** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** @@ -10,7 +9,8 @@ // $Id$ -package scala.collection.mutable +package scala.collection +package mutable /** This class can be used as an adaptor to create mutable maps from @@ -28,7 +28,7 @@ class ImmutableMapAdaptor[A, B](protected var imap: immutable.Map[A, B]) extends Map[A, B] { - def size: Int = imap.size + override def size: Int = imap.size def get(key: A): Option[B] = imap.get(key) @@ -40,14 +40,14 @@ extends Map[A, B] override def isDefinedAt(key: A) = imap.isDefinedAt(key) - override def keySet: Set[A] = imap.keys + override def keySet: collection.Set[A] = imap.keySet override def keysIterator: Iterator[A] = imap.keysIterator @deprecated("use `keysIterator' instead") override def keys: Iterator[A] = imap.keysIterator - override def valueIterable: Iterable[B] = imap.valueIterable + override def valueIterable: collection.Iterable[B] = imap.valueIterable override def valuesIterator: Iterator[B] = imap.valuesIterator @@ -57,22 +57,25 @@ extends Map[A, B] def iterator: Iterator[(A, B)] = imap.iterator @deprecated("use `iterator' instead") - def elements = iterator + override def elements = iterator override def toList: List[(A, B)] = imap.toList - def update(key: A, value: B): Unit = { imap = imap.update(key, value) } + override def update(key: A, value: B): Unit = { imap = imap.update(key, value) } def -= (key: A): this.type = { imap = imap - key; this } + def += (kv: (A, B)): this.type = { imap = imap + kv; this } + override def clear(): Unit = { imap = imap.empty } - override def transform(f: (A, B) => B): Unit = { imap = imap.transform(f) } + override def transform(f: (A, B) => B): this.type = { imap = imap.transform(f); this } - override def retain(p: (A, B) => Boolean): Unit = { + override def retain(p: (A, B) => Boolean): this.type = { imap = imap.filter(xy => p(xy._1, xy._2)) + this } override def toString() = imap.toString() } -*/ + diff --git a/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala b/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala index 452aa3afe1..e4a452e765 100644 --- a/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala +++ b/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala @@ -1,4 +1,3 @@ -/* TODO: Reintegrate /* __ *\ ** ________ ___ / / ___ Scala API ** ** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** @@ -10,7 +9,8 @@ // $Id$ -package scala.collection.mutable +package scala.collection +package mutable /** This class can be used as an adaptor to create mutable sets from @@ -25,7 +25,7 @@ package scala.collection.mutable @serializable class ImmutableSetAdaptor[A](protected var set: immutable.Set[A]) extends Set[A] { - def size: Int = set.size + override def size: Int = set.size override def isEmpty: Boolean = set.isEmpty @@ -45,9 +45,9 @@ class ImmutableSetAdaptor[A](protected var set: immutable.Set[A]) extends Set[A] def +=(elem: A): this.type = { set = set + elem; this } - def -=(elem: A): Unit = { set = set - elem } + def -=(elem: A): this.type = { set = set - elem; this } override def clear(): Unit = { set = set.empty } } -*/ + |