Skip to content

Commit 6821302

Browse files
nicolasstuckinicolasstucki
committed
Add deconstructor for quotes containing constants
1 parent 5718503 commit 6821302

File tree

11 files changed

+141
-36
lines changed

11 files changed

+141
-36
lines changed

‎compiler/src/dotty/tools/dotc/quoted/ExprDecompiler.scala‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
package dotty.tools.dotc.quoted
22

3-
import java.io.PrintStream
4-
3+
import dotty.tools.dotc.ast.tpd
4+
import dotty.tools.dotc.core.Contexts.Context
55
import dotty.tools.dotc.core.Phases.Phase
66

7-
/** Compiler that takes the contents of a quoted expression `expr` and produces outputs
8-
* the pretty printed code.
9-
*/
10-
class ExprDecompiler(out: PrintStream) extends ExprCompiler(null) {
7+
/** Compiler that takes the contents of a quoted expression `expr` and outputs it's tree. */
8+
class ExprDecompiler(output: tpd.Tree => Context => Unit) extends ExprCompiler(null) {
119
override def phases: List[List[Phase]] = List(
1210
List(new ExprFrontend(putInClass = false)), // Create class from Expr
13-
List(new QuotePrinter(out)) // Print all loaded classes
11+
List(new QuoteTreeOutput(output))
1412
)
1513
}

‎compiler/src/dotty/tools/dotc/quoted/QuoteDriver.scala‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
package dotty.tools.dotc.quoted
22

3+
import dotty.tools.dotc.ast.tpd
34
import dotty.tools.dotc.Driver
45
import dotty.tools.dotc.core.Contexts.{Context, FreshContext}
56
import dotty.tools.dotc.core.StdNames._
67
import dotty.tools.io.VirtualDirectory
78
import dotty.tools.repl.AbstractFileClassLoader
89

910
import scala.quoted.Expr
10-
import java.io.ByteArrayOutputStream
11-
import java.io.PrintStream
12-
import java.nio.charset.StandardCharsets
1311

1412
class QuoteDriver extends Driver {
13+
import tpd._
1514

1615
def run[T](expr: Expr[T]): T = {
1716
val ctx: Context = initCtx.fresh
@@ -31,19 +30,19 @@ class QuoteDriver extends Driver {
3130
method.invoke(instance).asInstanceOf[T]
3231
}
3332

34-
def show(expr: Expr[_]): String = {
33+
def show(expr: Expr[_]): String =
34+
withTree(expr, (tree, ctx) => tree.show(ctx))
35+
36+
def withTree[T](expr: Expr[_], f: (Tree, Context) => T): T = {
3537
val ctx: Context = initCtx.fresh
3638
ctx.settings.color.update("never")(ctx) // TODO support colored show
37-
val baos = new ByteArrayOutputStream
38-
var ps: PrintStream = null
39-
try {
40-
ps = new PrintStream(baos, true, "utf-8")
41-
42-
new ExprDecompiler(ps).newRun(ctx).compileExpr(expr)
43-
44-
new String(baos.toByteArray, StandardCharsets.UTF_8)
39+
var output: Option[T] = None
40+
def registerTree(tree: tpd.Tree)(ctx: Context): Unit = {
41+
assert(output.isEmpty)
42+
output = Some(f(tree, ctx))
4543
}
46-
finally if (ps != null) ps.close()
44+
new ExprDecompiler(registerTree).newRun(ctx).compileExpr(expr)
45+
output.getOrElse(throw new Exception("Could not extact " + expr))
4746
}
4847

4948
override def initCtx: Context = {

‎compiler/src/dotty/tools/dotc/quoted/QuotePrinter.scala‎ renamed to ‎compiler/src/dotty/tools/dotc/quoted/QuoteTreeOutput.scala‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
package dotty.tools.dotc.quoted
22

3-
import java.io.PrintStream
4-
3+
import dotty.tools.dotc.ast.tpd
54
import dotty.tools.dotc.core.Contexts._
65
import dotty.tools.dotc.core.Phases.Phase
76

87
/** Pretty prints the compilation unit to an output stream */
9-
class QuotePrinter(out: PrintStream) extends Phase {
10-
8+
class QuoteTreeOutput(output: tpd.Tree => Context => Unit) extends Phase {
119
override def phaseName: String = "quotePrinter"
12-
13-
override def run(implicit ctx: Context): Unit = {
14-
val unit = ctx.compilationUnit
15-
out.print(unit.tpdTree.show)
16-
}
10+
override def run(implicit ctx: Context): Unit = output(ctx.compilationUnit.tpdTree)(ctx)
1711
}

‎compiler/src/dotty/tools/dotc/quoted/Runners.scala‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package dotty.tools.dotc.quoted
22

3-
import dotty.tools.dotc.ast.Trees.Literal
4-
import dotty.tools.dotc.core.Constants.Constant
3+
import dotty.tools.dotc.ast.Trees._
4+
import dotty.tools.dotc.ast.tpd
5+
import dotty.tools.dotc.core.Constants._
6+
import dotty.tools.dotc.core.Contexts._
57
import dotty.tools.dotc.printing.RefinedPrinter
68

79
import scala.quoted.Expr
@@ -10,6 +12,7 @@ import scala.runtime.quoted._
1012

1113
/** Default runners for quoted expressions */
1214
object Runners {
15+
import tpd._
1316

1417
implicit def runner[T]: Runner[T] = new Runner[T] {
1518

@@ -20,11 +23,25 @@ object Runners {
2023

2124
def show(expr: Expr[T]): String = expr match {
2225
case expr: ConstantExpr[T] =>
23-
val ctx = new QuoteDriver().initCtx
24-
ctx.settings.color.update("never")(ctx)
26+
implicit val ctx = new QuoteDriver().initCtx
27+
ctx.settings.color.update("never")
2528
val printer = new RefinedPrinter(ctx)
2629
printer.toText(Literal(Constant(expr.value))).mkString(Int.MaxValue, false)
2730
case _ => new QuoteDriver().show(expr)
2831
}
32+
33+
def toConstantOpt(expr: Expr[T]): Option[T] = {
34+
def toConstantOpt(tree: Tree): Option[T] = tree match {
35+
case Literal(Constant(c)) => Some(c.asInstanceOf[T])
36+
case Block(Nil, e) => toConstantOpt(e)
37+
case Inlined(_, Nil, e) => toConstantOpt(e)
38+
case _ => None
39+
}
40+
expr match {
41+
case expr: ConstantExpr[T] => Some(expr.value)
42+
case _ => new QuoteDriver().withTree(expr, (tree, _) => toConstantOpt(tree))
43+
}
44+
}
45+
2946
}
3047
}

‎compiler/test/dotty/tools/dotc/CompilationTests.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,8 @@ class CompilationTests extends ParallelTesting {
198198
compileFile("../tests/run-special/quote-run-constants.scala", defaultRunWithCompilerOptions) +
199199
compileFile("../tests/run-special/quote-run.scala", defaultRunWithCompilerOptions) +
200200
compileFile("../tests/run-special/quote-run-2.scala", defaultRunWithCompilerOptions) +
201-
compileFile("../tests/run-special/quote-run-staged-interpreter.scala", defaultRunWithCompilerOptions)
201+
compileFile("../tests/run-special/quote-run-staged-interpreter.scala", defaultRunWithCompilerOptions) +
202+
compileFile("../tests/run-special/quote-run-constants.scala", defaultRunWithCompilerOptions)
202203
}.checkRuns()
203204

204205
// Generic java signatures tests ---------------------------------------------

‎library/src/scala/quoted/Constant.scala‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package scala.quoted
2+
3+
import scala.runtime.quoted.Runner
4+
5+
object Constant {
6+
def unapply[T](expr: Expr[T])(implicit runner: Runner[T]): Option[T] = runner.toConstantOpt(expr)
7+
}

‎library/src/scala/quoted/TastyExpr.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ package scala.quoted
33
import scala.runtime.quoted.Unpickler.Pickled
44

55
/** An Expr backed by a pickled TASTY tree */
6-
final case class TastyExpr[T](tasty: Pickled, args: Seq[Any]) extends Expr[T] with TastyQuoted {
6+
final class TastyExpr[T](val tasty: Pickled, val args: Seq[Any]) extends Expr[T] with TastyQuoted {
77
override def toString(): String = s"TastyExpr(<TASTY>, $args)"
88
}

‎library/src/scala/quoted/TastyType.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ package scala.quoted
33
import scala.runtime.quoted.Unpickler.Pickled
44

55
/** A Type backed by a pickled TASTY tree */
6-
final case class TastyType[T](tasty: Pickled, args: Seq[Any]) extends Type[T] with TastyQuoted {
6+
final class TastyType[T](val tasty: Pickled, val args: Seq[Any]) extends Type[T] with TastyQuoted {
77
override def toString(): String = s"TastyType(<TASTY>, $args)"
88
}

‎library/src/scala/runtime/quoted/Runner.scala‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ import scala.quoted.Expr
77
trait Runner[T] {
88
def run(expr: Expr[T]): T
99
def show(expr: Expr[T]): String
10+
def toConstantOpt(expr: Expr[T]): Option[T]
1011
}

‎tests/run-special/quote-run-constants-extract.check‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
3
2+
4
3+
abc
4+
null
5+
OK
6+
{
7+
{
8+
val y: Double = 3.0.*(3.0)
9+
y
10+
}
11+
}
12+
9.0
13+
{
14+
{
15+
val y: Double = 4.0.*(4.0)
16+
y
17+
}
18+
}
19+
16.0
20+
{
21+
{
22+
val y: Double = 5.0.*(5.0)
23+
y
24+
}
25+
}
26+
25.0
27+
{
28+
Test.dynamicPower(
29+
{
30+
println("foo")
31+
2
32+
}
33+
, 6.0)
34+
}
35+
foo
36+
36.0

0 commit comments

Comments
 (0)