Insert Splicer in ReifyQuote

Author: nicolasstucki

compiler/src/dotty/tools/dotc/interpreter/Interpreter.scala

@@ -5,6 +5,7 @@ import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.ast.Trees._
 import dotty.tools.dotc.core.Constants._
 import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.core.Flags._
 import dotty.tools.dotc.core.Decorators._
 import dotty.tools.dotc.core.Symbols._
 
@@ -79,6 +80,12 @@ class Interpreter(implicit ctx: Context) {
           val method = clazz.getMethod(tree.name.toString)
           method.invoke(null)
 
+        case tree: RefTree if tree.symbol.is(Module) =>
+          ??? // TODO
+
+        case Inlined(_, bindings, expansion) =>
+          // TODO evaluate bindings and add environment
+          interpretTreeImpl(expansion)
         case _ =>
           val msg =
             if (tree.tpe.derivesFrom(defn.QuotedExprClass)) "Quote needs to be explicit or a call to a static method"

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

@@ -328,7 +328,8 @@ class ReifyQuotes extends MacroTransform {
           case Inlined(call, bindings, expansion @ Select(body, name)) if expansion.symbol.isSplice =>
             // To maintain phase consistency, convert inlined expressions of the form
             // `{ bindings; ~expansion }` to `~{ bindings; expansion }`
-            transform(cpy.Select(expansion)(cpy.Inlined(tree)(call, bindings, body), name))
+            if (level == 0) transform(Splicer.splice(cpy.Inlined(tree)(call, bindings, body)))
+            else transform(cpy.Select(expansion)(cpy.Inlined(tree)(call, bindings, body), name))
           case _: Import =>
             tree
           case tree: DefDef if tree.symbol.is(Macro) && level == 0 =>

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

@@ -22,7 +22,7 @@ object Splicer {
     case TypeApply(quote, quoted :: Nil) if quote.symbol == defn.typeQuoteMethod => quoted
     case tree: RefTree => reflectiveSplice(tree)
     case tree: Apply => reflectiveSplice(tree)
-    case Inlined(_, _, expansion) => splice(expansion)
+    case tree: Inlined => 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/Typer.scala

@@ -1074,6 +1074,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
   }
 
   def typedQuote(tree: untpd.Quote, pt: Type)(implicit ctx: Context): Tree = track("typedQuote") {
+    ctx.compilationUnit.containsQuotesOrSplices = true
     val untpd.Quote(body) = tree
     val isType = body.isType
     val resultClass = if (isType) defn.QuotedTypeClass else defn.QuotedExprClass

tests/run/quote-and-splice.check

@@ -0,0 +1 @@
+3

tests/run/quote-and-splice/Test_2.scala

@@ -2,8 +2,7 @@ object Test {
   import Macros._
 
   def main(args: Array[String]): Unit = {
-    // FIXME
-    // println(macro1)
+    println(macro1)
   }
 
 }