diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2015-10-27 14:37:44 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2015-10-27 16:08:15 +1000 |
commit | 639e52ae7e128025f6eb57957a590b808d83a9a4 (patch) | |
tree | 19958923ec2beea7b770ccf2197fef6930e830f1 /test/files/run | |
parent | b194a4e7230334e441cd31b617fdce8e329dfa3a (diff) | |
download | scala-639e52ae7e128025f6eb57957a590b808d83a9a4.tar.gz scala-639e52ae7e128025f6eb57957a590b808d83a9a4.tar.bz2 scala-639e52ae7e128025f6eb57957a590b808d83a9a4.zip |
SI-9178 Don't eta expand param-less method types to SAMs
Otherwise, we can end up with a subtle source incompatibility with
the pre-SAM regime. Arguably we should phase out eta expansion to
Function0 as well, but I'll leave that for another day.
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/t9178a.flags | 1 | ||||
-rw-r--r-- | test/files/run/t9178a.scala | 15 | ||||
-rw-r--r-- | test/files/run/t9489.flags | 1 | ||||
-rw-r--r-- | test/files/run/t9489/A.java | 3 | ||||
-rw-r--r-- | test/files/run/t9489/B.java | 3 | ||||
-rw-r--r-- | test/files/run/t9489/test.scala | 10 |
6 files changed, 33 insertions, 0 deletions
diff --git a/test/files/run/t9178a.flags b/test/files/run/t9178a.flags new file mode 100644 index 0000000000..48fd867160 --- /dev/null +++ b/test/files/run/t9178a.flags @@ -0,0 +1 @@ +-Xexperimental diff --git a/test/files/run/t9178a.scala b/test/files/run/t9178a.scala new file mode 100644 index 0000000000..4788841f8d --- /dev/null +++ b/test/files/run/t9178a.scala @@ -0,0 +1,15 @@ +trait Sam { def apply(): Unit } +abstract class Test { + def foo(): Sam + // no parens, instantiateToMethodType would wrap in a `new Sam { def apply = foo }` + // rather than applying to an empty param list() */ + val f: Sam = foo +} + +object Test extends Test { + lazy val samIAm = new Sam { def apply() {} } + def foo() = samIAm + def main(args: Array[String]): Unit = { + assert(f eq samIAm, f) + } +} diff --git a/test/files/run/t9489.flags b/test/files/run/t9489.flags new file mode 100644 index 0000000000..48fd867160 --- /dev/null +++ b/test/files/run/t9489.flags @@ -0,0 +1 @@ +-Xexperimental diff --git a/test/files/run/t9489/A.java b/test/files/run/t9489/A.java new file mode 100644 index 0000000000..c3536faa14 --- /dev/null +++ b/test/files/run/t9489/A.java @@ -0,0 +1,3 @@ +public class A { + public B b() { return null; } +} diff --git a/test/files/run/t9489/B.java b/test/files/run/t9489/B.java new file mode 100644 index 0000000000..e5d1278cd7 --- /dev/null +++ b/test/files/run/t9489/B.java @@ -0,0 +1,3 @@ +public abstract class B { + public abstract int m(); +} diff --git a/test/files/run/t9489/test.scala b/test/files/run/t9489/test.scala new file mode 100644 index 0000000000..1b745af865 --- /dev/null +++ b/test/files/run/t9489/test.scala @@ -0,0 +1,10 @@ +class T { + def f(a: A) = g(a.b) // was: "found Int, required B" + def g(b: => B) = null +} + +object Test extends T { + def main(args: Array[String]): Unit = { + f(new A) + } +} |