11 files changed, 135 insertions, 1 deletions
diff --git a/tests/neg/i1747.scala b/tests/neg/i1747.scala
new file mode 100644
index 000000000..54492aaed
--- /dev/null
+++ b/tests/neg/i1747.scala
@@ -0,0 +1,3 @@
+class Coll[E] extends java.util.Collection[E] { // error: needs to be abstract
+  def toArray[T](a: Array[T]): Array[T] = ??? // error: cannot override
+}
diff --git a/tests/neg/i1992.scala b/tests/neg/i1992.scala
new file mode 100644
index 000000000..818b46771
--- /dev/null
+++ b/tests/neg/i1992.scala
@@ -0,0 +1,9 @@
+object Test {
+  def main(args: Array[String]) = {
+    val x: Int => Unit =
+      y => println(x) // error: `x` is a forward reference
+    implicit val z: String => Unit =
+      y => println(implicitly[String => Unit]) // error: `z` is a forward reference
+  }
+}
+
diff --git a/tests/neg/i2005.scala b/tests/neg/i2005.scala
new file mode 100644
index 000000000..fc2e4ddec
--- /dev/null
+++ b/tests/neg/i2005.scala
@@ -0,0 +1,7 @@
+
+object Test {
+  val a = 42
+  def main(args: Array[String]) = {
+    val a: Int = a // error
+  }
+}
diff --git a/tests/neg/i2006.scala b/tests/neg/i2006.scala
new file mode 100644
index 000000000..f1b48b011
--- /dev/null
+++ b/tests/neg/i2006.scala
@@ -0,0 +1,10 @@
+object Test {
+
+  inline def foo(f: ImplicitFunction1[Int, Int]): AnyRef = f // error
+  inline def bar(f: ImplicitFunction1[Int, Int]) = f // error
+
+  def main(args: Array[String]) = {
+    foo(implicit thisTransaction => 43)
+    bar(implicit thisTransaction => 44)
+  }
+}
diff --git a/tests/pos/i1990.scala b/tests/pos/i1990.scala
new file mode 100644
index 000000000..77cea0af7
--- /dev/null
+++ b/tests/pos/i1990.scala
@@ -0,0 +1,12 @@
+class A {
+  class Foo {
+    inline def inlineMeth: Unit = {
+      new Bar
+    }
+  }
+  class Bar
+}
+
+class B extends A {
+  (new Foo).inlineMeth
+}
diff --git a/tests/pos/i1990a.scala b/tests/pos/i1990a.scala
new file mode 100644
index 000000000..f6f95ee36
--- /dev/null
+++ b/tests/pos/i1990a.scala
@@ -0,0 +1,20 @@
+class A { self =>
+  class Foo {
+    inline def inlineMeth: Unit = {
+      println(self)
+    }
+  }
+}
+
+class C extends A {
+  class B extends A
+}
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    val c = new C
+    val b = new c.B
+
+    (new b.Foo).inlineMeth
+  }
+}
diff --git a/tests/repl/imports.check b/tests/repl/imports.check
index 5260589a9..345fac142 100644
--- a/tests/repl/imports.check
+++ b/tests/repl/imports.check
@@ -11,7 +11,7 @@ scala> buf += xs
 11 |buf += xs
    |       ^^
    |       found:    scala.collection.immutable.List[Int](o.xs)
-   |       required: String
+   |       required: Int
    |       
 scala> buf ++= xs
 val res1: scala.collection.mutable.ListBuffer[Int] = ListBuffer(1, 2, 3)
diff --git a/tests/run/builder.check b/tests/run/builder.check
new file mode 100644
index 000000000..48f7d9253
--- /dev/null
+++ b/tests/run/builder.check
@@ -0,0 +1 @@
+Table(Row(Cell(A1), Cell(B1)), Row(Cell(A2), Cell(B2)))
diff --git a/tests/run/builder.scala b/tests/run/builder.scala
new file mode 100644
index 000000000..532a95071
--- /dev/null
+++ b/tests/run/builder.scala
@@ -0,0 +1,51 @@
+import collection.mutable.ArrayBuffer
+
+class Table {
+  val rows = new ArrayBuffer[Row]
+  def add(r: Row): Unit = rows += r
+  override def toString = rows.mkString("Table(", ", ", ")")
+}
+
+class Row {
+  val cells = new ArrayBuffer[Cell]
+  def add(c: Cell): Unit = cells += c
+  override def toString = cells.mkString("Row(", ", ", ")")
+}
+
+class Cell(elem: String) {
+  override def toString = s"Cell($elem)"
+}
+
+object Test {
+
+  def table(init: implicit Table => Unit) = {
+    implicit val t = new Table
+    init
+    t
+  }
+
+  def row(init: implicit Row => Unit)(implicit t: Table) = {
+    implicit val r = new Row
+    init
+    t.add(r)
+  }
+
+  def cell(str: String)(implicit r: Row) =
+    r.add(new Cell(str))
+
+  val data =
+    table {
+      row {
+        cell("A1")
+        cell("B1")
+      }
+      row {
+        cell("A2")
+        cell("B2")
+      }
+    }
+
+  def main(args: Array[String]) = {
+    println(data)
+  }
+}
diff --git a/tests/run/i1990b.check b/tests/run/i1990b.check
new file mode 100644
index 000000000..dd84bc9fb
--- /dev/null
+++ b/tests/run/i1990b.check
@@ -0,0 +1 @@
+C()
diff --git a/tests/run/i1990b.scala b/tests/run/i1990b.scala
new file mode 100644
index 000000000..2460208db
--- /dev/null
+++ b/tests/run/i1990b.scala
@@ -0,0 +1,20 @@
+trait A { self =>
+  class Foo {
+    inline def inlineMeth: Unit = {
+      println(self)
+    }
+  }
+}
+
+case class A2() extends A {
+  case class C() extends Foo with A
+
+  val c = new C
+  (new c.Foo).inlineMeth
+}
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    new A2
+  }
+}