WIP

Author: nicolasstucki

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

@@ -411,7 +411,8 @@ class ReifyQuotes extends MacroTransformWithImplicits {
             (tree: RefTree) => {
               def newCapture = {
                 val argTpe =
-                  if (tree.isTerm) defn.QuotedExprType.appliedTo(tree.tpe.widen)
+                  if (tree.symbol.is(Inline)) tree.tpe.widen
+                  else if (tree.isTerm) defn.QuotedExprType.appliedTo(tree.tpe.widen)
                   else defn.QuotedTypeType.appliedTo(defn.AnyType)
                 val selectArg = arg.select(nme.apply).appliedTo(Literal(Constant(i))).asInstance(argTpe)
                 val capturedArg = SyntheticValDef(UniqueName.fresh(tree.name.toTermName).toTermName, selectArg)
@@ -445,8 +446,9 @@ class ReifyQuotes extends MacroTransformWithImplicits {
     /** Returns true if this tree will be captured by `makeLambda` */
     private def isCaptured(tree: RefTree, level: Int)(implicit ctx: Context): Boolean = {
       // Check phase consistency and presence of capturer
-      level == 1 && !tree.symbol.is(Inline) && levelOf.get(tree.symbol).contains(1) &&
-      capturers.contains(tree.symbol)
+      ( (level == 1 && levelOf.get(tree.symbol).contains(1)) ||
+        (level == 0 && tree.symbol.is(Inline))
+      ) && capturers.contains(tree.symbol)
     }
 
     /** Transform `tree` and return the resulting tree and all `embedded` quotes
@@ -484,8 +486,15 @@ 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)
-            splice(capturer(tree).select(if (tree.isTerm) nme.UNARY_~ else tpnme.UNARY_~))
+            if (tree.symbol.is(Inline)) capturer(tree)
+            else splice(capturer(tree).select(if (tree.isTerm) nme.UNARY_~ else tpnme.UNARY_~))
           case Block(stats, _) =>
             val last = enteredSyms
             stats.foreach(markDef)
@@ -509,7 +518,17 @@ class ReifyQuotes extends MacroTransformWithImplicits {
             tree
           case tree: DefDef if tree.symbol.is(Macro) && level == 0 =>
             markDef(tree)
-            nested(isQuote = true).transform(tree)
+            val reifier = nested(isQuote = true)
+            val b = reifier.transform(tree)
+            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)
           case _ =>

tests/run/quote-simple-macro.check

@@ -0,0 +1,6 @@
+import scala.quoted._
+
+object Macros {
+  inline def foo(inline i: Int, dummy: Int, j: Int): Int = ~bar(i, '(j))
+  def bar(x: Int, y: Expr[Int]): Expr[Int] = '{ ~x.toExpr + ~y }
+}

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

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