summaryrefslogtreecommitdiff
path: root/test/files/jvm5
diff options
context:
space:
mode:
authorLex Spoon <lex@lexspoon.org>2007-10-10 01:17:21 +0000
committerLex Spoon <lex@lexspoon.org>2007-10-10 01:17:21 +0000
commiteeb6eb3873ca958e8d4ebe070bd8d79dc4819b92 (patch)
tree3c2721f0b98bbb3d25bf911ee878bd96136dd504 /test/files/jvm5
parent07f4b0f82189a78cfb4c7394439dcc46c8a2cad7 (diff)
downloadscala-eeb6eb3873ca958e8d4ebe070bd8d79dc4819b92.tar.gz
scala-eeb6eb3873ca958e8d4ebe070bd8d79dc4819b92.tar.bz2
scala-eeb6eb3873ca958e8d4ebe070bd8d79dc4819b92.zip
Diffstat (limited to 'test/files/jvm5')
-rw-r--r--test/files/jvm5/NestedAnnotations.java25
-rwxr-xr-xtest/files/jvm5/mkAnnotationsJar.sh2
-rw-r--r--test/files/jvm5/t0014.check1
-rw-r--r--test/files/jvm5/t0014.scala5
4 files changed, 32 insertions, 1 deletions
diff --git a/test/files/jvm5/NestedAnnotations.java b/test/files/jvm5/NestedAnnotations.java
new file mode 100644
index 0000000000..8f2327dcce
--- /dev/null
+++ b/test/files/jvm5/NestedAnnotations.java
@@ -0,0 +1,25 @@
+package test;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+public class NestedAnnotations {
+
+ @OuterAnno(inner=@InnerAnno(name="inner"))
+ String field;
+
+ @Target({FIELD})
+ @Retention(RUNTIME)
+ public static @interface InnerAnno {
+ String name();
+ }
+
+ @Target({FIELD})
+ @Retention(RUNTIME)
+ public static @interface OuterAnno {
+ InnerAnno inner();
+ }
+}
diff --git a/test/files/jvm5/mkAnnotationsJar.sh b/test/files/jvm5/mkAnnotationsJar.sh
index 574c39f617..fb9141260a 100755
--- a/test/files/jvm5/mkAnnotationsJar.sh
+++ b/test/files/jvm5/mkAnnotationsJar.sh
@@ -24,6 +24,6 @@ JAR=${JAVA_HOME}/bin/jar
# commands
mkdir -p ${OBJDIR}
-${JAVAC} ${JAVAC_OPTIONS} -d ${OBJDIR} SourceAnnotation.java
+${JAVAC} ${JAVAC_OPTIONS} -d ${OBJDIR} SourceAnnotation.java NestedAnnotations.java
${JAR} cf ../lib/annotations.jar -C ${OBJDIR} .
rm -rf ${OBJDIR}
diff --git a/test/files/jvm5/t0014.check b/test/files/jvm5/t0014.check
new file mode 100644
index 0000000000..bece7db7af
--- /dev/null
+++ b/test/files/jvm5/t0014.check
@@ -0,0 +1 @@
+test.NestedAnnotations
diff --git a/test/files/jvm5/t0014.scala b/test/files/jvm5/t0014.scala
new file mode 100644
index 0000000000..a1948702dc
--- /dev/null
+++ b/test/files/jvm5/t0014.scala
@@ -0,0 +1,5 @@
+object Test {
+ def main(args: Array[String]) {
+ println(classOf[test.NestedAnnotations].getName)
+ }
+}