diff options
| author | Philipp Haller <hallerp@gmail.com> | 2008-10-31 11:23:01 +0000 |
|---|---|---|
| committer | Philipp Haller <hallerp@gmail.com> | 2008-10-31 11:23:01 +0000 |
| commit | ffe546326a6944d4d2535f05d7c02f5b1daed744 (patch) | |
| tree | 5af91ea5f0ba26e1d94c090954d0e457f920ed77 /src | |
| parent | 81985e49cf9f492a4af6be8ed5c3125ca4861fbe (diff) | |
| download | scala-ffe546326a6944d4d2535f05d7c02f5b1daed744.tar.gz scala-ffe546326a6944d4d2535f05d7c02f5b1daed744.tar.bz2 scala-ffe546326a6944d4d2535f05d7c02f5b1daed744.zip | |
Java parser handles final modifier for types.
Diffstat (limited to 'src')
| -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 = |