WIP

Author: nicolasstucki

compiler/src/dotty/tools/dotc/transform/PostTyper.scala

@@ -231,7 +231,9 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
           //     be duplicated
           //  2. To enable correct pickling (calls can share symbols with the inlined code, which
           //     would trigger an assertion when pickling).
-          val callTrace = Ident(call.symbol.topLevelClass.typeRef).withPos(call.pos)
+          val callTrace =
+            if (call.symbol.is(Macro)) call
+            else Ident(call.symbol.topLevelClass.typeRef).withPos(call.pos)
           cpy.Inlined(tree)(callTrace, transformSub(bindings), transform(expansion))
         case tree: Template =>
           withNoCheckNews(tree.parents.flatMap(newPart)) {

compiler/src/dotty/tools/dotc/transform/ReifyQuotes.scala

@@ -2,7 +2,12 @@ package dotty.tools.dotc
 package transform
 
 import core._
-import Decorators._, Flags._, Types._, Contexts._, Symbols._, Constants._
+import Decorators._
+import Flags._
+import Types._
+import Contexts._
+import Symbols._
+import Constants._
 import Flags._
 import ast.Trees._
 import ast.{TreeTypeMap, untpd}
@@ -13,6 +18,7 @@ import MegaPhase.MiniPhase
 import SymUtils._
 import NameKinds._
 import dotty.tools.dotc.ast.tpd.Tree
+import dotty.tools.dotc.core.DenotTransformers.InfoTransformer
 import typer.Implicits.SearchFailureType
 
 import scala.collection.mutable
@@ -57,7 +63,7 @@ import dotty.tools.dotc.core.quoted._
  *    ```
  *  and then performs the same transformation on `'{ ... x1$1.unary_~ ... x2$1.unary_~ ...}`.
  */
-class ReifyQuotes extends MacroTransformWithImplicits {
+class ReifyQuotes extends MacroTransformWithImplicits with InfoTransformer {
   import ast.tpd._
 
   override def phaseName: String = "reifyQuotes"
@@ -493,12 +499,6 @@ class ReifyQuotes extends MacroTransformWithImplicits {
           case tree: Select if tree.symbol.isSplice =>
             splice(tree)
           case tree: RefTree if isCaptured(tree, level) =>
-            println("================")
-            println(tree.show)
-            println(tree)
-            println()
-            println()
-            println()
             val capturer = capturers(tree.symbol)
             if (tree.symbol.is(Inline)) capturer(tree)
             else splice(capturer(tree).select(if (tree.isTerm) nme.UNARY_~ else tpnme.UNARY_~))
@@ -514,7 +514,20 @@ class ReifyQuotes extends MacroTransformWithImplicits {
             }
 
             val tree1 =
-              if (level == 0) cpy.Inlined(tree)(call, stagedBindings, Splicer.splice(seq(splicedBindings, body).withPos(tree.pos)))
+              if (level == 0) {
+                println("========================")
+                println(tree.show)
+                println()
+                println(call.show)
+                println(call)
+                println()
+                println()
+                println()
+                println()
+                println()
+
+                cpy.Inlined(tree)(call, stagedBindings, Splicer.splice(seq(splicedBindings, body).withPos(tree.pos)))
+              }
               else seq(stagedBindings, cpy.Select(expansion)(cpy.Inlined(tree)(call, splicedBindings, body), name))
             val tree2 = transform(tree1)
 
@@ -526,18 +539,10 @@ class ReifyQuotes extends MacroTransformWithImplicits {
           case tree: DefDef if tree.symbol.is(Macro) && level == 0 =>
             markDef(tree)
             val reifier = nested(isQuote = true)
-            val b = reifier.transform(tree)
+            reifier.transform(tree) // Ignore output, we only need the its embedding
             val macroLambda = reifier.embedded.head
-            println(b.show)
-            println()
-            println()
-            println(macroLambda.show)
-            println()
-            println()
-            println()
-            println()
-              // check macro code as it if appeared in a quoted context
-            cpy.DefDef(tree)(rhs = EmptyTree)
+            // replace macro code by lambda used to evaluate the macro expansion
+            cpy.DefDef(tree)(tpt = TypeTree(defn.ObjectType), rhs = macroLambda)
           case _ =>
             markDef(tree)
             checkLevel(mapOverTree(enteredSyms))
@@ -564,6 +569,22 @@ class ReifyQuotes extends MacroTransformWithImplicits {
       }
     }
   }
+
+  def transformInfo(tp: Type, sym: Symbol)(implicit ctx: Context): Type = {
+    /** Transforms the return type
+     *    inline def foo(...): X = ~(...)
+     *  to
+     *    inline def foo(...): Object = (args: Seq[Any]) => ...
+     */
+    def transform(tp: Type): Type = tp match {
+      case tp: PolyType => PolyType(tp.paramNames, tp.paramInfos, transform(tp.resType))
+      case tp: MethodType => MethodType(tp.paramNames, tp.paramInfos, transform(tp.resType))
+      case _ => defn.ObjectType
+    }
+    transform(tp)
+  }
+
+  override protected def mayChange(sym: Symbol)(implicit ctx: Context) = sym.is(Macro)
 }
 
 object ReifyQuotes {

compiler/src/dotty/tools/dotc/transform/Splicer.scala

@@ -21,7 +21,13 @@ object Splicer {
    */
   def splice(tree: Tree)(implicit ctx: Context): Tree = tree match {
     case Quoted(quotedTree) => quotedTree
-    case _ => reflectiveSplice(tree)
+    case _ =>
+      println()
+      println(tree.show)
+      println()
+      println()
+      println()
+      reflectiveSplice(tree)
   }
 
   /** Splice the Tree for a Quoted expression which is constructed via a reflective call to the given method */

compiler/src/dotty/tools/dotc/typer/RefChecks.scala

@@ -947,7 +947,7 @@ class RefChecks extends MiniPhase { thisPhase =>
 
   override def transformDefDef(tree: DefDef)(implicit ctx: Context) = {
     checkDeprecatedOvers(tree)
-    if (tree.symbol is Macro) EmptyTree else tree
+    tree
   }
 
   override def transformTemplate(tree: Template)(implicit ctx: Context) = try {

tests/run/quote-simple-macro/quoted_2.scala

@@ -3,7 +3,7 @@ import Macros._
 
 object Test {
   def main(args: Array[String]): Unit = {
-    val x = 2
-    println(foo(1, x))
+    def x = 2
+    println(foo(1, 2, x))
   }
 }