diff options
| -rwxr-xr-x | src/compiler/scala/tools/nsc/javac/JavaParsers.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala index 89ddcefadf..52c1cacb29 100755 --- a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala +++ b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala @@ -345,6 +345,7 @@ trait JavaParsers extends JavaScanners { val pos = in.currentPos var t = typ() if (in.token == LPAREN) { skipAhead(); accept(RPAREN) } + else if (in.token == LBRACE) { skipAhead(); accept(RBRACE) } } /* def annotationArg() = { @@ -468,7 +469,7 @@ trait JavaParsers extends JavaScanners { if (in.token == DOTDOTDOT) { in.nextToken t = atPos(t.pos) { - AppliedTypeTree(TypeTree(RepeatedParamClass.typeConstructor), List(t)) + AppliedTypeTree(scalaDot(nme.REPEATED_PARAM_CLASS_NAME.toTypeName), List(t)) } } varDecl(in.currentPos, Modifiers(Flags.JAVA | Flags.PARAM), t, ident()) |