Merge pull request #5329 from dotty-staging/fix-ift-build

odersky · web-flow · commit 6fcb8b80f6b1 · 2018-10-26T15:22:37.000+02:00
Fix build breakage
diff --git a/compiler/src/dotty/tools/dotc/ast/Trees.scala b/compiler/src/dotty/tools/dotc/ast/Trees.scala
@@ -486,8 +486,8 @@ object Trees {
   case class Block[-T >: Untyped] private[ast] (stats: List[Tree[T]], expr: Tree[T])
     extends Tree[T] {
     type ThisTree[-T >: Untyped] = Block[T]
-    override def isTerm: Boolean = expr.isTerm
     override def isType: Boolean = expr.isType
+    override def isTerm: Boolean = !isType // this will classify empty trees as terms, which is necessary
   }
 
   /** if cond then thenp else elsep */

Original file line number	Diff line number	Diff line change
`@@ -486,8 +486,8 @@ object Trees {`
`486`	`486`	`case class Block[-T >: Untyped] private[ast] (stats: List[Tree[T]], expr: Tree[T])`
`487`	`487`	`extends Tree[T] {`
`488`	`488`	`type ThisTree[-T >: Untyped] = Block[T]`
`489`		`- override def isTerm: Boolean = expr.isTerm`
`490`	`489`	`override def isType: Boolean = expr.isType`
	`490`	`+ override def isTerm: Boolean = !isType // this will classify empty trees as terms, which is necessary`
`491`	`491`	`}`
`492`	`492`
`493`	`493`	`/** if cond then thenp else elsep */`