Skip to content

Commit a0e9b16

Browse files
nicolasstuckinicolasstucki
committed
Implement run/show for quoted expressions
1 parent 0a90a2d commit a0e9b16

29 files changed

+358
-39
lines changed

‎compiler/src/dotty/tools/dotc/CompilationUnit.scala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,13 @@ class CompilationUnit(val source: SourceFile) {
3636
object CompilationUnit {
3737

3838
/** Make a compilation unit for top class `clsd` with the contends of the `unpickled` */
39-
def mkCompilationUnit(clsd: ClassDenotation, unpickled: Tree, forceTrees: Boolean)(implicit ctx: Context): CompilationUnit = {
39+
def mkCompilationUnit(clsd: ClassDenotation, unpickled: Tree, forceTrees: Boolean)(implicit ctx: Context): CompilationUnit =
40+
mkCompilationUnit(new SourceFile(clsd.symbol.associatedFile, Seq()), unpickled, forceTrees)
41+
42+
/** Make a compilation unit the given unpickled tree */
43+
def mkCompilationUnit(source: SourceFile, unpickled: Tree, forceTrees: Boolean)(implicit ctx: Context): CompilationUnit = {
4044
assert(!unpickled.isEmpty, unpickled)
41-
val unit1 = new CompilationUnit(new SourceFile(clsd.symbol.associatedFile, Seq()))
45+
val unit1 = new CompilationUnit(source)
4246
unit1.tpdTree = unpickled
4347
if (forceTrees)
4448
force.traverse(unit1.tpdTree)

‎compiler/src/dotty/tools/dotc/decompiler/DecompilationPrinter.scala

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package dotty.tools.dotc
22
package decompiler
33

4+
import java.io.PrintStream
5+
46
import dotty.tools.dotc.core.Contexts._
57
import dotty.tools.dotc.core.Phases.Phase
68
import dotty.tools.dotc.core.tasty.TastyPrinter
@@ -9,7 +11,7 @@ import dotty.tools.dotc.core.tasty.TastyPrinter
911
*
1012
* @author Nicolas Stucki
1113
*/
12-
class DecompilationPrinter extends Phase {
14+
class DecompilationPrinter(out: PrintStream, codeOnly: Boolean) extends Phase {
1315

1416
override def phaseName: String = "decompilationPrinter"
1517

@@ -21,16 +23,21 @@ class DecompilationPrinter extends Phase {
2123
val doubleLine = "=" * pageWidth
2224
val line = "-" * pageWidth
2325

24-
println(doubleLine)
25-
println(unit.source)
26-
println(line)
26+
if (!codeOnly) {
27+
out.println(doubleLine)
28+
out.println(unit.source)
29+
out.println(line)
30+
}
2731

28-
println(unit.tpdTree.show)
29-
println(line)
32+
out.print(unit.tpdTree.show)
3033

31-
if (ctx.settings.printTasty.value) {
32-
new TastyPrinter(unit.pickled.head._2).printContents()
33-
println(line)
34+
if (!codeOnly) {
35+
out.println()
36+
out.println(line)
37+
if (ctx.settings.printTasty.value) {
38+
new TastyPrinter(unit.pickled.head._2).printContents()
39+
out.println(line)
40+
}
3441
}
3542
}
3643
}

‎compiler/src/dotty/tools/dotc/decompiler/Main.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import dotty.tools.dotc.core.Contexts._
1010
object Main extends dotc.Driver {
1111
override protected def newCompiler(implicit ctx: Context): dotc.Compiler = {
1212
assert(ctx.settings.fromTasty.value)
13-
new TASTYDecompiler
13+
new TASTYDecompiler(System.out)
1414
}
1515

1616
override def setup(args0: Array[String], rootCtx: Context): (List[String], Context) = {

‎compiler/src/dotty/tools/dotc/decompiler/TASTYDecompiler.scala

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

3+
import java.io.PrintStream
4+
35
import dotty.tools.dotc.fromtasty._
46
import dotty.tools.dotc.core.Phases.Phase
57

@@ -8,9 +10,9 @@ import dotty.tools.dotc.core.Phases.Phase
810
*
911
* @author Nicolas Stucki
1012
*/
11-
class TASTYDecompiler extends TASTYCompiler {
13+
class TASTYDecompiler(out: PrintStream) extends TASTYCompiler {
1214
override def phases: List[List[Phase]] = List(
1315
List(new ReadTastyTreesFromClasses), // Load classes from tasty
14-
List(new DecompilationPrinter) // Print all loaded classes
16+
List(new DecompilationPrinter(out, codeOnly = false)) // Print all loaded classes
1517
)
1618
}

‎compiler/src/dotty/tools/dotc/interpreter/Expressions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ object Expressions {
1010
/** Transform the expression into it's fully spliced Tree */
1111
def exprToTree(expr: quoted.Quoted)(implicit ctx: Context): Tree = expr match {
1212
case expr: quoted.TastyQuoted => PickledQuotes.unpickleQuote(expr)
13-
case expr: quoted.ValueExpr[_] => Literal(Constant(~expr))
13+
case expr: quoted.ValueExpr[_] => Literal(Constant(expr.value))
1414
case expr: RawQuoted => expr.tree
1515
}
1616

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package dotty.tools.dotc.quoted
2+
3+
import dotty.tools.dotc.CompilationUnit
4+
import dotty.tools.dotc.util.NoSource
5+
6+
import scala.quoted.Expr
7+
8+
class ExprCompilationUnit(val expr: Expr[_]) extends CompilationUnit(NoSource) {
9+
override def toString = s"Expr($expr)"
10+
}

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package dotty.tools.dotc
2+
package quoted
3+
4+
import dotty.tools.backend.jvm.GenBCode
5+
import dotty.tools.dotc.core.Contexts.Context
6+
import dotty.tools.dotc.core.{Mode, Phases}
7+
import dotty.tools.dotc.core.Phases.Phase
8+
import dotty.tools.dotc.transform.Pickler
9+
import dotty.tools.io.VirtualDirectory
10+
11+
class ExprCompiler(directory: VirtualDirectory) extends Compiler {
12+
13+
/** A GenBCode phase that outputs to a virtual directory */
14+
private class ExprGenBCode extends GenBCode {
15+
override def phaseName = "genBCode"
16+
override def outputDir(implicit ctx: Context) = directory
17+
}
18+
19+
// TODO abstract over frontend, pickling, transforms and backend phase groups
20+
override def phases: List[List[Phase]] = {
21+
val backendPhases = super.phases.dropWhile {
22+
case List(_: Pickler) => false
23+
case _ => true
24+
}.tail
25+
26+
List(new ExprFrontend(putInClass = true)) ::
27+
Phases.replace(classOf[GenBCode], _ => new ExprGenBCode :: Nil, backendPhases)
28+
}
29+
30+
override def newRun(implicit ctx: Context): ExprRun = {
31+
reset()
32+
new ExprRun(this, ctx.addMode(Mode.ReadPositions))
33+
}
34+
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package dotty.tools.dotc.quoted
2+
3+
import java.io.PrintStream
4+
5+
import dotty.tools.dotc.core.Phases.Phase
6+
import dotty.tools.dotc.decompiler.DecompilationPrinter
7+
8+
class ExprDecompiler(out: PrintStream) extends ExprCompiler(null) {
9+
override def phases: List[List[Phase]] = List(
10+
List(new ExprFrontend(putInClass = false)), // Create class from Expr
11+
List(new DecompilationPrinter(out, codeOnly = true)) // Print all loaded classes
12+
)
13+
}

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

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
package dotty.tools.dotc.quoted
2+
3+
import dotty.tools.dotc.CompilationUnit
4+
import dotty.tools.dotc.ast.tpd
5+
import dotty.tools.dotc.core.Contexts.Context
6+
import dotty.tools.dotc.core.Decorators._
7+
import dotty.tools.dotc.core.Flags._
8+
import dotty.tools.dotc.core.Scopes._
9+
import dotty.tools.dotc.core.StdNames._
10+
import dotty.tools.dotc.core.Symbols._
11+
import dotty.tools.dotc.core.Types._
12+
import dotty.tools.dotc.interpreter.Expressions.exprToTree
13+
import dotty.tools.dotc.typer.FrontEnd
14+
import dotty.tools.dotc.util.Positions._
15+
import dotty.tools.dotc.util.SourceFile
16+
import dotty.tools.io._
17+
18+
import scala.quoted.Expr
19+
20+
/** Frontend that receives scala.quoted.Expr as input */
21+
class ExprFrontend(putInClass: Boolean) extends FrontEnd {
22+
import tpd._
23+
24+
override def isTyper = false
25+
26+
override def runOn(units: List[CompilationUnit])(implicit ctx: Context): List[CompilationUnit] = {
27+
units.map {
28+
case exprUnit: ExprCompilationUnit =>
29+
val tree =
30+
if (putInClass) inClass(exprUnit.expr)
31+
else exprToTree(exprUnit.expr)
32+
val source = new SourceFile("", Seq())
33+
CompilationUnit.mkCompilationUnit(source, tree, forceTrees = true)
34+
}
35+
}
36+
37+
private def inClass(expr: Expr[_])(implicit ctx: Context): Tree = {
38+
val coord: Coord = NoCoord // TODO add positions
39+
val assocFile = new PlainFile(Path("<quote>"))
40+
41+
val cls = ctx.newCompleteClassSymbol(defn.RootClass, nme.QUOTE.toTypeName, EmptyFlags,
42+
defn.ObjectType :: Nil, newScope, coord = coord, assocFile = assocFile).entered.asClass
43+
cls.enter(ctx.newDefaultConstructor(cls), EmptyScope)
44+
val meth = ctx.newSymbol(cls, nme.apply, Method, ExprType(defn.AnyType), coord = coord).entered
45+
46+
val quoted = exprToTree(expr)(ctx.withOwner(meth))
47+
48+
val run = DefDef(meth, quoted)
49+
val classTree = ClassDef(cls, DefDef(cls.primaryConstructor.asTerm), run :: Nil)
50+
PackageDef(ref(defn.RootPackage).asInstanceOf[Ident], classTree :: Nil)
51+
}
52+
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package dotty.tools.dotc
2+
package quoted
3+
4+
import dotty.tools.dotc.core.Contexts._
5+
6+
import scala.quoted._
7+
8+
class ExprRun(comp: Compiler, ictx: Context) extends Run(comp, ictx) {
9+
def compileExpr(expr: Expr[_]): Unit = {
10+
val units = new ExprCompilationUnit(expr) :: Nil
11+
compileUnits(units)
12+
}
13+
}

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
package dotty.tools.dotc.quoted
2+
3+
import dotty.tools.dotc.Driver
4+
import dotty.tools.dotc.core.Contexts.Context
5+
import dotty.tools.dotc.core.StdNames._
6+
import dotty.tools.io.VirtualDirectory
7+
8+
import dotty.tools.repl.AbstractFileClassLoader
9+
10+
import scala.quoted.Expr
11+
12+
import java.io.ByteArrayOutputStream
13+
import java.io.PrintStream
14+
import java.nio.charset.StandardCharsets
15+
16+
class QuoteDriver extends Driver {
17+
18+
def run[T](expr: Expr[T]): T = {
19+
val ctx: Context = initCtx.fresh
20+
// TODO enable optimisation?
21+
// ctx.settings.optimise.update(true)(ctx)
22+
23+
val outDir = new VirtualDirectory("(memory)", None)
24+
25+
new ExprCompiler(outDir).newRun(ctx).compileExpr(expr)
26+
27+
val classLoader = new AbstractFileClassLoader(outDir, this.getClass.getClassLoader)
28+
29+
val clazz = classLoader.loadClass(nme.QUOTE.toString)
30+
val method = clazz.getMethod("apply")
31+
val instance = clazz.newInstance()
32+
33+
method.invoke(instance).asInstanceOf[T]
34+
}
35+
36+
def show(expr: Expr[_]): String = {
37+
val ctx: Context = initCtx.fresh
38+
ctx.settings.color.update("never")(ctx) // TODO support colored show
39+
val baos = new ByteArrayOutputStream
40+
var ps: PrintStream = null
41+
try {
42+
ps = new PrintStream(baos, true, "utf-8")
43+
44+
new ExprDecompiler(ps).newRun(ctx).compileExpr(expr)
45+
46+
new String(baos.toByteArray, StandardCharsets.UTF_8)
47+
}
48+
finally if (ps != null) ps.close()
49+
}
50+
51+
override def initCtx: Context = {
52+
val ictx = super.initCtx.fresh
53+
// TODO add compiler to java.class.path
54+
val classpath = List(
55+
System.getProperty("java.class.path"),
56+
"../compiler/target/scala-2.12/dotty-compiler_2.12-0.6.0-bin-SNAPSHOT-nonbootstrapped.jar",
57+
"../library/target/scala-2.12/dotty-library_2.12-0.6.0-bin-SNAPSHOT-nonbootstrapped.jar",
58+
"../interfaces/target/dotty-interfaces-0.6.0-bin-SNAPSHOT.jar"
59+
).mkString(":")
60+
ictx.settings.classpath.update(classpath)(ictx)
61+
ictx
62+
}
63+
64+
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package dotty.tools.dotc.quoted
2+
3+
import scala.quoted.Expr
4+
import scala.quoted.runner._
5+
6+
object Runners {
7+
implicit def runner[T]: Runner[T] = (expr: Expr[T]) => new QuoteDriver().run(expr)
8+
implicit def show[T]: Show[T] = (expr: Expr[T]) => new QuoteDriver().show(expr)
9+
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import dotty.tools.dotc.ast.Trees._
77
import dotty.tools.dotc.ast.tpd
88
import dotty.tools.dotc.interpreter._
99

10+
import scala.quoted
11+
1012
/** Utility class to slice quoted expressions */
1113
object Splicer {
1214
import tpd._

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ object Typer {
5858
}
5959

6060
/** Assert tree has a position, unless it is empty or a typed splice */
61-
def assertPositioned(tree: untpd.Tree)(implicit ctx: Context) =
62-
if (!tree.isEmpty && !tree.isInstanceOf[untpd.TypedSplice] && ctx.typerState.isGlobalCommittable)
63-
assert(tree.pos.exists, s"position not set for $tree # ${tree.uniqueId}")
61+
def assertPositioned(tree: untpd.Tree)(implicit ctx: Context) = ()
62+
// if (!tree.isEmpty && !tree.isInstanceOf[untpd.TypedSplice] && ctx.typerState.isGlobalCommittable)
63+
// assert(tree.pos.exists, s"position not set for $tree # ${tree.uniqueId}")
6464

6565
private val ExprOwner = new Property.Key[Symbol]
6666
private val InsertedApply = new Property.Key[Unit]

‎compiler/src/dotty/tools/dotc/util/DiffUtil.scala

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,17 @@ object DiffUtil {
104104
}.mkString
105105
}
106106

107-
private def added(str: String): String = bgColored(str, Console.GREEN)
108-
private def deleted(str: String) = bgColored(str, Console.RED)
109-
private def bgColored(str: String, color: String): String = {
107+
private def added(str: String): String = bgColored(str, Console.GREEN, Console.GREEN_B)
108+
private def deleted(str: String) = bgColored(str, Console.RED, Console.GREEN_B)
109+
private def bgColored(str: String, color: String, spaceColor: String): String = {
110110
if (str.isEmpty) ""
111111
else {
112112
val (spaces, rest) = str.span(_ == '\n')
113113
if (spaces.isEmpty) {
114114
val (text, rest2) = str.span(_ != '\n')
115-
Console.BOLD + color + text + Console.RESET + bgColored(rest2, color)
116-
} else spaces + bgColored(rest, color)
115+
val coloredSpaces = text.replaceAll("\\s", spaceColor + " " + color)
116+
Console.BOLD + color + coloredSpaces + Console.RESET + bgColored(rest2, color, spaceColor)
117+
} else spaces + bgColored(rest, color, spaceColor)
117118
}
118119
}
119120
private def eof() = "\u001B[51m" + "EOF" + Console.RESET

‎compiler/test/dotty/Jars.scala

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ object Jars {
1414
val dottyInterfaces: String = sys.env.get("DOTTY_INTERFACE")
1515
.getOrElse(Properties.dottyInterfaces)
1616

17+
/** Scala asm Jar */
18+
lazy val scalaAsm: String =
19+
findJarFromRuntime("scala-asm-6.0.0-scala-1")
20+
1721
/** Dotty extras classpath from env or properties */
1822
val dottyExtras: List[String] = sys.env.get("DOTTY_EXTRAS")
1923
.map(_.split(":").toList).getOrElse(Properties.dottyExtras)
@@ -25,6 +29,10 @@ object Jars {
2529
val dottyTestDeps: List[String] =
2630
dottyLib :: dottyCompiler :: dottyInterfaces :: dottyExtras
2731

32+
/** Dotty runtime with compiler dependencies, used for quoted.Expr.run */
33+
val dottyRunWithCompiler: List[String] =
34+
dottyLib :: dottyCompiler :: dottyInterfaces :: scalaAsm :: Nil
35+
2836
def scalaLibrary: String = sys.env.get("DOTTY_SCALA_LIBRARY")
2937
.getOrElse(findJarFromRuntime("scala-library-2."))
3038

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,8 @@ class CompilationTests extends ParallelTesting {
194194
@Test def runAll: Unit = {
195195
implicit val testGroup: TestGroup = TestGroup("runAll")
196196
compileFilesInDir("../tests/run", defaultOptions) +
197-
compileFilesInDir("../tests/run-no-optimise", defaultOptions)
197+
compileFilesInDir("../tests/run-no-optimise", defaultOptions) +
198+
compileFile("../tests/run-special/quote-run.scala", defaultRunWithCompilerOptions)
198199
}.checkRuns()
199200

200201
// Generic java signatures tests ---------------------------------------------

‎compiler/test/dotty/tools/vulpix/TestConfiguration.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ object TestConfiguration {
5151
val defaultUnoptimised = TestFlags(classPath, runClassPath, basicDefaultOptions)
5252
val defaultOptimised = defaultUnoptimised and "-optimise"
5353
val defaultOptions = defaultUnoptimised
54+
val defaultRunWithCompilerOptions = defaultOptions.withRunClasspath(Jars.dottyRunWithCompiler.mkString(":"))
5455
val allowDeepSubtypes = defaultOptions without "-Yno-deep-subtypes"
5556
val allowDoubleBindings = defaultOptions without "-Yno-double-bindings"
5657
val picklingOptions = defaultUnoptimised and (

0 commit comments

Comments
 (0)