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 6920028e28..1e0d20da1b 100755 --- a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala +++ b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala @@ -278,6 +278,7 @@ trait JavaParsers extends JavaScanners { def typ(): Tree = optArrayBrackets { + if (in.token == FINAL) in.nextToken if (in.token == IDENTIFIER) { var t = typeArgs(atPos(in.currentPos)(Ident(ident()))) while (in.token == DOT) { @@ -616,7 +617,7 @@ trait JavaParsers extends JavaScanners { def makeCompanionObject(cdef: ClassDef, statics: List[Tree]): Tree = atPos(cdef.pos) { ModuleDef(cdef.mods & (Flags.AccessFlags | Flags.JAVA), cdef.name.toTermName, - makeTemplate(List(javaLangObject()), statics)) + makeTemplate(List(), statics)) } def importCompanionObject(cdef: ClassDef): Tree = |