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 /src | |
| 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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/javac/JavaParsers.scala | 8 |
1 files changed, 1 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) }) |