Cleanup

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$Code".toTypeName
+  def outputClassName: TypeName = "Generated$Code$From$Quoted".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,11 @@ import scala.quoted.{Expr, Type}
 import scala.quoted.Toolbox
 import java.net.URLClassLoader
 
-class QuoteDriver(cl: ClassLoader) extends Driver {
+/** Driver to compile quoted code
+  *
+  * @param appClassloader classloader of the application that generated the quotes
+  */
+class QuoteDriver(appClassloader: ClassLoader) extends Driver {
   import tpd._
 
   private[this] val contextBase: ContextBase = new ContextBase
@@ -34,7 +38,7 @@ class QuoteDriver(cl: ClassLoader) extends Driver {
 
     assert(!ctx.reporter.hasErrors)
 
-    val classLoader = new AbstractFileClassLoader(outDir, this.getClass.getClassLoader)
+    val classLoader = new AbstractFileClassLoader(outDir, appClassloader)
 
     val clazz = classLoader.loadClass(driver.outputClassName.toString)
     val method = clazz.getMethod("apply")
@@ -84,7 +88,7 @@ class QuoteDriver(cl: ClassLoader) extends Driver {
 
   override def initCtx: Context = {
     val ictx = contextBase.initialCtx
-    ictx.settings.classpath.update(QuoteDriver.currentClasspath(cl))(ictx)
+    ictx.settings.classpath.update(QuoteDriver.currentClasspath(appClassloader))(ictx)
     ictx
   }
 

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

@@ -9,27 +9,15 @@ import scala.quoted.Exprs.{LiftedExpr, TastyTreeExpr}
 object ToolboxImpl {
   import tpd._
 
-  def make(settings: scala.quoted.Toolbox.Settings): scala.quoted.Toolbox = new scala.quoted.Toolbox {
-
-    private[this] val driver: QuoteDriver = new QuoteDriver(getClass.getClassLoader)
-
-    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))
-
-    def show[T](tpe: Type[T]): String = synchronized(driver.show(tpe, settings))
-  }
-
-  def make2(settings: scala.quoted.Toolbox.Settings, cl: ClassLoader): scala.quoted.Toolbox = new scala.quoted.Toolbox {
-
-    private[this] val driver: QuoteDriver = new QuoteDriver(cl)
+  /** Create a new instance of the toolbox using the the classloader of the application.
+    *
+    * @param appClassloader classloader of the application that generated the quotes
+    * @param settings toolbox settings
+    * @return A new instance of the toolbox
+    */
+  def make(settings: scala.quoted.Toolbox.Settings, appClassloader: ClassLoader): scala.quoted.Toolbox = new scala.quoted.Toolbox {
+
+    private[this] val driver: QuoteDriver = new QuoteDriver(appClassloader)
 
     def run[T](expr: Expr[T]): T = expr match {
       case expr: LiftedExpr[T] =>

library/src/scala/quoted/Toolbox.scala

@@ -19,10 +19,11 @@ object Toolbox {
   /** Create a new instance of the toolbox.
     *
     * This instance of the toolbox tries to recover the classloader of the application based on
-    * the classloader of the class that call make. This may not always be the correct classloader.
+    * the classloader of the class that call make. This may not always be the correct classloader,
+    * in which case the classloader must be passed explicitly.
     *
     * @param settings TODO
-    * @return
+    * @return A new instance of the toolbox
     */
   @forceInline def make(implicit settings: Settings): Toolbox = {
     // Get the name of the class at call site
@@ -33,17 +34,17 @@ object Toolbox {
     make(cl)
   }
 
-  /** Create a new instance of the toolbox
+  /** Create a new instance of the toolbox using the the classloader of the application.
     *
-    * @param cl TODO
-    * @param settings TODO
+    * @param appClassloader classloader of the application that generated the quotes
+    * @param settings toolbox settings
     * @return A new instance of the toolbox
     */
-  def make(cl: ClassLoader)(implicit settings: Settings): Toolbox = {
+  def make(appClassloader: ClassLoader)(implicit settings: Settings): Toolbox = {
     try {
-      val toolboxImplCls = cl.loadClass("dotty.tools.dotc.quoted.ToolboxImpl")
-      val makeMeth = toolboxImplCls.getMethod("make2", classOf[Settings], classOf[ClassLoader])
-      makeMeth.invoke(null, settings, cl).asInstanceOf[Toolbox]
+      val toolboxImplCls = appClassloader.loadClass("dotty.tools.dotc.quoted.ToolboxImpl")
+      val makeMeth = toolboxImplCls.getMethod("make", classOf[Settings], classOf[ClassLoader])
+      makeMeth.invoke(null, settings, appClassloader).asInstanceOf[Toolbox]
     }
     catch {
       case ex: ClassNotFoundException =>

tests/run-with-compiler/quote-run-c.check

@@ -1,4 +1,4 @@
 Foo
 false
 Bar
-class Quoted$A$1
+class Generated$Code$From$Quoted$A$1

tests/run-with-compiler/quote-run-with-settings.scala

@@ -19,7 +19,7 @@ object Test {
     println()
 
     val outDir = Paths.get("out/out-quoted-1")
-    val classFile = outDir.resolve("Quoted.class")
+    val classFile = outDir.resolve("Generated$Code$From$Quoted.class")
 
     Files.deleteIfExists(classFile)