summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/immutable/HashMap.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2009-05-12 09:58:25 +0000
committerMartin Odersky <odersky@gmail.com>2009-05-12 09:58:25 +0000
commitca3d31e7b25e4709839671f2ee5c5bd643cbc08e (patch)
treee44fe21fe1202a7c4ebc026a9bc2bd851b16bdec /src/library/scala/collection/immutable/HashMap.scala
parente4a8be83c10545e318fcb53bea39e86b26a71555 (diff)
downloadscala-ca3d31e7b25e4709839671f2ee5c5bd643cbc08e.tar.gz
scala-ca3d31e7b25e4709839671f2ee5c5bd643cbc08e.tar.bz2
scala-ca3d31e7b25e4709839671f2ee5c5bd643cbc08e.zip
separated mutable and immutable maps
Diffstat (limited to 'src/library/scala/collection/immutable/HashMap.scala')
-rw-r--r--src/library/scala/collection/immutable/HashMap.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/library/scala/collection/immutable/HashMap.scala b/src/library/scala/collection/immutable/HashMap.scala
index 6a515e829c..6f0277a43f 100644
--- a/src/library/scala/collection/immutable/HashMap.scala
+++ b/src/library/scala/collection/immutable/HashMap.scala
@@ -53,7 +53,7 @@ class HashMap[A, +B] extends Map[A,B] with ImmutableMapTemplate[A, B, HashMap[A,
else Some(getValue(e))
}
- def add [B1 >: B] (key: A, value: B1): HashMap[A, B1] = synchronized {
+ def updated [B1 >: B] (key: A, value: B1): HashMap[A, B1] = synchronized {
makeCopyIfUpdated()
val e = findEntry(key)
if (e == null) {
@@ -70,7 +70,7 @@ class HashMap[A, +B] extends Map[A,B] with ImmutableMapTemplate[A, B, HashMap[A,
* @param kv the key/value pair
* @return A new map with the new binding added to this map
*/
- override def + [B1 >: B] (kv: (A, B1)): HashMap[A, B1] = add(kv._1, kv._2)
+ override def + [B1 >: B] (kv: (A, B1)): HashMap[A, B1] = updated(kv._1, kv._2)
/** Adds two or more elements to this collection and returns
* either the collection itself (if it is mutable), or a new collection
@@ -81,9 +81,9 @@ class HashMap[A, +B] extends Map[A,B] with ImmutableMapTemplate[A, B, HashMap[A,
* @param elems the remaining elements to add.
*/
override def + [B1 >: B] (elem1: (A, B1), elem2: (A, B1), elems: (A, B1) *): HashMap[A, B1] =
- this + elem1 + elem2 ++ collection.Iterable.fromOld(elems)
+ this + elem1 + elem2 ++ elems
- def - (key: A): HashMap[A, B] = synchronized {
+ def minus (key: A): HashMap[A, B] = synchronized {
makeCopyIfUpdated()
val e = findEntry(key)
if (e == null) this