moved Range and GenericRange to collection.immu...

moved Range and GenericRange to collection.immutable, with alias for
Range in scala package object; made Range strict. moved from filter to
withFilter in translation for for expressions.

1 files changed, 26 insertions, 0 deletions

diff --git a/src/library/scala/collection/TraversableLike.scala b/src/library/scala/collection/TraversableLike.scala
index 9f4bdbac7f..2716956cb9 100644
--- a/src/library/scala/collection/TraversableLike.scala
+++ b/src/library/scala/collection/TraversableLike.scala
@@ -826,4 +826,30 @@ self =>
    *  @note view(from, to)  is equivalent to view.slice(from, to)
    */
   def view(from: Int, until: Int): TraversableView[A, Repr] = view.slice(from, until)
+
+  class WithFilter(p: A => Boolean) {
+
+    def map[B, That](f: A => B)(implicit bf: BuilderFactory[B, That, Repr]): That = {
+      val b = bf(repr)
+      for (x <- self)
+        if (p(x)) b += f(x)
+      b.result
+    }
+
+    def flatMap[B, That](f: A => Traversable[B])(implicit bf: BuilderFactory[B, That, Repr]): That = {
+      val b = bf(repr)
+      for (x <- self)
+        if (p(x)) b ++= f(x)
+      b.result
+    }
+
+    def foreach[U](f: A => U): Unit =
+      for (x <- self)
+        if (p(x)) f(x)
+
+    def withFilter(q: A => Boolean): WithFilter =
+      new WithFilter(x => p(x) && q(x))
+  }
+
+  def withFilter(p: A => Boolean): WithFilter = new WithFilter(p)
 }