New miniphase: ExpandSAMs

The phase replaces SAM closures with anonymous classes when necessary.

1 files changed, 63 insertions, 0 deletions

diff --git a/tests/pos/sams.scala b/tests/pos/sams.scala
new file mode 100644
index 000000000..671213fef
--- /dev/null
+++ b/tests/pos/sams.scala
@@ -0,0 +1,63 @@
+object test {
+
+  trait X { def foo(x: Int): Int; def bar = foo(2) }
+
+  val x: X = (x: Int) => 2  // should be a closure
+
+  trait T {
+    var f = 2
+    def foo(x: Int): Int
+  }
+
+  val t: T = (x: Int) => 2   // needs to be an anonymous class because of defined field
+
+  trait U extends T
+
+  val u: U = (x: Int) => 2   // needs to be an anonymous class because of inherited field
+
+  trait Y extends X {
+    def baz = super.bar
+  }
+
+  val y: Y = (x: Int) => 2   // needs to be an anonymous class because of super accessor
+
+  abstract class C {
+    def foo(x: Int): Int
+
+    trait I { def foo(x: Int): Int }
+
+  }
+
+  val c: C = (x: Int) => 2   // needs to be an anonymous class because C is not a trait
+
+  val ci: c.I = (x: Int) => 2 // needs to be an anonymous class because it needs an outer pointer
+
+
+  val pf: PartialFunction[Int, Int] = {
+    case 1 => 1
+    case 2 => 2
+  }
+
+  val qf: PartialFunction[(Int, String), Int] = {
+    case (1, "abc") => 1
+    case _ => 2
+  }
+
+  val rf: PartialFunction[(Int, AnyRef), Int] = {
+    case (_: Int, _: String) => 1
+    case _ => 2
+  }
+
+  val sf: PartialFunction[Any, Int] = {
+    case x: String if x == "abc" => 1
+  }
+}
+
+// From: neg/sammy_poly
+// synthesizeSAMFunction where the sam type is not fully defined
+class T {
+  trait F[T, U] { def apply(x: T): U }
+  // this is an inner trait, that will recieve an abstract $outer pointer. Not a SAM.
+  def app[T, U](x: T)(f: F[T, U]): U = f(x)
+  app(1)(x => List(x))
+}