diff options
author | Erik Rozendaal <erik@deler.org> | 2012-01-07 19:20:46 +0100 |
---|---|---|
committer | Erik Rozendaal <erik@deler.org> | 2012-01-07 19:20:46 +0100 |
commit | e61075c4e173d8fad5127e90046f5b91e97c3180 (patch) | |
tree | 1f4dc8ff0a289f1bff11dbb6e39531c50e3fc2e5 /src/library | |
parent | 288874d80856317744c582f1468d7af420d9e0ee (diff) | |
download | scala-e61075c4e173d8fad5127e90046f5b91e97c3180.tar.gz scala-e61075c4e173d8fad5127e90046f5b91e97c3180.tar.bz2 scala-e61075c4e173d8fad5127e90046f5b91e97c3180.zip |
Tests for takeWhile/dropWhile/span.
Also simplified implementation of span to just use splitAt.
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/collection/immutable/TreeMap.scala | 5 | ||||
-rw-r--r-- | src/library/scala/collection/immutable/TreeSet.scala | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/library/scala/collection/immutable/TreeMap.scala b/src/library/scala/collection/immutable/TreeMap.scala index 196c3a9d9d..2bb8a566c6 100644 --- a/src/library/scala/collection/immutable/TreeMap.scala +++ b/src/library/scala/collection/immutable/TreeMap.scala @@ -116,10 +116,7 @@ class TreeMap[A, +B] private (tree: RB.Tree[A, B])(implicit val ordering: Orderi } override def dropWhile(p: ((A, B)) => Boolean) = drop(countWhile(p)) override def takeWhile(p: ((A, B)) => Boolean) = take(countWhile(p)) - override def span(p: ((A, B)) => Boolean) = { - val n = countWhile(p) - (take(n), drop(n)) - } + override def span(p: ((A, B)) => Boolean) = splitAt(countWhile(p)) /** A factory to create empty maps of the same type of keys. */ diff --git a/src/library/scala/collection/immutable/TreeSet.scala b/src/library/scala/collection/immutable/TreeSet.scala index 12e2197732..8b95358d1c 100644 --- a/src/library/scala/collection/immutable/TreeSet.scala +++ b/src/library/scala/collection/immutable/TreeSet.scala @@ -94,10 +94,7 @@ class TreeSet[A] private (tree: RB.Tree[A, Unit])(implicit val ordering: Orderin } override def dropWhile(p: A => Boolean) = drop(countWhile(p)) override def takeWhile(p: A => Boolean) = take(countWhile(p)) - override def span(p: A => Boolean) = { - val n = countWhile(p) - (take(n), drop(n)) - } + override def span(p: A => Boolean) = splitAt(countWhile(p)) @deprecated("use `ordering.lt` instead", "2.10") def isSmaller(x: A, y: A) = compare(x,y) < 0 |