Merge pull request #3037 from gkossakowski/fix-merge-3018v2.11.0-M6

[resubmit] Experimental Single Abstract Method support (sammy meets world)

3 files changed, 36 insertions, 1 deletions

diff --git a/test/files/run/sammy_java8.flags b/test/files/run/sammy_java8.flags
new file mode 100644
index 0000000000..48fd867160
--- /dev/null
+++ b/test/files/run/sammy_java8.flags
@@ -0,0 +1 @@
+-Xexperimental
diff --git a/test/files/run/sammy_java8.scala b/test/files/run/sammy_java8.scala
new file mode 100644
index 0000000000..db9df7f5fe
--- /dev/null
+++ b/test/files/run/sammy_java8.scala
@@ -0,0 +1,34 @@
+import scala.tools.partest._
+
+// java8 version of sammy_poly.scala
+object Test extends CompilerTest {
+  import global._
+
+  override lazy val units: List[CompilationUnit] = {
+    global.settings.Xexperimental.value = true
+
+    // This test itself does not depend on JDK8.
+    javaCompilationUnits(global)(samSource) ++
+    compilationUnits(global)(useSamSource)
+  }
+
+  private def samSource = """
+//   trait F[T, U] { def apply(x: T): U }
+public interface F<T, U> {
+    U apply(T t);
+    default void yadayada() {
+        throw new UnsupportedOperationException("yadayada");
+    }
+}
+  """
+
+  private def useSamSource = """
+class T {
+  def app[T, U](x: T)(f: F[T, U]): U = f(x)
+  app(1)(x => List(x))
+}
+  """
+
+  // We're only checking we can compile it.
+  def check(source: String, unit: global.CompilationUnit): Unit = ()
+}
diff --git a/test/files/run/t7398.scala b/test/files/run/t7398.scala
index 493c4dcf40..4b46850768 100644
--- a/test/files/run/t7398.scala
+++ b/test/files/run/t7398.scala
@@ -21,6 +21,6 @@ public interface Iterator<E> {
 }
   """
 
-  // We're only checking we can parse it.
+  // We're only checking we can compile it.
   def check(source: String, unit: global.CompilationUnit): Unit = ()
 }