Renamings

Author: nicolasstucki

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

@@ -3,7 +3,7 @@ package dotty.tools.dotc.quoted
 import dotty.tools.dotc.CompilationUnit
 import dotty.tools.dotc.util.NoSource
 
-import scala.quoted.Expr
+import scala.quoted._
 
 /* Compilation unit containing the contents of a quoted expression */
-class ExprCompilationUnit(val expr: scala.quoted.QuoteContext => Expr[_]) extends CompilationUnit(NoSource)
+class ExprCompilationUnit(val exprBuilder: QuoteContext => Expr[_]) extends CompilationUnit(NoSource)

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

@@ -50,8 +50,8 @@ class QuoteCompiler extends Compiler {
       units.map {
         case exprUnit: ExprCompilationUnit =>
           val tree =
-            if (putInClass) inClass(exprUnit.expr)
-            else PickledQuotes.quotedExprToTree(checkValidRunExpr(exprUnit.expr.apply(new QuoteContext(ReflectionImpl(ctx)))))
+            if (putInClass) inClass(exprUnit.exprBuilder)
+            else PickledQuotes.quotedExprToTree(checkValidRunExpr(exprUnit.exprBuilder.apply(new QuoteContext(ReflectionImpl(ctx)))))
           val source = SourceFile.virtual("<quoted.Expr>", "")
           CompilationUnit(source, tree, forceTrees = true)
       }
@@ -67,7 +67,7 @@ class QuoteCompiler extends Compiler {
       *  with the following format.
       *  `package __root__ { class ' { def apply: Any = <expr> } }`
       */
-    private def inClass(expr: scala.quoted.QuoteContext => Expr[_])(implicit ctx: Context): Tree = {
+    private def inClass(exprBuilder: QuoteContext => Expr[_])(implicit ctx: Context): Tree = {
       val pos = Span(0)
       val assocFile = new VirtualFile("<quote>")
 
@@ -76,7 +76,7 @@ class QuoteCompiler extends Compiler {
       cls.enter(ctx.newDefaultConstructor(cls), EmptyScope)
       val meth = ctx.newSymbol(cls, nme.apply, Method, ExprType(defn.AnyType), coord = pos).entered
 
-      val quoted = PickledQuotes.quotedExprToTree(checkValidRunExpr(expr.apply(new QuoteContext(ReflectionImpl(ctx)))))(ctx.withOwner(meth))
+      val quoted = PickledQuotes.quotedExprToTree(checkValidRunExpr(exprBuilder.apply(new QuoteContext(ReflectionImpl(ctx)))))(ctx.withOwner(meth))
 
       val run = DefDef(meth, quoted)
       val classTree = ClassDef(cls, DefDef(cls.primaryConstructor.asTerm), run :: Nil)
@@ -87,8 +87,8 @@ class QuoteCompiler extends Compiler {
   }
 
   class ExprRun(comp: Compiler, ictx: Context) extends Run(comp, ictx) {
-    def compileExpr(expr:  scala.quoted.QuoteContext => Expr[_]): Unit = {
-      val units = new ExprCompilationUnit(expr) :: Nil
+    def compileExpr(exprBuilder:  QuoteContext => Expr[_]): Unit = {
+      val units = new ExprCompilationUnit(exprBuilder) :: Nil
       compileUnits(units)
     }
   }

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

@@ -7,7 +7,7 @@ import dotty.tools.dotc.tastyreflect.ReflectionImpl
 import dotty.tools.io.{AbstractFile, Directory, PlainDirectory, VirtualDirectory}
 import dotty.tools.repl.AbstractFileClassLoader
 import dotty.tools.dotc.reporting._
-import scala.quoted.{Expr, Type}
+import scala.quoted._
 import scala.quoted.Toolbox
 import java.net.URLClassLoader
 
@@ -20,7 +20,7 @@ class QuoteDriver(appClassloader: ClassLoader) extends Driver {
 
   private[this] val contextBase: ContextBase = new ContextBase
 
-  def run[T](expr: scala.quoted.QuoteContext => Expr[T], settings: Toolbox.Settings): T = {
+  def run[T](exprBuilder: QuoteContext => Expr[T], settings: Toolbox.Settings): T = {
     val outDir: AbstractFile = settings.outDir match {
       case Some(out) =>
         val dir = Directory(out)
@@ -34,7 +34,7 @@ class QuoteDriver(appClassloader: ClassLoader) extends Driver {
     val ctx = setToolboxSettings(ctx0.fresh.setSetting(ctx0.settings.outputDir, outDir), settings)
 
     val driver = new QuoteCompiler
-    driver.newRun(ctx).compileExpr(expr)
+    driver.newRun(ctx).compileExpr(exprBuilder)
 
     assert(!ctx.reporter.hasErrors)
 

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

@@ -1,13 +1,9 @@
 package dotty.tools.dotc.quoted
 
-import dotty.tools.dotc.ast.tpd
-
 import scala.quoted._
-import scala.internal.quoted.{LiftedExpr, TastyTreeExpr}
 
 /** Default runners for quoted expressions */
 object ToolboxImpl {
-  import tpd._
 
   /** Create a new instance of the toolbox using the the classloader of the application.
     *
@@ -19,8 +15,8 @@ object ToolboxImpl {
 
     private[this] val driver: QuoteDriver = new QuoteDriver(appClassloader)
 
-    def run[T](expr: scala.quoted.QuoteContext => Expr[T]): T = synchronized {
-      driver.run(expr, settings)
+    def run[T](exprBuilder: QuoteContext => Expr[T]): T = synchronized {
+      driver.run(exprBuilder, settings)
     }
 
   }