Skip to content

Commit 028d8a2

Browse files
nicolasstuckinicolasstucki
committed
WIP Expand macros in typer
1 parent d3f94cd commit 028d8a2

File tree

22 files changed

+228
-77
lines changed

22 files changed

+228
-77
lines changed

‎compiler/src/dotty/tools/dotc/core/quoted/PickledQuotes.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ object PickledQuotes {
145145
case Block(stats, expr) =>
146146
seq(stats, rec(expr)).withSpan(fn.span)
147147
case _ =>
148-
fn.select(nme.apply).appliedToArgs(argRefs())
148+
fn.select(nme.apply).appliedToArgs(argRefs()).withSpan(fn.span)
149149
}
150150
Block(argVals, rec(fn))
151151
}

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import dotty.tools.dotc.ast.tpd
88
import dotty.tools.dotc.ast.Trees._
99
import dotty.tools.dotc.core.Contexts._
1010
import dotty.tools.dotc.core.Decorators._
11-
import dotty.tools.dotc.core.Flags._
11+
import dotty.tools.dotc.core.Flags.{Method => MethodFlag, _}
1212
import dotty.tools.dotc.core.NameKinds.FlatName
1313
import dotty.tools.dotc.core.Names.{Name, TermName}
1414
import dotty.tools.dotc.core.StdNames._
@@ -95,7 +95,7 @@ object Splicer {
9595
}
9696

9797
protected def interpretQuote(tree: Tree)(implicit env: Env): Object =
98-
new scala.quoted.Exprs.TastyTreeExpr(tree)
98+
new scala.quoted.Exprs.TastyTreeExpr(Inlined(EmptyTree, Nil, tree).withSpan(tree.span))
9999

