Merge remote-tracking branch 'staging/fix-#6007' into fix-#5409

Author: biboudis

community-build/community-projects/sourcecode

@@ -16,7 +16,7 @@ object ConsumeTasty {
         new TastyFromClass(tastyConsumer)
     }
 
-    val currentClasspath = QuoteDriver.currentClasspath
+    val currentClasspath = QuoteDriver.currentClasspath(getClass.getClassLoader)
     import java.io.File.{ pathSeparator => sep }
     val args = "-from-tasty" :: "-Yretain-trees" :: "-classpath" :: s"$classpath$sep$currentClasspath" :: classes
     (new Consume).process(args.toArray)

compiler/src/dotty/tools/dotc/consumetasty/ConsumeTasty.scala

@@ -341,6 +341,7 @@ object Parsers {
           case NEWLINE | NEWLINES => in.nextToken()
           case SEMI => in.nextToken()
           case _ =>
+            syntaxError("end of statement expected")
             in.nextToken() // needed to ensure progress; otherwise we might cycle forever
             accept(SEMI)
         }

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -37,7 +37,7 @@ class QuoteCompiler extends Compiler {
     new ExprRun(this, ctx.addMode(Mode.ReadPositions))
   }
 
-  def outputClassName: TypeName = "Quoted".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/QuoteCompiler.scala

@@ -11,7 +11,11 @@ import scala.quoted.{Expr, Type}
 import scala.quoted.Toolbox
 import java.net.URLClassLoader
 
