summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid MacIver <david.maciver@gmail.com>2008-10-27 16:35:42 +0000
committerDavid MacIver <david.maciver@gmail.com>2008-10-27 16:35:42 +0000
commit9dde9718b95c51cb82b26d0d5d76fe42a5d99314 (patch)
tree419f6eccb84dbb1256170d939851cf3f5cc22f12
parentb95390021d9f95fd92e54785c68a29e3e04476a0 (diff)
downloadscala-9dde9718b95c51cb82b26d0d5d76fe42a5d99314.tar.gz
scala-9dde9718b95c51cb82b26d0d5d76fe42a5d99314.tar.bz2
scala-9dde9718b95c51cb82b26d0d5d76fe42a5d99314.zip
Fixing IntMap/LongMap.getOrElse.
-rw-r--r--src/library/scala/collection/immutable/IntMap.scala2
-rw-r--r--src/library/scala/collection/immutable/LongMap.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/collection/immutable/IntMap.scala b/src/library/scala/collection/immutable/IntMap.scala
index 33bbccfb96..2e05c6873d 100644
--- a/src/library/scala/collection/immutable/IntMap.scala
+++ b/src/library/scala/collection/immutable/IntMap.scala
@@ -225,7 +225,7 @@ sealed abstract class IntMap[+T] extends scala.collection.immutable.Map[Int, T]{
final override def getOrElse[S >: T](key : Int, default : =>S) : S = this match {
case IntMap.Nil => default;
case IntMap.Tip(key2, value) => if (key == key2) value else default;
- case IntMap.Bin(prefix, mask, left, right) => if (zero(key, mask)) left(key) else right(key);
+ case IntMap.Bin(prefix, mask, left, right) => if (zero(key, mask)) left.getOrElse(key, default) else right.getOrElse(key, default);
}
final override def apply(key : Int) : T = this match {
diff --git a/src/library/scala/collection/immutable/LongMap.scala b/src/library/scala/collection/immutable/LongMap.scala
index b59cc9df41..e0afdf0ad6 100644
--- a/src/library/scala/collection/immutable/LongMap.scala
+++ b/src/library/scala/collection/immutable/LongMap.scala
@@ -226,7 +226,7 @@ sealed abstract class LongMap[+T] extends scala.collection.immutable.Map[Long, T
final override def getOrElse[S >: T](key : Long, default : =>S) : S = this match {
case LongMap.Nil => default;
case LongMap.Tip(key2, value) => if (key == key2) value else default;
- case LongMap.Bin(prefix, mask, left, right) => if (zero(key, mask)) left(key) else right(key);
+ case LongMap.Bin(prefix, mask, left, right) => if (zero(key, mask)) left.getOrElse(key, default) else right.getOrElse(key, default);
}
final override def apply(key : Long) : T = this match {