summaryrefslogtreecommitdiff
path: root/test/files/jvm/javaReflection
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-05-20 16:21:40 +1000
committerLukas Rytz <lukas.rytz@gmail.com>2015-05-26 15:18:33 +0200
commit2be2c0d9866352286470e74a9bd878cbe3b37222 (patch)
treef8da00efdbf75b8d82b7fa133ae6696f6f3765aa /test/files/jvm/javaReflection
parent1f5c3f8ba84a8d85502f7f54926b1e220c1b4129 (diff)
downloadscala-2be2c0d9866352286470e74a9bd878cbe3b37222.tar.gz
scala-2be2c0d9866352286470e74a9bd878cbe3b37222.tar.bz2
scala-2be2c0d9866352286470e74a9bd878cbe3b37222.zip
Make two tests work under -Ydelambdafy:method
Recently, in 029cce7, I changed uncurry to selectively fallback to the old method of emitting lambdas when we detect that `-Ydelambdafy:method`. The change in classfile names breaks the expectations of the test `innerClassAttribute`. This commit changes that test to avoid using specialized functions, so that under -Ydelambdafy:method all functions are uniform. This changes a few fresh suffixes for anonymous class names under both `-Ydelambdafy:{inline,method}`, so the expectations have been duly updated. Similarly, I have changed `javaReflection` in the same manner. Its checkfiles remained unchanged.
Diffstat (limited to 'test/files/jvm/javaReflection')
-rw-r--r--test/files/jvm/javaReflection/Classes_1.scala18
1 files changed, 9 insertions, 9 deletions
diff --git a/test/files/jvm/javaReflection/Classes_1.scala b/test/files/jvm/javaReflection/Classes_1.scala
index 11963e2770..e9cd4f756a 100644
--- a/test/files/jvm/javaReflection/Classes_1.scala
+++ b/test/files/jvm/javaReflection/Classes_1.scala
@@ -13,7 +13,7 @@ class A {
trait C
object D
new T { }
- (() => -1)
+ (() => "-1")
def f = { class KB }
}
@@ -21,21 +21,21 @@ class A {
new T { }
// anonymous function, not a member
- (() => 1)
+ (() => "1")
def f = {
class E
trait F
object G
new T { }
- (() => 2)
+ (() => "2")
if (new Object().hashCode == 1) {
class H
trait I
object J
new T { }
- (() => 3)
+ (() => "3")
} else {
()
}
@@ -46,7 +46,7 @@ class A {
trait L
object M
new T { }
- (() => 4)
+ (() => "4")
}
val x = {
@@ -54,7 +54,7 @@ class A {
trait O
object P
new T { }
- (() => 5)
+ (() => "5")
}
def this(x: Int) {
@@ -63,7 +63,7 @@ class A {
trait R
object S
new T { }
- (() => () => 5)
+ (() => () => "5")
}
}
@@ -72,7 +72,7 @@ object AO {
trait C
object D
new T { }
- (() => 1)
+ (() => "1")
}
trait AT {
@@ -80,5 +80,5 @@ trait AT {
trait C
object D
new T { }
- (() => 1)
+ (() => "1")
}