summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorLex Spoon <lex@lexspoon.org>2007-04-25 23:14:52 +0000
committerLex Spoon <lex@lexspoon.org>2007-04-25 23:14:52 +0000
commitb7e87847c73d44b7448f7774204cb3e342958d9b (patch)
tree09a1333ff87d3956648e30113a369b4e2ccbe8ac /src/library
parent775cd7b80e553270c08afc9629f133000d21b196 (diff)
downloadscala-b7e87847c73d44b7448f7774204cb3e342958d9b.tar.gz
scala-b7e87847c73d44b7448f7774204cb3e342958d9b.tar.bz2
scala-b7e87847c73d44b7448f7774204cb3e342958d9b.zip
Make the second argument be by name for getOrEl...
Make the second argument be by name for getOrElse and getOrElseUpdate.
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/collection/Map.scala2
-rw-r--r--src/library/scala/collection/mutable/Map.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/collection/Map.scala b/src/library/scala/collection/Map.scala
index 6047513b20..e059617e79 100644
--- a/src/library/scala/collection/Map.scala
+++ b/src/library/scala/collection/Map.scala
@@ -53,7 +53,7 @@ trait Map[A, +B] extends PartialFunction[A, B] with Collection[(A, B)] {
/** Check if this map maps <code>key</code> to a value.
* Return that value if it exists, otherwise return <code>default</code>.
*/
- def getOrElse[B2 >: B](key: A, default: B2): B2 =
+ def getOrElse[B2 >: B](key: A, default: =>B2): B2 =
get(key) match {
case Some(v) => v
case None => default
diff --git a/src/library/scala/collection/mutable/Map.scala b/src/library/scala/collection/mutable/Map.scala
index d0d9867d1d..1c6dc04c13 100644
--- a/src/library/scala/collection/mutable/Map.scala
+++ b/src/library/scala/collection/mutable/Map.scala
@@ -163,7 +163,7 @@ trait Map[A, B] extends AnyRef
* 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 =
+ def getOrElseUpdate(key: A, default: =>B): B =
get(key) match {
case Some(v) => v
case None => this(key) = default; default