wip

nicolasstucki · nicolasstucki · commit fdbfbf5ee672 · 2018-06-10T19:53:41.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/quoted/ToolboxSettings.scala b/compiler/src/dotty/tools/dotc/quoted/ToolboxSettings.scala
@@ -22,7 +22,6 @@ object ToolboxSettings {
           ): ToolboxSettings = {
     var compilerArgs1 = compilerArgs
     if (optimise) compilerArgs1 = "-optimise" :: compilerArgs1
-    compilerArgs1 = s"-color:${if (color) "always" else "never"}" :: compilerArgs1
     new ToolboxSettings(outDir, rawTree, compilerArgs1)
   }
 
diff --git a/tests/run-with-compiler/i3876-b.scala b/tests/run-with-compiler/i3876-b.scala
@@ -2,6 +2,8 @@ import dotty.tools.dotc.quoted.Toolbox._
 import scala.quoted._
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
+
     val x: Expr[Int] = '(3)
 
     val f2: Expr[Int => Int] = '{
diff --git a/tests/run-with-compiler/i3876-c.scala b/tests/run-with-compiler/i3876-c.scala
@@ -2,6 +2,8 @@ import dotty.tools.dotc.quoted.Toolbox._
 import scala.quoted._
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
+
     val x: Expr[Int] = '(3)
 
     val f3: Expr[Int => Int] = '{
diff --git a/tests/run-with-compiler/i3876-d.scala b/tests/run-with-compiler/i3876-d.scala
@@ -2,6 +2,8 @@ import dotty.tools.dotc.quoted.Toolbox._
 import scala.quoted._
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
+
     val x: Expr[Int] = '(3)
 
     val f4: Expr[Int => Int] = '{
diff --git a/tests/run-with-compiler/i3876.scala b/tests/run-with-compiler/i3876.scala
@@ -2,6 +2,8 @@ import dotty.tools.dotc.quoted.Toolbox._
 import scala.quoted._
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
+
     val x: Expr[Int] = '(3)
 
     val f: Expr[Int => Int] = '{ (x: Int) => x + x }
diff --git a/tests/run-with-compiler/i3946.scala b/tests/run-with-compiler/i3946.scala
@@ -2,6 +2,8 @@ import dotty.tools.dotc.quoted.Toolbox._
 import scala.quoted._
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
+
     val u: Expr[Unit] = '()
     println(u.show)
     println(u.run)
