summaryrefslogtreecommitdiff
path: root/test/files/jvm/javaReflection.check
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2015-02-03 11:29:08 +0100
committerLukas Rytz <lukas.rytz@gmail.com>2015-02-07 07:45:53 +0100
commitb2e22fa308b2f402d78dc3d3afc33256c1d3cbba (patch)
treee7bdb44726dd50866465af28618f643ab391867b /test/files/jvm/javaReflection.check
parentcd8f2f327106c7e2944afa7ac8b7675262626c1e (diff)
downloadscala-b2e22fa308b2f402d78dc3d3afc33256c1d3cbba.tar.gz
scala-b2e22fa308b2f402d78dc3d3afc33256c1d3cbba.tar.bz2
scala-b2e22fa308b2f402d78dc3d3afc33256c1d3cbba.zip
Fix InnerClass / EnclosingMethod for closures nested in value classes
Members of value classes are moved over to the companion object early. This change ensures that closure classes nested in value classes appear that way to Java reflection. This commit also changes the EnclosingMethod attribute for classes (and anonymous functions) nested in anonymous function bodies. Before, the enclosing method was in some cases the function's apply method. Not always though: () => { class C ... val a = { class D ...} } The class C used to be nested in the function's apply method, but not D, because the value definition for a was lifted out of the apply. After this commit, we uniformly set the enclosing method of classes nested in function bodies to `null`. This is consistent with the source-level view of the code. Note that under delambdafy:method, closures never appear as enclosing classes (this didn't change in this commit).
Diffstat (limited to 'test/files/jvm/javaReflection.check')
-rw-r--r--test/files/jvm/javaReflection.check2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/jvm/javaReflection.check b/test/files/jvm/javaReflection.check
index d40599507d..8180ecff8a 100644
--- a/test/files/jvm/javaReflection.check
+++ b/test/files/jvm/javaReflection.check
@@ -5,7 +5,7 @@ A$$anonfun$$lessinit$greater$1 / null (canon) / $anonfun$$lessinit$greater$1 (si
- properties : true (local) / false (member)
A$$anonfun$$lessinit$greater$1$$anonfun$apply$1 / null (canon) / $anonfun$apply$1 (simple)
- declared cls: List()
-- enclosing : null (declaring cls) / class A$$anonfun$$lessinit$greater$1 (cls) / null (constr) / public final scala.Function0 A$$anonfun$$lessinit$greater$1.apply() (meth)
+- enclosing : null (declaring cls) / class A$$anonfun$$lessinit$greater$1 (cls) / null (constr) / null (meth)
- properties : true (local) / false (member)
A$$anonfun$2 / null (canon) / $anonfun$2 (simple)
- declared cls: List()