-class QuoteDriver 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
@@ -32,7 +36,9 @@ class QuoteDriver extends Driver {
     val driver = new QuoteCompiler
     driver.newRun(ctx).compileExpr(expr)
 
-    val classLoader = new AbstractFileClassLoader(outDir, this.getClass.getClassLoader)
+    assert(!ctx.reporter.hasErrors)
+
+    val classLoader = new AbstractFileClassLoader(outDir, appClassloader)
 
     val clazz = classLoader.loadClass(driver.outputClassName.toString)
     val method = clazz.getMethod("apply")
@@ -82,7 +88,7 @@ class QuoteDriver extends Driver {
 
   override def initCtx: Context = {
     val ictx = contextBase.initialCtx
-    ictx.settings.classpath.update(QuoteDriver.currentClasspath)(ictx)
+    ictx.settings.classpath.update(QuoteDriver.currentClasspath(appClassloader))(ictx)
     ictx
   }
 
@@ -94,9 +100,9 @@ class QuoteDriver extends Driver {
 
 object QuoteDriver {
 
-  def currentClasspath: String = {
+  def currentClasspath(cl: ClassLoader): String = {
     val classpath0 = System.getProperty("java.class.path")
-    this.getClass.getClassLoader match {
+    cl match {
       case cl: URLClassLoader =>
         // Loads the classes loaded by this class loader
         // When executing `run` or `test` in sbt the classpath is not in the property java.class.path

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

@@ -9,9 +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 {
+  /** 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()
+    private[this] val driver: QuoteDriver = new QuoteDriver(appClassloader)
 
     def run[T](expr: Expr[T]): T = expr match {
       case expr: LiftedExpr[T] =>
@@ -26,4 +32,5 @@ object ToolboxImpl {
 
     def show[T](tpe: Type[T]): String = synchronized(driver.show(tpe, settings))
   }
+
 }

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

@@ -358,9 +358,13 @@ object Erasure {
     /** This override is only needed to semi-erase type ascriptions */
     override def typedTyped(tree: untpd.Typed, pt: Type)(implicit ctx: Context): Tree = {
       val Typed(expr, tpt) = tree
-      val tpt1 = promote(tpt)
-      val expr1 = typed(expr, tpt1.tpe)
-      assignType(untpd.cpy.Typed(tree)(expr1, tpt1), tpt1)
+      val tpt1 = tpt match {
+        case Block(_, tpt) => tpt // erase type aliases (statements) from type block
+        case tpt => tpt
+      }
+      val tpt2 = promote(tpt1)
+      val expr1 = typed(expr, tpt2.tpe)
+      assignType(untpd.cpy.Typed(tree)(expr1, tpt2), tpt2)
     }
 
     override def typedLiteral(tree: untpd.Literal)(implicit ctx: Context): Tree =

compiler/src/dotty/tools/dotc/transform/Erasure.scala

@@ -0,0 +1,8 @@
+scala> implicit def toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
+def toolbox: quoted.Toolbox
+scala> val v = '{ (if true then Some(1) else None).map(v => v+1) }
+val v: quoted.Expr[Option[Int]] = Expr(<pickled tasty>)
+scala> v.show
+val res0: String = (if (true) scala.Some.apply[scala.Int](1) else scala.None).map[scala.Int](((v: scala.Int) => v.+(1)))
+scala> v.run
+val res1: Option[Int] = Some(2)

compiler/test-resources/repl/i6007

@@ -2,7 +2,7 @@ package scala.quoted
 
 import scala.annotation.implicitNotFound
 
-@implicitNotFound("Could not find implicit quoted.Toolbox.\n\nDefault toolbox can be instantiated with:\n  `implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make`\n\nIf only needed once it can also be imported with:\n `import scala.quoted.Toolbox.Default._`")
+@implicitNotFound("Could not find implicit quoted.Toolbox.\n\nDefault toolbox can be instantiated with:\n  `implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)`\n\n")
 trait Toolbox {
   def run[T](expr: Expr[T]): T
   def show[T](expr: Expr[T]): String
@@ -11,17 +11,22 @@ trait Toolbox {
 
 object Toolbox {
 
-  object Default {
-    // TODO remove? It may be better to only have one way to instantiate the toolbox
-    implicit def make(implicit settings: Settings): Toolbox = Toolbox.make
-  }
-
-  def make(implicit settings: Settings): Toolbox = {
-    val cl = getClass.getClassLoader
+  /** Create a new instance of the toolbox using the the classloader of the application.
+    *
+    * Usuage:
+    * ```
+    * implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
+    * ```
+    *
+    * @param appClassloader classloader of the application that generated the quotes
+    * @param settings toolbox settings
+    * @return A new instance of the toolbox
+    */
+  def make(appClassloader: ClassLoader)(implicit settings: Settings): Toolbox = {
     try {
-      val toolboxImplCls = cl.loadClass("dotty.tools.dotc.quoted.ToolboxImpl")
-      val makeMeth = toolboxImplCls.getMethod("make", classOf[Settings])
-      makeMeth.invoke(null, settings).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 =>

library/src/scala/quoted/Toolbox.scala

@@ -0,0 +1,7 @@
+scalaVersion := sys.props("plugin.scalaVersion")
+
+libraryDependencies ++= Seq(
+      "ch.epfl.lamp" % "dotty_0.14" % scalaVersion.value,
+      "ch.epfl.lamp" % "dotty_0.14" % scalaVersion.value % "test->runtime",
+      "com.novocode" % "junit-interface" % "0.11" % "test"
+    )

sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/build.sbt

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/project/plugins.sbt

@@ -0,0 +1,51 @@
+package hello
+
+// Import Expr and some extension methods
+import scala.quoted._
+
+object Main {
+
+  implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
+
+  def main(args: Array[String]): Unit = {
+
+    val square = stagedPower(2)
+
+    assert(Math.pow(3, 2) == square(3))
+
+    square(3)
+    square(4)
+
+    assert(Math.pow(4, 2) == square(4))
+
+    val cube = stagedPower(3)
+    cube(2)
+
+
+    assert(Math.pow(2, 3) == cube(2))
+
+
+
+    val toTheFourth = stagedPower(4)
+    assert(Math.pow(3, 4) == toTheFourth(3))
+  }
+
+  def stagedPower(n: Int): Double => Double = {
+    // Code representing the labmda where the recursion is unrolled based on the value of n
+    val code = '{ (x: Double) => ${powerCode(n, '{x})}}
+
+    code.show
+
+    // Evaluate the contents of the code and return it's value
+    code.run
+  }
+
+  def powerCode(n: Int, x: Expr[Double]): Expr[Double] =
+    if (n == 0) '{1.0}
+    else if (n == 1) x
+    else if (n < 0) throw new Exception("Negative powers not implemented. Left as a small exercise. Dont be shy, try it out.")
+    else if (n == 2) '{$x * $x}
+    else if (n % 2 == 1)  '{$x * ${powerCode(n - 1, x)}}
+    else '{ val y = $x * $x; ${powerCode(n / 2, '{y})}}
+
+}

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

@@ -0,0 +1 @@
+> run

sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/test

@@ -13,10 +13,9 @@ object Lens {
   }
 
   def impl[S: Type, T: Type](getter: Expr[S => T])(implicit refl: Reflection): Expr[Lens[S, T]] = {
+    implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(this.getClass.getClassLoader)
     import refl._
     import util._
-    import quoted.Toolbox.Default._
-
     // obj.copy(field = value)
     def setterBody(obj: Expr[S], value: Expr[T], field: String): Expr[S] =
       Select.overloaded(obj.unseal, "copy", Nil, NamedArg(field, value.unseal) :: Nil).seal.cast[S]

tests/neg-with-compiler/i5941/macro_1.scala

@@ -1,9 +1,9 @@
 import scala.quoted._
 import scala.quoted.autolift._
 
-import scala.quoted.Toolbox.Default._
-
 object Macros {
+
+  implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
   inline def foo(i: => Int): Int = ${ fooImpl('i) }
   def fooImpl(i: Expr[Int]): Expr[Int] = {
     val y: Int = i.run

tests/neg-with-compiler/quote-run-in-macro-1/quoted_1.scala

@@ -1,10 +1,11 @@
 import scala.quoted._
 import scala.quoted.autolift._
-import scala.quoted.Toolbox.Default._
 
 object Macros {
+
   inline def foo(i: => Int): Int = ${ fooImpl('i) }
   def fooImpl(i: Expr[Int]): Expr[Int] = {
+    implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
     val y: Int = i.run
     y
   }

tests/neg-with-compiler/quote-run-in-macro-2/quoted_1.scala

@@ -8,6 +8,6 @@ object Test {
   def f = {
     val _parent = 3
     q"val hello = $_parent"
-    q"class $_" // error
+    q"class $_" // error // error
   } // error
 }

tests/neg/i1779.scala

@@ -0,0 +1,10 @@
+object Foo {
+  val a = ""); // error: end of statement expected
+}
+// From #5824:
+object Main {
+  def main(args: Array[String]): Unit = {
+    val foo = 123 ""; // error: end of statement expected
+    println(foo)
+  }
+}

tests/neg/i4934.scala

@@ -2,5 +2,5 @@ class x0[x0] {
   val x1 : x0
 }
 trait x3 extends x0 { // error
-x1 = 0 object  // error
+x1 = 0 object  // error // error
 // error

tests/neg/parser-stability-16.scala

@@ -1,2 +1,2 @@
 trait x0[] {      x0: x0 => }      // error // error
-        class x0[x1] extends x0[x0 x0] x2 x0  // error // error
+        class x0[x1] extends x0[x0 x0] x2 x0  // error // error // error

tests/neg/parser-stability-17.scala

@@ -1,3 +1,3 @@
 object i0 {
-  import Ordering.{ implicitly => } (true: Boolean) match { case _: i1 => true } // error // error
+  import Ordering.{ implicitly => } (true: Boolean) match { case _: i1 => true } // error // error // error
 }

tests/neg/parser-stability-23.scala

@@ -1,3 +1,3 @@
 class x0{
-      def x0: x0 = (x0 => x0) => x0)  // error
+      def x0: x0 = (x0 => x0) => x0)  // error // error
 // error

tests/neg/parser-stability-4.scala

@@ -2,7 +2,6 @@ import scala.quoted._
 import scala.tasty.Reflection
 import scala.language.implicitConversions
 import scala.quoted.Exprs.LiftedExpr
-import scala.quoted.Toolbox.Default._
 
 object Macro {
 

tests/neg/tasty-string-interpolator-position-a/Macro_1.scala

@@ -2,7 +2,6 @@ import scala.quoted._
 import scala.tasty.Reflection
 import scala.language.implicitConversions
 import scala.quoted.Exprs.LiftedExpr
-import scala.quoted.Toolbox.Default._
 
 object Macro {
 
@@ -11,7 +10,7 @@ object Macro {
 }
 
 object FIntepolator {
-
+  implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
   def apply(strCtxExpr: Expr[StringContext], argsExpr: Expr[Seq[Any]])(implicit reflect: Reflection): Expr[String] = {
     import reflect._
     error("there are no args", argsExpr.unseal.underlyingArgument.pos)

tests/neg/tasty-string-interpolator-position-b/Macro_1.scala

@@ -1,8 +1,6 @@
 import scala.quoted._
 import scala.quoted.autolift._
 
-import scala.quoted.Toolbox.Default._
-
 object Macros {
 
 
@@ -41,5 +39,6 @@ class Test {
     ${ powerCode(3, '{math.sqrt(2.0)}) }
   }
 
+  implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
   program.run
 }

tests/pos-with-compiler/quote-0.scala

@@ -1,4 +1,4 @@
-import scala.quoted.Toolbox.Default._
+
 import scala.quoted._
 import Macros._
 
@@ -15,5 +15,6 @@ object Test {
     ${ assertImpl('{x != 0}) }
   }
 
+  implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
   program.run
 }

tests/pos-with-compiler/quote-assert/quoted_2.scala

@@ -0,0 +1,14 @@
+import scala.quoted._
+
+object Macro {
+  inline def test[A, B]: Any =
+    ${ impl[A, B] }
+
+  def impl[A : Type, B : Type]: Expr[Any] = {
+    val t = '[Map[A, B]]
+    '{
+      new Object().asInstanceOf[$t]
+      ???.asInstanceOf[$t]
+    }
+  }
+}

tests/pos/i6210/Macros_1.scala

@@ -0,0 +1,5 @@
+object Test {
+  type T
+  def t1 = Macro.test[Int, String]
+  def t2 = Macro.test[Test.type, T]
+}

tests/pos/i6210/Test_2.scala

@@ -677,8 +677,7 @@ object Test {
     .fold('{0}, ((a: Expr[Int], b : Expr[Int]) => '{ $a + $b }))
 
   def main(args: Array[String]): Unit = {
-    implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make
-
+    implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
     println(test1().run)
     println
     println(test2().run)