diff --git a/tests/run-with-compiler/i3947.scala b/tests/run-with-compiler/i3947.scala
@@ -5,6 +5,7 @@ import dotty.tools.dotc.quoted.Toolbox._
 object Test {
 
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
 
     def test[T](clazz: java.lang.Class[T]): Unit = {
       val lclazz = clazz.toExpr
diff --git a/tests/run-with-compiler/i3947b.scala b/tests/run-with-compiler/i3947b.scala
@@ -5,6 +5,7 @@ import dotty.tools.dotc.quoted.Toolbox._
 object Test {
 
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
 
     def test[T](clazz: java.lang.Class[T]): Unit = {
       val lclazz = clazz.toExpr
diff --git a/tests/run-with-compiler/i3947b2.scala b/tests/run-with-compiler/i3947b2.scala
@@ -5,6 +5,7 @@ import dotty.tools.dotc.quoted.Toolbox._
 object Test {
 
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
 
     def test[T](clazz: java.lang.Class[T]): Unit = {
       val lclazz = clazz.toExpr
diff --git a/tests/run-with-compiler/i3947b3.scala b/tests/run-with-compiler/i3947b3.scala
@@ -5,6 +5,7 @@ import dotty.tools.dotc.quoted.Toolbox._
 object Test {
 
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
 
     def test[T](clazz: java.lang.Class[T]): Unit = {
       val lclazz = clazz.toExpr
diff --git a/tests/run-with-compiler/i3947c.scala b/tests/run-with-compiler/i3947c.scala
@@ -5,6 +5,7 @@ import dotty.tools.dotc.quoted.Toolbox._
 object Test {
 
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
 
     def test[T](clazz: java.lang.Class[T]): Unit = {
       val lclazz = clazz.toExpr
diff --git a/tests/run-with-compiler/i3947d.scala b/tests/run-with-compiler/i3947d.scala
@@ -5,6 +5,7 @@ import dotty.tools.dotc.quoted.Toolbox._
 object Test {
 
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
 
     def test[T](clazz: java.lang.Class[T]): Unit = {
       val lclazz = clazz.toExpr
diff --git a/tests/run-with-compiler/i3947d2.scala b/tests/run-with-compiler/i3947d2.scala
@@ -5,6 +5,7 @@ import dotty.tools.dotc.quoted.Toolbox._
 object Test {
 
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
 
     def test[T](clazz: java.lang.Class[T]): Unit = {
       val lclazz = clazz.toExpr
diff --git a/tests/run-with-compiler/i3947e.scala b/tests/run-with-compiler/i3947e.scala
@@ -5,6 +5,7 @@ import dotty.tools.dotc.quoted.Toolbox._
 object Test {
 
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
 
     def test[T](clazz: java.lang.Class[T]): Unit = {
       val lclazz = clazz.toExpr
diff --git a/tests/run-with-compiler/i3947f.scala b/tests/run-with-compiler/i3947f.scala
@@ -5,6 +5,7 @@ import dotty.tools.dotc.quoted.Toolbox._
 object Test {
 
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
 
     def test[T](clazz: java.lang.Class[T]): Unit = {
       val lclazz = clazz.toExpr
diff --git a/tests/run-with-compiler/i3947g.scala b/tests/run-with-compiler/i3947g.scala
@@ -5,6 +5,7 @@ import dotty.tools.dotc.quoted.Toolbox._
 object Test {
 
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
 
     def test[T](clazz: java.lang.Class[T]): Unit = {
       val lclazz = clazz.toExpr
diff --git a/tests/run-with-compiler/i3947i.scala b/tests/run-with-compiler/i3947i.scala
@@ -5,6 +5,7 @@ import dotty.tools.dotc.quoted.Toolbox._
 object Test {
 
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
 
     def test[T](clazz: java.lang.Class[T]): Unit = {
       val lclazz = clazz.toExpr
diff --git a/tests/run-with-compiler/i3947j.scala b/tests/run-with-compiler/i3947j.scala
@@ -5,6 +5,7 @@ import dotty.tools.dotc.quoted.Toolbox._
 object Test {
 
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
 
     def test[T](clazz: java.lang.Class[T]): Unit = {
       val lclazz = clazz.toExpr
diff --git a/tests/run-with-compiler/i4350.scala b/tests/run-with-compiler/i4350.scala
@@ -8,6 +8,7 @@ class Foo[T: Type] {
 
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
     println((new Foo[Object]).q.show)
     println((new Foo[String]).q.show)
   }
diff --git a/tests/run-with-compiler/quote-lib.scala b/tests/run-with-compiler/quote-lib.scala
@@ -11,6 +11,7 @@ import liftable.Exprs._
 
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
 
     val liftedUnit: Expr[Unit] = '()
 
diff --git a/tests/run-with-compiler/quote-owners-2.scala b/tests/run-with-compiler/quote-owners-2.scala
@@ -4,6 +4,8 @@ import dotty.tools.dotc.quoted.Toolbox._
 
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
+
     val q = f(g(Type.IntTag))
     println(q.run)
     println(q.show)
diff --git a/tests/run-with-compiler/quote-owners.scala b/tests/run-with-compiler/quote-owners.scala
@@ -3,6 +3,8 @@ import dotty.tools.dotc.quoted.Toolbox._
 
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
+
     val q = f
     println(q.run)
     println(q.show)
diff --git a/tests/run-with-compiler/quote-run-2.scala b/tests/run-with-compiler/quote-run-2.scala
@@ -5,6 +5,8 @@ import scala.quoted._
 
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
+
     def powerCode(n: Int, x: Expr[Double]): Expr[Double] =
       if (n == 0) '(1.0)
       else if (n == 1) x
diff --git a/tests/run-with-compiler/quote-run-b.scala b/tests/run-with-compiler/quote-run-b.scala
@@ -5,6 +5,8 @@ import scala.quoted._
 
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
+
     val lambdaExpr = '{
       (x: Int) => println("lambda(" + x + ")")
     }
diff --git a/tests/run-with-compiler/quote-run-c.scala b/tests/run-with-compiler/quote-run-c.scala
@@ -5,6 +5,8 @@ import scala.quoted._
 
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
+
     val classExpr = '{
       class A {
         override def toString: String = "Foo"
diff --git a/tests/run-with-compiler/quote-run-constants.scala b/tests/run-with-compiler/quote-run-constants.scala
@@ -5,6 +5,8 @@ import scala.quoted._
 
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
+
     def run[T](expr: Expr[T]): Unit = println(expr.run)
     def show[T](expr: Expr[T]): Unit = println(expr.show)
 
diff --git a/tests/run-with-compiler/quote-run-many.scala b/tests/run-with-compiler/quote-run-many.scala
@@ -3,15 +3,12 @@ import scala.quoted._
 object Test {
   def main(args: Array[String]): Unit = {
     implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
+
     def expr(i: Int) = '{
       val a = 3 + ~i.toExpr
       2 + a
     }
-    for (i <- 0 to 200) {
-      val t0 = System.nanoTime()
-      val res = expr(i).run
-      val t = (System.nanoTime() - t0) / 1000000
-      println(s"$i = $res in ${t}ms")
-    }
+    for (i <- 0 to 200)
+      expr(i).run
   }
 }
diff --git a/tests/run-with-compiler/quote-run-with-settings.scala b/tests/run-with-compiler/quote-run-with-settings.scala
@@ -8,6 +8,7 @@ import scala.quoted._
 
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
     val expr = '{
       val a = 3
       println("foo")
@@ -24,6 +25,7 @@ object Test {
 
     {
       implicit val settings = ToolboxSettings.make(optimise = true, outDir = Some(outDir.toString))
+      implicit val toolbox2: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
       println(expr.run)
       assert(Files.exists(classFile))
     }
diff --git a/tests/run-with-compiler/quote-run.scala b/tests/run-with-compiler/quote-run.scala
@@ -5,6 +5,8 @@ import scala.quoted._
 
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
+
     val expr = '{
       val a = 3
       println("foo")
diff --git a/tests/run-with-compiler/quote-show-blocks.scala b/tests/run-with-compiler/quote-show-blocks.scala
@@ -1,10 +1,8 @@
-
-import dotty.tools.dotc.quoted.Toolbox._
-
 import scala.quoted._
 
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
 
     def a(n: Int, x: Expr[Unit]): Expr[Unit] =
       if (n == 0) x
diff --git a/tests/run-with-compiler/quote-two-captured-ref.scala b/tests/run-with-compiler/quote-two-captured-ref.scala
@@ -1,8 +1,9 @@
 import quoted._
-import dotty.tools.dotc.quoted.Toolbox._
 
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
+
     val q = '{
       val x = 1
       println(~{
diff --git a/tests/run-with-compiler/quote-type-tags.scala b/tests/run-with-compiler/quote-type-tags.scala
@@ -1,10 +1,9 @@
-
-import dotty.tools.dotc.quoted.Toolbox._
-
 import scala.quoted._
 
 object Test {
   def main(args: Array[String]): Unit = {
+    implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make
+
     def asof[T, U](x: Expr[T], t: Type[U]): Expr[U] =
       '((~x).asInstanceOf[~t])
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ object ToolboxSettings {`
`22`	`22`	`): ToolboxSettings = {`
`23`	`23`	`var compilerArgs1 = compilerArgs`
`24`	`24`	`if (optimise) compilerArgs1 = "-optimise" :: compilerArgs1`
`25`		`- compilerArgs1 = s"-color:${if (color) "always" else "never"}" :: compilerArgs1`
`26`	`25`	`new ToolboxSettings(outDir, rawTree, compilerArgs1)`
`27`	`26`	`}`
`28`	`27`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ class Foo[T: Type] {`
`8`	`8`
`9`	`9`	`object Test {`
`10`	`10`	`def main(args: Array[String]): Unit = {`
	`11`	`+ implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make`
`11`	`12`	`println((new Foo[Object]).q.show)`
`12`	`13`	`println((new Foo[String]).q.show)`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ import scala.quoted._`
`5`	`5`
`6`	`6`	`object Test {`
`7`	`7`	`def main(args: Array[String]): Unit = {`
	`8`	`+ implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make`
	`9`	`+`
`8`	`10`	`val lambdaExpr = '{`
`9`	`11`	`(x: Int) => println("lambda(" + x + ")")`
`10`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,15 +3,12 @@ import scala.quoted._`
`3`	`3`	`object Test {`
`4`	`4`	`def main(args: Array[String]): Unit = {`
`5`	`5`	`implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make`
	`6`	`+`
`6`	`7`	`def expr(i: Int) = '{`
`7`	`8`	`val a = 3 + ~i.toExpr`
`8`	`9`	`2 + a`
`9`	`10`	`}`
`10`		`- for (i <- 0 to 200) {`
`11`		`- val t0 = System.nanoTime()`
`12`		`- val res = expr(i).run`
`13`		`- val t = (System.nanoTime() - t0) / 1000000`
`14`		`- println(s"$i = $res in ${t}ms")`
`15`		`- }`
	`11`	`+ for (i <- 0 to 200)`
	`12`	`+ expr(i).run`
`16`	`13`	`}`
`17`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import scala.quoted._`
`8`	`8`
`9`	`9`	`object Test {`
`10`	`10`	`def main(args: Array[String]): Unit = {`
	`11`	`+ implicit val toolbox: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make`
`11`	`12`	`val expr = '{`
`12`	`13`	`val a = 3`
`13`	`14`	`println("foo")`
`@@ -24,6 +25,7 @@ object Test {`
`24`	`25`
`25`	`26`	`{`
`26`	`27`	`implicit val settings = ToolboxSettings.make(optimise = true, outDir = Some(outDir.toString))`
	`28`	`+ implicit val toolbox2: scala.runtime.quoted.Toolbox = dotty.tools.dotc.quoted.Toolbox.make`
`27`	`29`	`println(expr.run)`
`28`	`30`	`assert(Files.exists(classFile))`
`29`	`31`	`}`