summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2008-08-13 18:35:50 +0000
committerMartin Odersky <odersky@gmail.com>2008-08-13 18:35:50 +0000
commit53bb3acd716f82c308de781f560ab23fb5fd4976 (patch)
tree882bcc1d90888b9b2bd8af2283200299db401d7f
parent63a716747e8821313334a0ef8c383da26210f78d (diff)
downloadscala-53bb3acd716f82c308de781f560ab23fb5fd4976.tar.gz
scala-53bb3acd716f82c308de781f560ab23fb5fd4976.tar.bz2
scala-53bb3acd716f82c308de781f560ab23fb5fd4976.zip
fixed more problems detects by Ilya.
-rwxr-xr-xsrc/compiler/scala/tools/nsc/javac/JavaParsers.scala3
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())