diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-06-19 04:25:19 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-06-19 04:25:19 -0700 |
| commit | 83f97e9b4733978679f779e11c34fd5d343e1bf4 (patch) | |
| tree | 54a89d3632ce4979f3fa1b4fa01fa6fc31d69255 | |
| parent | 8d9e8a05ab327039cb65a957ab7f3372aac88f34 (diff) | |
| parent | 5a8b937510094d4e92f37dba113c231ec2e69705 (diff) | |
| download | scala-83f97e9b4733978679f779e11c34fd5d343e1bf4.tar.gz scala-83f97e9b4733978679f779e11c34fd5d343e1bf4.tar.bz2 scala-83f97e9b4733978679f779e11c34fd5d343e1bf4.zip | |
Merge pull request #723 from paulp/topic/5910
Fix for java parser edge case.
| -rw-r--r-- | src/compiler/scala/tools/nsc/javac/JavaParsers.scala | 3 | ||||
| -rw-r--r-- | test/files/pos/t5910.java | 2 |
2 files changed, 4 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) { diff --git a/test/files/pos/t5910.java b/test/files/pos/t5910.java new file mode 100644 index 0000000000..e007a1fbb5 --- /dev/null +++ b/test/files/pos/t5910.java @@ -0,0 +1,2 @@ +class Foo { +};;;;;;;
\ No newline at end of file |