diff options
| -rw-r--r-- | src/library/scala/collection/mutable/MapLike.scala | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/library/scala/collection/mutable/MapLike.scala b/src/library/scala/collection/mutable/MapLike.scala index 92f1b5bba6..a1e8e9b6d6 100644 --- a/src/library/scala/collection/mutable/MapLike.scala +++ b/src/library/scala/collection/mutable/MapLike.scala @@ -103,15 +103,6 @@ trait MapLike[A, B, +This <: MapLike[A, B, This] with Map[A, B]] */ override def updated[B1 >: B](key: A, value: B1): mutable.Map[A, B1] = this + ((key, value)) - /** If given key is already in this map, returns associated value - * Otherwise, computes value from given expression `op`, stores with key - * in map and returns that value. - */ - def cached(key: A, op: => B) = get(key) match { - case Some(v) => v - case None => val v = op; update(key, v); v - } - /** Add a new key/value mapping and return the map itself. * * @param kv the key/value mapping to be added @@ -193,14 +184,14 @@ trait MapLike[A, B, +This <: MapLike[A, B, This] with Map[A, B]] */ def clear() { for ((k, v) <- this.iterator) -=(k) } - /** Check if this map maps <code>key</code> to a value. - * Return that value if it exists, otherwise put <code>default</code> - * as that key's value and return it. - */ - def getOrElseUpdate(key: A, default: => B): B = + /** If given key is already in this map, returns associated value + * Otherwise, computes value from given expression `op`, stores with key + * in map and returns that value. + */ + def getOrElseUpdate(key: A, op: => B): B = get(key) match { case Some(v) => v - case None => val d = default; this(key) = d; d + case None => val d = op; this(key) = d; d } /** This function transforms all the values of mappings contained |