100100
protected def interpretTypeQuote(tree: Tree)(implicit env: Env): Object =
101101
new scala.quoted.Types.TreeType(tree)
@@ -312,7 +312,13 @@ object Splicer {
312312

313313
protected final def interpretTree(tree: Tree)(implicit env: Env): Result = tree match {
314314
case Apply(TypeApply(fn, _), quoted :: Nil) if fn.symbol == defn.QuotedExpr_apply =>
315-
interpretQuote(quoted)
315+
val quoted1 = quoted match {
316+
case quoted: Ident if quoted.symbol.is(InlineProxy) && quoted.symbol.is(MethodFlag) => // inline proxy for by-name parameter
317+
// TODO stop generating inline proxies for by-name parameter and remove this special case
318+
quoted.symbol.defTree.asInstanceOf[DefDef].rhs
319+
case _ => quoted
320+
}
321+
interpretQuote(quoted1)
316322

317323
case TypeApply(fn, quoted :: Nil) if fn.symbol == defn.QuotedType_apply =>
318324
interpretTypeQuote(quoted)
@@ -336,6 +342,8 @@ object Splicer {
336342
interpretStaticMethodCall(module, fn.symbol, args.map(arg => interpretTree(arg)))
337343
} else if (env.contains(fn.name)) {
338344
env(fn.name)
345+
} else if (tree.symbol.is(InlineProxy)) {
346+
interpretTree(tree.symbol.defTree.asInstanceOf[ValOrDefDef].rhs)
339347
} else {
340348
unexpectedTree(tree)
341349
}

‎compiler/src/dotty/tools/dotc/transform/Staging.scala‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -122,25 +122,22 @@ object Staging {
122122
if (splice1.isType) splice1
123123
else addSpliceCast(splice1)
124124
}
125-
else if (enclosingInlineds.nonEmpty) { // level 0 in an inlined call
126-
val spliceCtx = ctx.outer // drop the last `inlineContext`
127-
val pos: SourcePosition = spliceCtx.source.atSpan(enclosingInlineds.head.span)
128-
val evaluatedSplice = Splicer.splice(splice.qualifier, pos, macroClassLoader)(spliceCtx).withSpan(splice.span)
129-
if (ctx.reporter.hasErrors) splice else transform(evaluatedSplice)
130-
}
131-
else if (!ctx.owner.isInlineMethod) { // level 0 outside an inline method
132-
ctx.error(i"splice outside quotes or inline method", splice.sourcePos)
133-
splice
134-
}
135-
else if (Splicer.canBeSpliced(splice.qualifier)) { // level 0 inside an inline definition
136-
transform(splice.qualifier)(spliceContext) // Just check PCP
137-
splice
138-
}
139-
else { // level 0 inside an inline definition
140-
ctx.error(
141-
"Malformed macro call. The contents of the ~ must call a static method and arguments must be quoted or inline.",
142-
splice.sourcePos)
143-
splice
125+
else {
126+
assert(!enclosingInlineds.nonEmpty, "unexpanded macro")
127+
if (!ctx.owner.isInlineMethod) { // level 0 outside an inline method
128+
ctx.error(i"splice outside quotes or inline method", splice.sourcePos)
129+
splice
130+
}
131+
else if (Splicer.canBeSpliced(splice.qualifier)) { // level 0 inside an inline definition
132+
transform(splice.qualifier)(spliceContext) // Just check PCP
133+
splice
134+
}
135+
else { // level 0 inside an inline definition
136+
ctx.error(
137+
"Malformed macro call. The contents of the ~ must call a static method and arguments must be quoted or inline.",
138+
splice.sourcePos)
139+
splice
140+
}
144141
}
145142
}
146143

‎compiler/src/dotty/tools/dotc/typer/EtaExpansion.scala‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ abstract class Lifter {
4747
var liftedType = expr.tpe.widen
4848
if (liftedFlags.is(Method)) liftedType = ExprType(liftedType)
4949
val lifted = ctx.newSymbol(ctx.owner, name, liftedFlags | Synthetic, liftedType, coord = spanCoord(expr.span))
50-
defs += liftedDef(lifted, expr).withSpan(expr.span)
50+
val ddef = liftedDef(lifted, expr).withSpan(expr.span)
51+
lifted.defTree = ddef
52+
defs += ddef
5153
ref(lifted.termRef).withSpan(expr.span.focus)
5254
}
5355

‎compiler/src/dotty/tools/dotc/typer/Inliner.scala‎

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package dotty.tools
22
package dotc
33
package typer
44

5-
import ast._
5+
import ast.{TreeInfo, tpd, _}
66
import Trees._
77
import core._
88
import Flags._
@@ -25,6 +25,7 @@ import dotty.tools.dotc.util.{SimpleIdentityMap, SimpleIdentitySet, SourceFile,
2525
import collection.mutable
2626
import reporting.trace
2727
import util.Spans.Span
28+
import dotty.tools.dotc.transform.{Splicer, TreeMapWithStages}
2829

2930
object Inliner {
3031
import tpd._
@@ -104,7 +105,7 @@ object Inliner {
104105
else if (enclosingInlineds.length < ctx.settings.XmaxInlines.value) {
105106
val body = bodyToInline(tree.symbol) // can typecheck the tree and thereby produce errors
106107
if (ctx.reporter.hasErrors) tree
107-
else new Inliner(tree, body).inlined(pt)
108+
else new Inliner(tree, body).inlined(pt, tree.sourcePos)
108109
}
109110
else
110111
errorTree(
@@ -381,7 +382,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
381382
}
382383

383384
/** The Inlined node representing the inlined call */
384-
def inlined(pt: Type): Tree = {
385+
def inlined(pt: Type, sourcePos: SourcePosition): Tree = {
385386

386387
if (callTypeArgs.length == 1)
387388
if (inlinedMethod == defn.Compiletime_constValue) {
@@ -487,10 +488,21 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
487488
trace(i"inlining $call", inlining, show = true) {
488489

489490
// The normalized bindings collected in `bindingsBuf`
490-
bindingsBuf.transform(reducer.normalizeBinding(_)(inlineCtx))
491+
bindingsBuf.transform { binding =>
492+
val transformedBinding = reducer.normalizeBinding(binding)(inlineCtx)
493+
// Set trees to symbols allow macros to see the definition tree.
494+
// This is used by `underlyingArgument`.
495+
transformedBinding.symbol.defTree = transformedBinding
496+
transformedBinding
497+
}
498+
499+
// Evaluate the top level ~ if it is a macro
500+
val expansion0 =
501+
if (call.symbol.is(Macro) && TreeMapWithStages.level == 0) expandMacro(expansion, sourcePos)
502+
else expansion
491503

492504
// Run a typing pass over the inlined tree. See InlineTyper for details.
493-
val expansion1 = inlineTyper.typed(expansion, pt)(inlineCtx)
505+
val expansion1 = inlineTyper.typed(expansion0, pt)(inlineCtx)
494506

495507
if (ctx.settings.verbose.value) {
496508
inlining.println(i"to inline = $rhsToInline")
@@ -509,6 +521,23 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
509521
}
510522
}
511523

524+
private def expandMacro(expansion: Tree, pos: SourcePosition) = {
525+
// TODO cache macro classloader
526+
val urls = ctx.settings.classpath.value.split(java.io.File.pathSeparatorChar).map(cp => java.nio.file.Paths.get(cp).toUri.toURL)
527+
val macroClassLoader = new java.net.URLClassLoader(urls, getClass.getClassLoader)
528+
529+
new TreeMap() {
530+
override def transform(tree1: tpd.Tree)(implicit ctx: Context): tpd.Tree = tree1 match {
531+
case Spliced(splicedBody) =>
532+
val evaluatedSplice = Splicer.splice(splicedBody, pos, macroClassLoader).withSpan(tree1.span)
533+
if (ctx.reporter.hasErrors) EmptyTree
534+
else evaluatedSplice
535+
case _ =>
536+
super.transform(tree1)
537+
}
538+
}.transform(expansion)
539+
}
540+
512541
/** A utility object offering methods for rewriting inlined code */
513542
object reducer {
514543

‎compiler/src/dotty/tools/dotc/typer/Typer.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1562,7 +1562,7 @@ class Typer extends Namer
15621562
import TreeMapWithStages._
15631563
var isMacro = false
15641564
new TreeMapWithStages(freshStagingContext){
1565-
override protected def splice(splice: tpd.Select)(implicit ctx: Context): tpd.Tree = {
1565+
override protected def transformSplice(splice: tpd.Select)(implicit ctx: Context): tpd.Tree = {
15661566
isMacro = true
15671567
splice
15681568
}

‎tests/neg/quote-whitebox/Macro_1.scala‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import scala.quoted._
2+
3+
object Macros {
4+
inline def defaultOf(inline str: String) <: Any = ~defaultOfImpl(str)
5+
def defaultOfImpl(str: String): Expr[Any] = str match {
6+
case "int" => '(1)
7+
case "string" => '("a")
8+
}
9+
}

‎tests/neg/quote-whitebox/Test_2.scala‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import Macros._
2+
3+
object Test {
4+
def main(args: Array[String]): Unit = {
5+
val a: String = defaultOf("int") // error
6+
val b: Int = defaultOf("string") // error
7+
}
8+
}

‎tests/neg/tasty-macro-assert/quoted_1.scala‎ renamed to ‎tests/neg/tasty-macro-assert-1/quoted_1.scala‎

File renamed without changes.

‎tests/neg/tasty-macro-assert-1/quoted_2.scala‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
import Asserts._
3+
4+
object Test {
5+
def main(args: Array[String]): Unit = {
6+
macroAssert(true === "cde")
7+
macroAssert("acb" === "cde") // error
8+
}
9+
10+
}

0 commit comments

Comments
 (0)