WIP

Author: nicolasstucki

compiler/src/dotty/tools/dotc/quoted/QuoteCompiler.scala

@@ -37,7 +37,7 @@ class QuoteCompiler extends Compiler {
     new ExprRun(this, ctx.addMode(Mode.ReadPositions))
   }
 
-  def outputClassName: TypeName = "Quoted".toTypeName
+  def outputClassName: TypeName = "Quoted$Code".toTypeName
 
   /** Frontend that receives a scala.quoted.Expr or scala.quoted.Type as input */
   class QuotedFrontend(putInClass: Boolean) extends Phase {

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

@@ -11,7 +11,7 @@ import scala.quoted.{Expr, Type}
 import scala.quoted.Toolbox
 import java.net.URLClassLoader
 
-class QuoteDriver extends Driver {
+class QuoteDriver(cl: ClassLoader) extends Driver {
   import tpd._
 
   private[this] val contextBase: ContextBase = new ContextBase
@@ -26,12 +26,17 @@ class QuoteDriver extends Driver {
         new VirtualDirectory("<quote compilation output>")
     }
 
+    println("ToolboxImpl")
+    settings.compilerArgs.foreach(println)
+
     val (_, ctx0: Context) = setup(settings.compilerArgs.toArray :+ "dummy.scala", initCtx.fresh)
     val ctx = setToolboxSettings(ctx0.fresh.setSetting(ctx0.settings.outputDir, outDir), settings)
 
     val driver = new QuoteCompiler
     driver.newRun(ctx).compileExpr(expr)
 
+    assert(!ctx.reporter.hasErrors)
+
     val classLoader = new AbstractFileClassLoader(outDir, this.getClass.getClassLoader)
 
     val clazz = classLoader.loadClass(driver.outputClassName.toString)

compiler/src/dotty/tools/dotc/quoted/ToolboxImpl.scala

@@ -26,4 +26,21 @@ object ToolboxImpl {
 
     def show[T](tpe: Type[T]): String = synchronized(driver.show(tpe, settings))
   }
+
+  def make2(settings: scala.quoted.Toolbox.Settings): scala.quoted.Toolbox = new scala.quoted.Toolbox {
+
+    private[this] val driver: QuoteDriver = new QuoteDriver()
+
+    def run[T](expr: Expr[T]): T = expr match {
+      case expr: LiftedExpr[T] =>
+        expr.value
+      case expr: TastyTreeExpr[Tree] @unchecked =>
+        throw new Exception("Cannot call `Expr.run` on an `Expr` that comes from a macro argument.")
+      case _ =>
+        synchronized(driver.run(expr, settings))
+    }
+
+    def show[T](expr: Expr[T]): String = synchronized(driver.show(expr, settings))
+
+  }
 }

library/src/scala/quoted/Toolbox.scala

@@ -16,9 +16,25 @@ object Toolbox {
     implicit def make(implicit settings: Settings): Toolbox = Toolbox.make
   }
 
+  def make2(cl: ClassLoader)(implicit settings: Settings): Toolbox = {
+    try {
+      val toolboxImplCls = cl.loadClass("dotty.tools.dotc.quoted.ToolboxImpl")
+      val makeMeth = toolboxImplCls.getMethod("make2", classOf[Settings])
+      makeMeth.invoke(null, settings, cl).asInstanceOf[Toolbox]
+    }
+    catch {
+      case ex: ClassNotFoundException =>
+        throw new ToolboxNotFoundException(
+          s"""Could not load the Toolbox class `${ex.getMessage}` from the JVM classpath. Make sure that the compiler is on the JVM classpath.""",
+          ex
+        )
+    }
+  }
+
   def make(implicit settings: Settings): Toolbox = {
     val cl = getClass.getClassLoader
-    println(">>>>>")
+    println("Toolbox CL")
+    println(cl.asInstanceOf[java.net.URLClassLoader])
     cl.asInstanceOf[java.net.URLClassLoader].getURLs().toList.foreach(println)
 
     try {

sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/src/main/scala/hello/Hello.scala

@@ -6,7 +6,12 @@ import scala.quoted._
 object Main {
 
   // Needed to run or show quotes
-  implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make
+  val cl = getClass.getClassLoader
+  println("BEFORE")
+  println(cl.asInstanceOf[java.net.URLClassLoader])
+  cl.asInstanceOf[java.net.URLClassLoader].getURLs().toList.foreach(println)
+
+  implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make2(cl)
 
   def main(args: Array[String]): Unit = {
     val square = stagedPower(2)
@@ -27,7 +32,7 @@ object Main {
     val code = '{ (x: Double) => ${powerCode(n, '{x})}}
 
     println(s"staged power for n=" + n + ":")
-    println(code.show)
+    // println(code.show)
 
     // Evaluate the contents of the code and return it's value
     code.run

sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala

@@ -391,8 +391,14 @@ object DottyPlugin extends AutoPlugin {
   def makeScalaInstance(
     state: State, dottyVersion: String, scalaLibrary: File, dottyLibrary: File, compiler: File, all: Seq[File]
   ): ScalaInstance = {
+    println("all")
+    all.foreach(println)
     val loader = state.classLoaderCache(all.toList)
-    val loaderLibraryOnly = state.classLoaderCache(List(dottyLibrary, scalaLibrary))
+    println("DottyPlugin: " + loader)
+    val dottyInterfaces = all.find(a => a.toString.contains("dotty-interfaces")).get
+    val loaderLibraryOnly = state.classLoaderCache(List(compiler, dottyInterfaces, dottyLibrary, scalaLibrary))
+    println("DottyPlugin lib: " + loaderLibraryOnly)
+
     new ScalaInstance(
       dottyVersion,
       loader,