repairs the tests after the refactoring spree

2 files changed, 32 insertions, 0 deletions

diff --git a/test/files/run/macro-reify-splice-outside-reify/Impls_Macros_1.scala b/test/files/run/macro-reify-splice-outside-reify/Impls_Macros_1.scala
new file mode 100644
index 0000000000..3ddfe6a737
--- /dev/null
+++ b/test/files/run/macro-reify-splice-outside-reify/Impls_Macros_1.scala
@@ -0,0 +1,24 @@
+import scala.reflect.makro.{Context => Ctx}
+
+object Impls {
+  def foo(c: Ctx)(x: c.Expr[Int]) = {
+    val x1 = c.Expr[Int](c.resetAllAttrs(x.tree))
+// was:    c.literal(x1.splice)
+    c.literal(eval(c)(x1))
+  }
+
+  private def eval[T](c: Ctx)(x: c.Expr[T]): T = {
+    import scala.reflect.runtime.{universe => ru}
+    val mirror = ru.runtimeMirror(c.libraryClassLoader)
+    import scala.tools.reflect.ToolBox
+    val toolBox = mirror.mkToolBox()
+    val importer = ru.mkImporter(c.universe).asInstanceOf[ru.Importer { val from: c.universe.type }]
+    val tree = c.resetAllAttrs(x.tree.duplicate)
+    val imported = importer.importTree(tree)
+    toolBox.runExpr(imported).asInstanceOf[T]
+  }
+}
+
+object Macros {
+  def foo(x: Int) = macro Impls.foo
+}
diff --git a/test/files/run/macro-reify-splice-outside-reify/Test_2.scala b/test/files/run/macro-reify-splice-outside-reify/Test_2.scala
new file mode 100644
index 0000000000..5bca7db668
--- /dev/null
+++ b/test/files/run/macro-reify-splice-outside-reify/Test_2.scala
@@ -0,0 +1,8 @@
+object Test extends App {
+  import scala.reflect.runtime.universe._
+  import scala.reflect.runtime.{currentMirror => cm}
+  import scala.tools.reflect.ToolBox
+  val tree = Apply(Select(Ident("Macros"), newTermName("foo")), List(Literal(Constant(42))))
+  try println(cm.mkToolBox().runExpr(tree))
+  catch { case ex: Throwable =>  println(ex.getMessage) }
+}