diff options
author | James Iry <jamesiry@gmail.com> | 2013-03-22 11:29:16 -0700 |
---|---|---|
committer | James Iry <jamesiry@gmail.com> | 2013-03-22 11:29:16 -0700 |
commit | 62dd51a79ef1b1c240c1eb1e97c330347f842d4c (patch) | |
tree | 5df4821cfbc3705c9f992fba9dab06122a538c37 | |
parent | e5a081cb6a6f5e627765efb188c53f646fbe8ad9 (diff) | |
parent | 50ee635e3c5914f75be57209f7a145fbb3e23d80 (diff) | |
download | scala-62dd51a79ef1b1c240c1eb1e97c330347f842d4c.tar.gz scala-62dd51a79ef1b1c240c1eb1e97c330347f842d4c.tar.bz2 scala-62dd51a79ef1b1c240c1eb1e97c330347f842d4c.zip |
Merge pull request #2274 from vigdorchik/ticket/si-5699
SI-5699 correct java parser for annotation defs.
-rw-r--r-- | src/compiler/scala/tools/nsc/javac/JavaParsers.scala | 8 | ||||
-rwxr-xr-x | test/files/run/t5699.check | 11 | ||||
-rwxr-xr-x | test/files/run/t5699.scala | 24 |
3 files changed, 36 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala index 43a8402fc7..8aa9b81a72 100644 --- a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala +++ b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala @@ -800,13 +800,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners { val pos = in.currentPos val name = identForType() val (statics, body) = typeBody(AT, name) - def getValueMethodType(tree: Tree) = tree match { - case DefDef(_, nme.value, _, _, tpt, _) => Some(tpt.duplicate) - case _ => None - } - var templ = makeTemplate(annotationParents, body) - for (stat <- templ.body; tpt <- getValueMethodType(stat)) - templ = makeTemplate(annotationParents, makeConstructor(List(tpt)) :: templ.body) + val templ = makeTemplate(annotationParents, body) addCompanionObject(statics, atPos(pos) { ClassDef(mods, name, List(), templ) }) diff --git a/test/files/run/t5699.check b/test/files/run/t5699.check new file mode 100755 index 0000000000..df19644ae6 --- /dev/null +++ b/test/files/run/t5699.check @@ -0,0 +1,11 @@ +[[syntax trees at end of parser]] // annodef.java +package <empty> { + object MyAnnotation extends { + def <init>() = _ + }; + class MyAnnotation extends scala.annotation.Annotation with _root_.java.lang.annotation.Annotation with scala.annotation.ClassfileAnnotation { + def <init>() = _; + def value(): String + } +} + diff --git a/test/files/run/t5699.scala b/test/files/run/t5699.scala new file mode 100755 index 0000000000..5cef67e3b1 --- /dev/null +++ b/test/files/run/t5699.scala @@ -0,0 +1,24 @@ +import scala.tools.partest.DirectTest +import scala.tools.nsc.util.BatchSourceFile + +object Test extends DirectTest { + // Java code + override def code = """ + |public @interface MyAnnotation { String value(); } + """.stripMargin + + override def extraSettings: String = "-usejavacp -Ystop-after:typer -Xprint:parser" + + override def show(): Unit = { + // redirect err to out, for logging + val prevErr = System.err + System.setErr(System.out) + compile() + System.setErr(prevErr) + } + + override def newSources(sourceCodes: String*) = { + assert(sourceCodes.size == 1) + List(new BatchSourceFile("annodef.java", sourceCodes(0))) + } +} |