WIP

Author: nicolasstucki

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

@@ -83,7 +83,7 @@ class ReifyQuotes extends MacroTransformWithImplicits {
     if (ctx.compilationUnit.needsStaging) super.run
 
   protected def newTransformer(implicit ctx: Context): Transformer =
-    new Reifier(inQuote = false, null, new LevelInfo, new Embedded, ctx)
+    new Reifier(null, new LevelInfo, new Embedded, ctx)
 
   private class LevelInfo {
     /** A map from locally defined symbols to the staging levels of their definitions */
@@ -115,14 +115,14 @@ class ReifyQuotes extends MacroTransformWithImplicits {
    *  @param  embedded   a list of embedded quotes (if `inSplice = true`) or splices (if `inQuote = true`
    *  @param  rctx       the contex in the destination lifted lambda
    */
-  private class Reifier(inQuote: Boolean, val outer: Reifier, levels: LevelInfo,
+  private class Reifier(val outer: Reifier, levels: LevelInfo,
                         val embedded: Embedded, val rctx: Context) extends ImplicitsTransformer {
     import levels._
 
     /** A nested reifier for a quote (if `isQuote = true`) or a splice (if not) */
     def nested(isQuote: Boolean)(implicit ctx: Context): Reifier = {
       val nestedEmbedded = if (quotationLevel > 1 || (quotationLevel == 1 && isQuote)) embedded else new Embedded
-      new Reifier(isQuote, this, levels, nestedEmbedded, ctx)
+      new Reifier(this, levels, nestedEmbedded, ctx)
     }
 
     /** We are not in a `~(...)` or a `'(...)` */
@@ -369,7 +369,7 @@ class ReifyQuotes extends MacroTransformWithImplicits {
           // in '{ x } to '{ x$1.unary_~ } and go directly to `x$1`
           capturers(body.symbol)(body)
         case _=>
-          val (body1, splices) = nested(isQuote = true).split(body)(quoteContext)
+          val (body1, splices) = nested(isQuote = true).splitQuote(body)(quoteContext)
           if (quotationLevel == 0 && !ctx.inInlineMethod) {
             val body2 =
               if (body1.isType) body1
@@ -424,7 +424,7 @@ class ReifyQuotes extends MacroTransformWithImplicits {
         body1.select(splice.name)
       }
       else if (quotationLevel == 1) {
-        val (body1, quotes) = nested(isQuote = false).split(splice.qualifier)(spliceContext)
+        val (body1, quotes) = nested(isQuote = false).splitSplice(splice.qualifier)(spliceContext)
         val tpe = outer.embedded.getHoleType(splice)
         val hole = makeHole(body1, quotes, tpe).withSpan(splice.span)
         // We do not place add the inline marker for trees that where lifted as they come from the same file as their
@@ -441,7 +441,7 @@ class ReifyQuotes extends MacroTransformWithImplicits {
       }
       else if (Splicer.canBeSpliced(splice.qualifier)) { // level 0 inside an inline definition
         // TODO remove?
-        nested(isQuote = false).split(splice.qualifier)(spliceContext) // Just check PCP
+        nested(isQuote = false).transform(splice.qualifier)(spliceContext) // Just check PCP
         splice
       }
       else { // level 0 inside an inline definition
@@ -537,8 +537,13 @@ class ReifyQuotes extends MacroTransformWithImplicits {
     /** Transform `tree` and return the resulting tree and all `embedded` quotes
      *  or splices as a pair, after performing the `addTags` transform.
      */
-    private def split(tree: Tree)(implicit ctx: Context): (Tree, List[Tree]) = {
-      val tree1 = if (inQuote) addTags(transform(tree)) else makeLambda(tree)
+    private def splitQuote(tree: Tree)(implicit ctx: Context): (Tree, List[Tree]) = {
+      val tree1 = addTags(transform(tree))
+      (tree1, embedded.getTrees)
+    }
+
+    private def splitSplice(tree: Tree)(implicit ctx: Context): (Tree, List[Tree]) = {
+      val tree1 = makeLambda(tree)
       (tree1, embedded.getTrees)
     }
 
@@ -614,11 +619,6 @@ class ReifyQuotes extends MacroTransformWithImplicits {
                 EmptyTree
             }
           case _ =>
-//            println("------------------------")
-//            println(tree.show)
-//            println(tree)
-//            println()
-//            println()
             markDef(tree)
             checkLevel(mapOverTree(enteredSyms))
         }