chyanged implicits so that implicit Builder pat...

chyanged implicits so that implicit Builder pattern works.

4 files changed, 72 insertions, 6 deletions

diff --git a/test/files/jvm/typerep.scala b/test/files/jvm/typerep.scala
index b133d7ce99..47bd335d32 100644
--- a/test/files/jvm/typerep.scala
+++ b/test/files/jvm/typerep.scala
@@ -58,7 +58,7 @@ object testOptions {
   val x: Option[Int] = Some(2)
   println(getType(x))
   println(getType(Some(Some(3))))
-  println(getType(None))
+  println(getType(None: Option[Int]))
   val y: Option[Int] = None
   println(getType(y))
   println
@@ -68,7 +68,7 @@ object testLists {
   println(getType(List(3)))
   println(getType(3 :: Nil))
   println(getType(List(List(3))))
-  println(getType(Nil))
+  println(getType(Nil: List[Int]))
   println(getType(List(1, "abc")))
   println
 }
diff --git a/test/files/jvm5/typerep.scala b/test/files/jvm5/typerep.scala
index 3519a617a7..fc94817adf 100755
--- a/test/files/jvm5/typerep.scala
+++ b/test/files/jvm5/typerep.scala
@@ -59,8 +59,8 @@ object testOptions {
   println(getType(x))
   println(getType(Some(Some(3))))
   println(getType(Some(List(3))))
-  //println(getType(Some(None)))  // error: no implicit argument matching parameter type TypeRep[object None] was foun
-  println(getType(None))
+  //println(getType(Some(None: List[Int])))  // error: no implicit argument matching parameter type TypeRep[object None] was foun
+  println(getType(None: Option[Int]))
   val y: Option[Int] = None
   println(getType(y))
   println
@@ -70,7 +70,7 @@ object testLists {
   println(getType(List(3)))
   println(getType(3 :: Nil))
   println(getType(List(List(3))))
-  println(getType(Nil))
+  println(getType(Nil: List[Int]))
   println(getType(List(1, "abc")))
   println
 }
diff --git a/test/files/neg/bug550.check b/test/files/neg/bug550.check
index 8f1a5c0e5a..252580a327 100644
--- a/test/files/neg/bug550.check
+++ b/test/files/neg/bug550.check
@@ -1,7 +1,7 @@
 bug550.scala:6: error: class List takes type parameters
   def sum[a](xs: List)(implicit m: Monoid[a]): a =
                  ^
-bug550.scala:8: error: no implicit argument matching parameter type Monoid[Nothing] was found.
+bug550.scala:8: error: no implicit argument matching parameter type Monoid[a] was found.
   sum(List(1,2,3))
   ^
 two errors found
diff --git a/test/files/pos/builders.scala b/test/files/pos/builders.scala
new file mode 100755
index 0000000000..0b620769c0
--- /dev/null
+++ b/test/files/pos/builders.scala
@@ -0,0 +1,66 @@
+object builders {
+
+  trait Builder[-From, +To, -Elem] {
+    def += (elem: Elem)
+    def result: To
+  }
+
+  implicit def iterableBuilder[A, B] = new Builder[Iterable[A], Iterable[B], B] {
+    println("new iterable builder")
+    private val buf = new scala.collection.mutable.ListBuffer[B]
+    def += (elem: B) { buf += elem }
+    def result: Iterable[B] = buf.toList
+  }
+
+  implicit def listBuilder[A, B] = new Builder[List[A], List[B], B] {
+    println("new list builder")
+    private val buf = new scala.collection.mutable.ListBuffer[B]
+    def += (elem: B) { buf += elem }
+    def result: List[B] = buf.toList
+  }
+/*
+  def fill[A, Dim1, Dim2, Coll](n1: Int, n2: Int, elem: A)(implicit b1: Builder[Coll, Dim1, A], b2: Builder[Coll, Dim2, Dim1]) = {
+    for (i <- 0 until n1) {
+      for (j <- 0 until n2) {
+        b1 += elem
+      }
+      b2 += b1.result
+    }
+    b2.result
+  }
+*/
+/*
+  implicit def arrayBuilder[A, B] = new Builder[Array[A], Array[B], B] {
+    println("new arr ay builder")
+    private val buf = new scala.collection.mutable.ListBuffer[B]
+    def += (elem: B) { buf += elem }
+    def result: Array[B] = buf.toArray
+  }
+*/
+  class Iter[A, C](elems: List[A]) {
+    def ++ [B  >: A, D](xs: Iterable[B])(implicit b: Builder[C, D, B]): D = {
+      for (x <- elems) b += x
+      for (x <- xs) b += x
+      b.result
+    }
+    def map[B, D](f: A => B)(implicit b: Builder[C, D, B]): D = {
+      for (x <- elems) b += f(x)
+      b.result
+    }
+  }
+
+  def main(args : Array[String]) : Unit = {
+    val x1 = new Iter[Int, List[Int]](List(1, 2, 3))
+//    val x2 = new Iter[Int, Array[Int]](List(1, 2, 3))
+    val x3 = new Iter[Int, Iterable[Int]](List(1, 2, 3))
+    val y1: List[Int] = x1.map (_ + 1)
+//    val y2: Array[Int] = x2.map (_ + 1)
+    val y3: Iterable[Int] = x3.map (_ + 1)
+    val z1: List[Int] = y1
+//    val z2: Array[Int] = y2
+    val z3: Iterable[Int] = y3
+    println(z1)
+//    println(z2)
+    println(z3)
+  }
+}