summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-06-14 17:08:11 -0700
committerPaul Phillips <paulp@improving.org>2012-06-14 17:08:11 -0700
commit5a8b937510094d4e92f37dba113c231ec2e69705 (patch)
treefd350b87ab472cdc6009df3cb4b801a12132b578 /src/compiler
parent4c6522bab70ce8588f5688c9b4c01fe3ff8d24fc (diff)
downloadscala-5a8b937510094d4e92f37dba113c231ec2e69705.tar.gz
scala-5a8b937510094d4e92f37dba113c231ec2e69705.tar.bz2
scala-5a8b937510094d4e92f37dba113c231ec2e69705.zip
Fix for java parser edge case.
Empty statements are A-OK. Closes SI-5910. Review by @dragos.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/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 e2203e07b3..3797d32d8b 100644
--- a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala
+++ b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala
@@ -911,7 +911,8 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
buf ++= importDecl()
while (in.token != EOF && in.token != RBRACE) {
while (in.token == SEMI) in.nextToken
- buf ++= typeDecl(modifiers(false))
+ if (in.token != EOF)
+ buf ++= typeDecl(modifiers(false))
}
accept(EOF)
atPos(pos) {