Add a val in Scala 2 macro bundles

nicolasstucki · nicolasstucki · commit 5beb62403607 · 2020-06-02T16:37:52.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -3574,7 +3574,9 @@ class Typer extends Namer
           case Ident(name) => untpd.Ident(name.toTypeName).withSpan(tree.span)
           case Select(qual, name) => untpd.Select(qual, name.toTypeName).withSpan(tree.span)
         val bundle = untpd.Apply(untpd.Select(untpd.New(ref), nme.CONSTRUCTOR), untpd.Literal(Constant(null))).withSpan(call.span)
-        typedExpr(bundle, defn.AnyType)
+        val bundle1 = typedExpr(bundle, defn.AnyType)
+        val bundleVal = SyntheticValDef(NameKinds.UniqueName.fresh("bundle".toTermName), bundle1)
+        tpd.Block(List(bundleVal), tpd.ref(bundleVal.symbol))
       }
     }
     if ctx.phase.isTyper then

Original file line number	Diff line number	Diff line change
`@@ -3574,7 +3574,9 @@ class Typer extends Namer`
`3574`	`3574`	`case Ident(name) => untpd.Ident(name.toTypeName).withSpan(tree.span)`
`3575`	`3575`	`case Select(qual, name) => untpd.Select(qual, name.toTypeName).withSpan(tree.span)`
`3576`	`3576`	`val bundle = untpd.Apply(untpd.Select(untpd.New(ref), nme.CONSTRUCTOR), untpd.Literal(Constant(null))).withSpan(call.span)`
`3577`		`- typedExpr(bundle, defn.AnyType)`
	`3577`	`+ val bundle1 = typedExpr(bundle, defn.AnyType)`
	`3578`	`+ val bundleVal = SyntheticValDef(NameKinds.UniqueName.fresh("bundle".toTermName), bundle1)`
	`3579`	`+ tpd.Block(List(bundleVal), tpd.ref(bundleVal.symbol))`
`3578`	`3580`	`}`
`3579`	`3581`	`}`
`3580`	`3582`	`if ctx.phase.isTyper then`