Make Apply a Term- or Type-Tree

odersky · odersky · commit 6be4781d033b · 2018-06-29T18:04:23.000+02:00
Depending on what it's function part is.
diff --git a/compiler/src/dotty/tools/dotc/ast/Trees.scala b/compiler/src/dotty/tools/dotc/ast/Trees.scala
@@ -434,11 +434,13 @@ object Trees {
     def forwardTo = qual
   }
 
-  abstract class GenericApply[-T >: Untyped] extends ProxyTree[T] with TermTree[T] {
+  abstract class GenericApply[-T >: Untyped] extends ProxyTree[T] {
     type ThisTree[-T >: Untyped] <: GenericApply[T]
     val fun: Tree[T]
     val args: List[Tree[T]]
     def forwardTo = fun
+    override def isTerm = fun.isTerm
+    override def isType = fun.isType
   }
 
   /** fun(args) */

Original file line number	Diff line number	Diff line change
`@@ -434,11 +434,13 @@ object Trees {`
`434`	`434`	`def forwardTo = qual`
`435`	`435`	`}`
`436`	`436`
`437`		`- abstract class GenericApply[-T >: Untyped] extends ProxyTree[T] with TermTree[T] {`
	`437`	`+ abstract class GenericApply[-T >: Untyped] extends ProxyTree[T] {`
`438`	`438`	`type ThisTree[-T >: Untyped] <: GenericApply[T]`
`439`	`439`	`val fun: Tree[T]`
`440`	`440`	`val args: List[Tree[T]]`
`441`	`441`	`def forwardTo = fun`
	`442`	`+ override def isTerm = fun.isTerm`
	`443`	`+ override def isType = fun.isType`
`442`	`444`	`}`
`443`	`445`
`444`	`446`	`/** fun(args) */`