Merge pull request #792 from jsuereth/fixup/from-repr

Split @milessabin HasRepr into IsTraversableOnce and IsTraversableLike t...

2 files changed, 63 insertions, 22 deletions

diff --git a/test/files/run/enrich-gentraversable.check b/test/files/run/enrich-gentraversable.check
index 348b38d6a4..94c66e3692 100644
--- a/test/files/run/enrich-gentraversable.check
+++ b/test/files/run/enrich-gentraversable.check
@@ -2,3 +2,7 @@ List(2, 4)
 Array(2, 4)
 HW
 Vector(72, 108, 108, 32, 114, 108, 100)
+List(2, 4)
+Array(2, 4)
+HW
+Vector(72, 108, 108, 32, 114, 108, 100)
diff --git a/test/files/run/enrich-gentraversable.scala b/test/files/run/enrich-gentraversable.scala
index c9320ff985..52eded55fd 100644
--- a/test/files/run/enrich-gentraversable.scala
+++ b/test/files/run/enrich-gentraversable.scala
@@ -1,30 +1,67 @@
 object Test extends App {
-  import scala.collection.generic.{ CanBuildFrom, FromRepr, HasElem }
+  import scala.collection.{GenTraversableOnce,GenTraversableLike}
+  import scala.collection.generic._
 
   def typed[T](t : => T) {}
-
-  class FilterMapImpl[A, Repr](val r : Repr)(implicit hasElem : HasElem[Repr, A]) {
-    def filterMap[B, That](f : A => Option[B])(implicit cbf : CanBuildFrom[Repr, B, That]) : That = r.flatMap(f(_).toSeq)
+  def testTraversableLike = {
+    class FilterMapImpl[A, Repr](val r: GenTraversableLike[A, Repr]) /* extends AnyVal */ {
+      final def filterMap[B, That](f: A => Option[B])(implicit cbf: CanBuildFrom[Repr, B, That]): That =
+        r.flatMap(f(_).toSeq)
+    }
+    implicit def filterMap[Repr, A](r: Repr)(implicit fr: IsTraversableLike[Repr]): FilterMapImpl[fr.A,Repr] =
+      new FilterMapImpl[fr.A, Repr](fr.conversion(r))
+  
+    val l = List(1, 2, 3, 4, 5)
+    val fml = l.filterMap(i => if(i % 2 == 0) Some(i) else None)
+    typed[List[Int]](fml)
+    println(fml)
+  
+    val a = Array(1, 2, 3, 4, 5)
+    val fma = a.filterMap(i => if(i % 2 == 0) Some(i) else None)
+    typed[Array[Int]](fma)
+    println(fma.deep)
+    
+    val s = "Hello World"
+    val fms1 = s.filterMap(c => if(c >= 'A' && c <= 'Z') Some(c) else None)
+    typed[String](fms1)
+    println(fms1)
+    
+    val fms2 = s.filterMap(c =>if(c % 2 == 0) Some(c.toInt) else None)
+    typed[IndexedSeq[Int]](fms2)
+    println(fms2)
   }
+  def testTraversableOnce = {
+    class FilterMapImpl[A, Repr](val r: GenTraversableOnce[A]) /* extends AnyVal */ {
+      final def filterMap[B, That](f: A => Option[B])(implicit cbf: CanBuildFrom[Repr, B, That]): That = {
+        val b = cbf()
+        for(e <- r.seq) f(e) foreach (b +=)
   
-  implicit def filterMap[Repr : FromRepr](r : Repr) = new FilterMapImpl(r)
-
-  val l = List(1, 2, 3, 4, 5)
-  val fml = l.filterMap(i => if(i % 2 == 0) Some(i) else None)
-  typed[List[Int]](fml)
-  println(fml)
-
-  val a = Array(1, 2, 3, 4, 5)
-  val fma = a.filterMap(i => if(i % 2 == 0) Some(i) else None)
-  typed[Array[Int]](fma)
-  println(fma.deep)
+        b.result
+      }
+    }
+    implicit def filterMap[Repr, A](r: Repr)(implicit fr: IsTraversableOnce[Repr]): FilterMapImpl[fr.A,Repr] =
+      new FilterMapImpl[fr.A, Repr](fr.conversion(r))
   
-  val s = "Hello World"
-  val fms1 = s.filterMap(c => if(c >= 'A' && c <= 'Z') Some(c) else None)
-  typed[String](fms1)
-  println(fms1)
+    val l = List(1, 2, 3, 4, 5)
+    val fml = l.filterMap(i => if(i % 2 == 0) Some(i) else None)
+    typed[List[Int]](fml)
+    println(fml)
   
-  val fms2 = s.filterMap(c =>if(c % 2 == 0) Some(c.toInt) else None)
-  typed[IndexedSeq[Int]](fms2)
-  println(fms2)
+    val a = Array(1, 2, 3, 4, 5)
+    val fma = a.filterMap(i => if(i % 2 == 0) Some(i) else None)
+    typed[Array[Int]](fma)
+    println(fma.deep)
+    
+    val s = "Hello World"
+    val fms1 = s.filterMap(c => if(c >= 'A' && c <= 'Z') Some(c) else None)
+    typed[String](fms1)
+    println(fms1)
+    
+    val fms2 = s.filterMap(c =>if(c % 2 == 0) Some(c.toInt) else None)
+    typed[IndexedSeq[Int]](fms2)
+    println(fms2)
+  }
+
+  testTraversableLike
+  testTraversableOnce
 }