splice selection into block

bishabosha · bishabosha · commit 73177bcb4191 · 2020-06-03T15:36:00.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -3565,9 +3565,9 @@ class Typer extends Namer
   /** Types the body Scala 2 macro declaration `def f = macro <body>` */
   private def typedScala2MacroBody(call: untpd.Tree)(using Context): Tree =
     // TODO check that call is to a method with valid signature
-    def typedPrefix(tree: untpd.RefTree): Tree = {
+    def typedPrefix(tree: untpd.RefTree)(splice: Context ?=> Tree => Tree)(using Context): Tree = {
       tryAlternatively {
-        typedExpr(tree, defn.AnyType)
+        splice(typedExpr(tree, defn.AnyType))
       } {
         // Try to type as a macro bundle
         val ref = tree match
@@ -3576,19 +3576,23 @@ class Typer extends Namer
         val bundle = untpd.Apply(untpd.Select(untpd.New(ref), nme.CONSTRUCTOR), untpd.Literal(Constant(null))).withSpan(call.span)
         val bundle1 = typedExpr(bundle, defn.AnyType)
         val bundleVal = SyntheticValDef(NameKinds.UniqueName.fresh("bundle".toTermName), bundle1)
-        tpd.Block(List(bundleVal), tpd.ref(bundleVal.symbol))
+        tpd.Block(List(bundleVal), splice(tpd.ref(bundleVal.symbol)))
       }
     }
     if ctx.phase.isTyper then
       call match
         case call: untpd.Ident =>
           typedIdent(call, defn.AnyType)
         case untpd.Select(qual: untpd.RefTree, name) =>
-          val call2 = untpd.Select(untpd.TypedSplice(typedPrefix(qual)), name).withSpan(call.span)
-          typedSelect(call2, defn.AnyType)
+          typedPrefix(qual) { qual =>
+            val call2 = untpd.Select(untpd.TypedSplice(qual), name).withSpan(call.span)
+            typedSelect(call2, defn.AnyType)
+          }
         case untpd.TypeApply(untpd.Select(qual: untpd.RefTree, name), targs) =>
-          val call2= untpd.TypeApply(untpd.Select(untpd.TypedSplice(typedPrefix(qual)), name), targs).withSpan(call.span)
-          typedTypeApply(call2, defn.AnyType)
+          typedPrefix(qual) { qual =>
+            val call2= untpd.TypeApply(untpd.Select(untpd.TypedSplice(qual), name), targs).withSpan(call.span)
+            typedTypeApply(call2, defn.AnyType)
+          }
         case _ =>
           ctx.error("Invalid Scala 2 macro " + call.show, call.sourcePos)
           EmptyTree
