Merge pull request #6180 from dotty-staging/refactor-map-underlying

Refactor MapUnderlying and add docs

Author: nicolasstucki

compiler/src/dotty/tools/dotc/ast/tpd.scala

@@ -971,7 +971,10 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
     /** Replace Inlined nodes and InlineProxy references to underlying arguments */
     def underlyingArgument(implicit ctx: Context): Tree = {
       val mapToUnderlying = new MapToUnderlying {
-        override def skipLocal(sym: Symbol): Boolean =
+        /** Should get the rhs of this binding
+         *  Returns true if the symbol is a val or def generated by eta-expansion/inline
+         */
+        override protected def skipLocal(sym: Symbol): Boolean =
           sym.is(InlineProxy) || sym.is(Synthetic)
       }
       mapToUnderlying.transform(tree)
@@ -1018,17 +1021,28 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
    */
   class MapToUnderlying extends TreeMap {
     override def transform(tree: Tree)(implicit ctx: Context): Tree = tree match {
-      case tree: Ident if tree.symbol.exists && !tree.symbol.owner.isClass && !tree.symbol.isAnonymousFunction && skipLocal(tree.symbol) =>
+      case tree: Ident if isBinding(tree.symbol) && skipLocal(tree.symbol) =>
         tree.symbol.defTree match {
-          case defTree: ValOrDefDef if !defTree.rhs.isEmpty => transform(defTree.rhs)
+          case defTree: ValOrDefDef =>
+            val rhs = defTree.rhs
+            assert(!rhs.isEmpty)
+            transform(rhs)
           case _ => tree
         }
       case Inlined(_, _, arg) => transform(arg)
       case Block(Nil, arg) => transform(arg)
       case NamedArg(_, arg) => transform(arg)
       case tree => super.transform(tree)
     }
-    def skipLocal(sym: Symbol): Boolean = true
+
+    /** Should get the rhs of this binding */
+    protected def skipLocal(sym: Symbol): Boolean = true
+
+    /** Is this a symbol that of a local val or parameterless def for which we could get the rhs */
+    private def isBinding(sym: Symbol)(implicit ctx: Context): Boolean = {
+      sym.isTerm && !sym.is(Param) && !sym.owner.isClass &&
+      !(sym.is(Method) && sym.info.isInstanceOf[MethodOrPoly]) // if is a method it is parameterless
+    }
   }
 
   implicit class ListOfTreeDecorator(val xs: List[tpd.Tree]) extends AnyVal {

tests/run/tasty-argument-tree-1.check

@@ -17,6 +17,15 @@ tree deref. vals: Term.Ident("a")
 tree: Term.Inlined(None, Nil, Term.Ident("x"))
 tree deref. vals: Term.Ident("b")
 
+tree: Term.Inlined(None, Nil, Term.Ident("x"))
+tree deref. vals: Term.Apply(Term.Ident("d2"), Nil)
+
+tree: Term.Inlined(None, Nil, Term.Ident("x"))
+tree deref. vals: Term.Apply(Term.Ident("d3"), List(Term.Literal(Constant.Int(3))))
+
+tree: Term.Inlined(None, Nil, Term.Ident("x"))
+tree deref. vals: Term.TypeApply(Term.Ident("d4"), List(TypeTree.Ident("Int")))
+
 tree: Term.Inlined(None, Nil, Term.Ident("vv"))
 tree deref. vals: Term.Literal(Constant.Int(1))
 

tests/run/tasty-argument-tree-1/quoted_2.scala

@@ -9,12 +9,18 @@ object Test {
     val v: Int = 1
     def d: Int = 2
     lazy val l: Int = 3
+    def d2(): Int = 2
+    def d3(a: Int): Int = a
+    def d4[T]: Int = 2
     inspect(3)
     inspect(v)
     inspect(d)
     inspect(l)
     inspect(a)
     inspect(b)
+    inspect(d2())
+    inspect(d3(3))
+    inspect(d4[Int])
 
     val vv = v
     def dv = v