diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2012-09-17 15:20:44 +0200 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2012-09-17 15:49:51 +0200 |
| commit | 1b8330c51055b0e83b8187ac3783eabb08d8c778 (patch) | |
| tree | af36e3b082032118e48c8a12a97d17eeddc24f95 /test/files/run | |
| parent | 40c388aa948807d893837937c6fdaa313c556f8f (diff) | |
| download | scala-1b8330c51055b0e83b8187ac3783eabb08d8c778.tar.gz scala-1b8330c51055b0e83b8187ac3783eabb08d8c778.tar.bz2 scala-1b8330c51055b0e83b8187ac3783eabb08d8c778.zip | |
SI-6374 Reflection now works for anns with enum fields
Enum members are static and, therefore, they need to be looked up in
classSymbol(<enum>).companionModule, rather than in classSymbol(<enum>).
Diffstat (limited to 'test/files/run')
| -rw-r--r-- | test/files/run/reflection-java-annotations.check | 2 | ||||
| -rw-r--r-- | test/files/run/reflection-java-annotations.jar.desired.sha1 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/files/run/reflection-java-annotations.check b/test/files/run/reflection-java-annotations.check index 84cfd03358..4c13ca8951 100644 --- a/test/files/run/reflection-java-annotations.check +++ b/test/files/run/reflection-java-annotations.check @@ -15,7 +15,7 @@ res0: reflect.runtime.universe.Type = java.lang.Object{def <init>(): Foo} scala> sym.getAnnotations foreach (_.javaArgs)
scala> println(sym.getAnnotations)
-List(ComplexAnnotation(v1 = 1, v10 = "hello", v101 = [101, 101], v102 = [102, 102], v103 = ['g', 'g'], v104 = [104, 104], v105 = [105L, 105L], v106 = [106.0, 106.0], v107 = [107.0, 107.0], v108 = [false, true], v11 = classOf[Foo], v110 = ["hello", "world"], v111 = [classOf[SimpleAnnotation], classOf[ComplexAnnotation]], v113 = [SimpleAnnotation(v1 = 21, v10 = "world2", v11 = classOf[ComplexAnnotation], v2 = 22, v3 = '\027', v4 = 24, v5 = 25L, v6 = 26.0, v7 = 27.0, v8 = false)], v13 = SimpleAnnotation(v1 = 11, v10 = "world1", v11 = classOf[SimpleAnnotation], v2 = 12, v3 = '\r', v4 = 14, v5 = 15L, v6 = 16.0, v7 = 17.0, v8 = false), v2 = 2, v3 = '\03', v4 = 4, v5 = 5L, v6 = 6.0, v7 = 7.0, v8 = false))
+List(ComplexAnnotation(v1 = 1, v10 = "hello", v101 = [101, 101], v102 = [102, 102], v103 = ['g', 'g'], v104 = [104, 104], v105 = [105L, 105L], v106 = [106.0, 106.0], v107 = [107.0, 107.0], v108 = [false, true], v11 = classOf[Foo], v110 = ["hello", "world"], v111 = [classOf[SimpleAnnotation], classOf[ComplexAnnotation]], v112 = [FOO, BAR], v113 = [SimpleAnnotation(v1 = 21, v10 = "world2", v11 = classOf[ComplexAnnotation], v12 = BAR, v2 = 22, v3 = '\027', v4 = 24, v5 = 25L, v6 = 26.0, v7 = 27.0, v8 = false)], v12 = FOO, v13 = SimpleAnnotation(v1 = 11, v10 = "world1", v11 = classOf[SimpleAnnotation], v12 = FOO, v2 = 12, v3 = '\r', v4 = 14, v5 = 15L, v6 = 16.0, v7 = 17.0, v8 = false), v2 = 2, v3 = '\03', v4 = 4, v5 = 5L, v6 = 6.0, v7 = 7.0, v8 = false))
scala>
diff --git a/test/files/run/reflection-java-annotations.jar.desired.sha1 b/test/files/run/reflection-java-annotations.jar.desired.sha1 index 430e7626e6..efcb46fac8 100644 --- a/test/files/run/reflection-java-annotations.jar.desired.sha1 +++ b/test/files/run/reflection-java-annotations.jar.desired.sha1 @@ -1 +1 @@ -c35876a529c6be33bdda7b3f48ac8ae800d2f36a ?reflection-java-annotations.jar +0b8a905f1904eb606baf8a8f25a3a0d9ba46837a ?reflection-java-annotations.jar |