Added test for -Yliteral-types combined with macro and toolbox eval

milessabin · milessabin · commit 07341a0256c0 · 2016-08-10T12:57:19.000+01:00
diff --git a/src/compiler/scala/reflect/macros/contexts/Evals.scala b/src/compiler/scala/reflect/macros/contexts/Evals.scala
@@ -8,7 +8,7 @@ trait Evals {
   self: Context =>
 
   private lazy val evalMirror = ru.runtimeMirror(universe.analyzer.defaultMacroClassloader)
-  private lazy val evalToolBox = evalMirror.mkToolBox()
+  private lazy val evalToolBox = evalMirror.mkToolBox(options = if(global.settings.YliteralTypes) "-Yliteral-types" else "")
   private lazy val evalImporter = ru.internal.createImporter(universe).asInstanceOf[ru.Importer { val from: universe.type }]
 
   def eval[T](expr: Expr[T]): T = {
@@ -20,4 +20,4 @@ trait Evals {
         evalToolBox.eval(imported).asInstanceOf[T]
     }
   }
-}
+}
diff --git a/test/files/run/sip23-macro-eval/Macros_1.flags b/test/files/run/sip23-macro-eval/Macros_1.flags
@@ -0,0 +1 @@
+-Yliteral-types
diff --git a/test/files/run/sip23-macro-eval/Macros_1.scala b/test/files/run/sip23-macro-eval/Macros_1.scala
@@ -0,0 +1,15 @@
+import scala.language.experimental.macros
+import scala.reflect.macros.blackbox.Context
+
+object Macros {
+  def impl(c: Context): c.Expr[Any] = {
+    import c.universe._;
+
+		val res0 = c.eval(c.Expr[Any](q"implicitly[ValueOf[1]]"))
+    val res = res0.asInstanceOf[ValueOf[1]].value
+
+    c.Expr[Any](q"$res")
+  }
+
+  def eval: Any = macro impl
+}
diff --git a/test/files/run/sip23-macro-eval/Test_2.flags b/test/files/run/sip23-macro-eval/Test_2.flags
@@ -0,0 +1 @@
+-Yliteral-types
diff --git a/test/files/run/sip23-macro-eval/Test_2.scala b/test/files/run/sip23-macro-eval/Test_2.scala
@@ -0,0 +1,4 @@
+object Test extends App {
+	val res = Macros.eval
+	assert(res == 1)
+}
diff --git a/test/files/run/sip23-toolbox-eval.flags b/test/files/run/sip23-toolbox-eval.flags
@@ -0,0 +1 @@
+-Yliteral-types
diff --git a/test/files/run/sip23-toolbox-eval.scala b/test/files/run/sip23-toolbox-eval.scala
@@ -0,0 +1,7 @@
+import scala.tools.reflect.ToolBox
+import scala.reflect.runtime.{ universe => ru }
+
+object Test extends App {
+  val tb = scala.reflect.runtime.currentMirror.mkToolBox(options = "-Yliteral-types")
+  tb.eval(ru.reify(implicitly[ValueOf[1]]).tree)
+}

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ trait Evals {`
`8`	`8`	`self: Context =>`
`9`	`9`
`10`	`10`	`private lazy val evalMirror = ru.runtimeMirror(universe.analyzer.defaultMacroClassloader)`
`11`		`- private lazy val evalToolBox = evalMirror.mkToolBox()`
	`11`	`+ private lazy val evalToolBox = evalMirror.mkToolBox(options = if(global.settings.YliteralTypes) "-Yliteral-types" else "")`
`12`	`12`	`private lazy val evalImporter = ru.internal.createImporter(universe).asInstanceOf[ru.Importer { val from: universe.type }]`
`13`	`13`
`14`	`14`	`def eval[T](expr: Expr[T]): T = {`
`@@ -20,4 +20,4 @@ trait Evals {`
`20`	`20`	`evalToolBox.eval(imported).asInstanceOf[T]`
`21`	`21`	`}`
`22`	`22`	`}`
`23`		`-}`
	`23`	`+}`