changes some manual tree constructions in macro tests to quasiquotes

1 files changed, 8 insertions, 12 deletions

diff --git a/test/files/neg/macro-invalidsig/Impls_1.scala b/test/files/neg/macro-invalidsig/Impls_1.scala
index 4e2e592024..d16ed26386 100644
--- a/test/files/neg/macro-invalidsig/Impls_1.scala
+++ b/test/files/neg/macro-invalidsig/Impls_1.scala
@@ -2,10 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.macros.Context
 
 object Impls1 {
-  def foo[U: c.WeakTypeTag: Numeric](c: Context) = {
-    import c.universe._
-    Literal(Constant(42))
-  }
+  def foo[U: c.WeakTypeTag: Numeric](c: Context) = { import c.universe._; q"42" }
 }
 
 object Impls2 {
@@ -28,12 +25,11 @@ object Impls6 {
   def foo[T, U: c.WeakTypeTag](c: Context)(implicit x: c.Expr[Int]) = {
     import c.{prefix => prefix}
     import c.universe._
-    val body = Block(List(
-      Apply(Select(Ident(definitions.PredefModule), TermName("println")), List(Literal(Constant("invoking foo_targs...")))),
-      Apply(Select(Ident(definitions.PredefModule), TermName("println")), List(Literal(Constant("type of prefix is: " + prefix.staticType)))),
-      Apply(Select(Ident(definitions.PredefModule), TermName("println")), List(Literal(Constant("U is: " + implicitly[c.WeakTypeTag[U]].tpe))))),
-      Literal(Constant(())))
-    c.Expr[Unit](body)
+    c.Expr[Unit](q"""
+      println("invoking foo_targs...")
+      println("type of prefix is: " + ${prefix.staticType.toString})
+      println("U is: " + ${implicitly[c.WeakTypeTag[U]].tpe.toString})
+    """)
   }
 }
 
@@ -75,7 +71,7 @@ object Impls15 {
     println(implicitly[c.WeakTypeTag[T]])
     println(implicitly[c.WeakTypeTag[U]])
     println(V)
-    c.Expr[Unit](Literal(Constant(())))
+    c.Expr[Unit](q"()")
   }
 }
 
@@ -85,6 +81,6 @@ object Impls16 {
     println(implicitly[c.WeakTypeTag[T]])
     println(implicitly[c.WeakTypeTag[U]])
     println(V)
-    c.Expr[Unit](Literal(Constant(())))
+    c.Expr[Unit](q"()")
   }
 }
\ No newline at end of file