diff options
author | paltherr <paltherr@epfl.ch> | 2003-08-07 13:31:10 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2003-08-07 13:31:10 +0000 |
commit | 62ea09a68046a6b6f98dc8c12cb3a6ab113ab141 (patch) | |
tree | d124e12a1197b2e298d06233c5b1422efb7d266f | |
parent | e73d2649b1ad6b4e0ac05c9cb7d9930da5801518 (diff) | |
download | scala-62ea09a68046a6b6f98dc8c12cb3a6ab113ab141.tar.gz scala-62ea09a68046a6b6f98dc8c12cb3a6ab113ab141.tar.bz2 scala-62ea09a68046a6b6f98dc8c12cb3a6ab113ab141.zip |
- changed is and as into isInstanceOf and asIns...
- changed is and as into isInstanceOf and asInstanceOf
-rwxr-xr-x | sources/scala/collection/immutable/GBTree.scala | 2 | ||||
-rw-r--r-- | sources/scala/collection/immutable/ListMap.scala | 4 | ||||
-rw-r--r-- | sources/scala/collection/immutable/ListSet.scala | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sources/scala/collection/immutable/GBTree.scala b/sources/scala/collection/immutable/GBTree.scala index 47e987b3c8..a30405a9c9 100755 --- a/sources/scala/collection/immutable/GBTree.scala +++ b/sources/scala/collection/immutable/GBTree.scala @@ -83,7 +83,7 @@ class GBTree[A <: Ord[A], B]() with scala.collection.immutable.Map[A, B, GBTree[ private def mkGBTree[C >: A <: Ord[C],D>:B](sz:int,t:Tree[C,D]) = new GBTree[A,B](){ override def size=sz; - override protected val tree:this.Tree[A,B]=t as this.Tree[A,B]; + override protected val tree:this.Tree[A,B]=t.asInstanceOf[this.Tree[A,B]]; }; diff --git a/sources/scala/collection/immutable/ListMap.scala b/sources/scala/collection/immutable/ListMap.scala index 8d048506b0..9dc94c2281 100644 --- a/sources/scala/collection/immutable/ListMap.scala +++ b/sources/scala/collection/immutable/ListMap.scala @@ -37,8 +37,8 @@ class ListMap[A, B] with Map[A, B, ListMap[A, B]] { override def toList: List[Pair[A, B]] = Nil; override def equals(obj: Any): Boolean = - if (obj is scala.collection.Map[A, B]) { - val that = obj as scala.collection.Map[A, B]; + if (obj.isInstanceOf[scala.collection.Map[A, B]]) { + val that = obj.asInstanceOf[scala.collection.Map[A, B]]; if (size != that.size) false else toList.forall { case Pair(key, value) => that.get(key) match { case None => false; diff --git a/sources/scala/collection/immutable/ListSet.scala b/sources/scala/collection/immutable/ListSet.scala index 3dc637500d..88e6256874 100644 --- a/sources/scala/collection/immutable/ListSet.scala +++ b/sources/scala/collection/immutable/ListSet.scala @@ -37,8 +37,8 @@ class ListSet[A] with Set[A, ListSet[A]] { override def toList: List[A] = Nil; override def equals(obj: Any): Boolean = - if (obj is scala.collection.Set[A]) { - val that = obj as scala.collection.Set[A]; + if (obj.isInstanceOf[scala.collection.Set[A]]) { + val that = obj.asInstanceOf[scala.collection.Set[A]]; if (size != that.size) false else toList.forall(that.contains); } else false; |