aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/parsing/Parsers.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2015-12-19 18:15:21 +0100
committerMartin Odersky <odersky@gmail.com>2015-12-19 18:15:38 +0100
commit6c335b750fb65b1a605b9c8ad3a459113ffdbabf (patch)
tree3a3bf2f9a43f27bcf759ac225ada23582d092a7f /src/dotty/tools/dotc/parsing/Parsers.scala
parentec54cd557f3a9f52db9e280043a5b9657ca6fc30 (diff)
downloaddotty-6c335b750fb65b1a605b9c8ad3a459113ffdbabf.tar.gz
dotty-6c335b750fb65b1a605b9c8ad3a459113ffdbabf.tar.bz2
dotty-6c335b750fb65b1a605b9c8ad3a459113ffdbabf.zip
Fix parsing of blocks that end in an import
Diffstat (limited to 'src/dotty/tools/dotc/parsing/Parsers.scala')
-rw-r--r--src/dotty/tools/dotc/parsing/Parsers.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/parsing/Parsers.scala b/src/dotty/tools/dotc/parsing/Parsers.scala
index 71a03b9e2..d59e087cb 100644
--- a/src/dotty/tools/dotc/parsing/Parsers.scala
+++ b/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -1156,7 +1156,8 @@ object Parsers {
*/
def block(): Tree = {
val stats = blockStatSeq()
- if (stats.nonEmpty && !stats.last.isDef) Block(stats.init, stats.last)
+ def isExpr(stat: Tree) = !(stat.isDef || stat.isInstanceOf[Import])
+ if (stats.nonEmpty && isExpr(stats.last)) Block(stats.init, stats.last)
else Block(stats, EmptyTree)
}