diff options
author | Kato Kazuyoshi <kato.kazuyoshi@gmail.com> | 2011-06-18 14:21:47 +0000 |
---|---|---|
committer | Kato Kazuyoshi <kato.kazuyoshi@gmail.com> | 2011-06-18 14:21:47 +0000 |
commit | 60c8697f0c39f71c7e735ad02f483cd8779c3567 (patch) | |
tree | 02dc4f35d0ab8b443e2d094e6f3de5799a5c1a92 /src/compiler/scala/tools/nsc/javac | |
parent | 8e10b0579b15ef85ca577ae941adc941dfb62079 (diff) | |
download | scala-60c8697f0c39f71c7e735ad02f483cd8779c3567.tar.gz scala-60c8697f0c39f71c7e735ad02f483cd8779c3567.tar.bz2 scala-60c8697f0c39f71c7e735ad02f483cd8779c3567.zip |
Fixes #4490 and #4467.
Diffstat (limited to 'src/compiler/scala/tools/nsc/javac')
-rw-r--r-- | src/compiler/scala/tools/nsc/javac/JavaParsers.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala index e726c21631..1ea0255515 100644 --- a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala +++ b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala @@ -340,7 +340,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners { List() // don't pass on annotations for now } - /** Annotation ::= TypeName [`(' AnnotationArgument {`,' AnnotationArgument} `)'] + /** Annotation ::= TypeName [`(` AnnotationArgument {`,` AnnotationArgument} `)`] */ def annotation() { val pos = in.currentPos @@ -577,7 +577,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners { * This one is tricky because a comma might also appear in an * initializer. Since we don't parse initializers we don't know * what the comma signifies. - * We solve this with a second list buffer `maybe' which contains + * We solve this with a second list buffer `maybe` which contains * potential variable definitions. * Once we have reached the end of the statement, we know whether * these potential definitions are real or not. @@ -589,7 +589,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners { in.nextToken if (in.token == IDENTIFIER) { // if there's an ident after the comma ... val name = ident() - if (in.token == ASSIGN || in.token == SEMI) { // ... followed by a `=' or `;', we know it's a real variable definition + if (in.token == ASSIGN || in.token == SEMI) { // ... followed by a `=` or `;`, we know it's a real variable definition buf ++= maybe buf += varDecl(in.currentPos, mods, tpt.duplicate, name) maybe.clear() |