Merge pull request #1145 from scalamacros/topic/cleanup

cleanup of reflection and macros

7 files changed, 7 insertions, 0 deletions

diff --git a/test/files/neg/macro-invalidsig-params-namemismatch.check b/test/files/neg/macro-invalidsig-params-namemismatch.check
index 00d781a2ac..f2639d9350 100644
--- a/test/files/neg/macro-invalidsig-params-namemismatch.check
+++ b/test/files/neg/macro-invalidsig-params-namemismatch.check
@@ -2,6 +2,7 @@ Impls_Macros_1.scala:8: error: macro implementation has wrong shape:
  required: (c: scala.reflect.macros.Context)(x: c.Expr[Int], y: c.Expr[Int]): c.Expr[Any]

  found   : (c: scala.reflect.macros.Context)(y: c.Expr[Int], x: c.Expr[Int]): Nothing

 parameter names differ: x != y

+parameter names differ: y != x

   def foo(x: Int, y: Int) = macro Impls.foo

                                         ^

 one error found

diff --git a/test/files/run/reify_ann1a.scala b/test/files/run/reify_ann1a.scala
index 9f994fb2eb..754baef6b7 100644
--- a/test/files/run/reify_ann1a.scala
+++ b/test/files/run/reify_ann1a.scala
@@ -21,6 +21,7 @@ object Test extends App {
   // test 2: import and typecheck
   val toolbox = cm.mkToolBox()
   val ttree = toolbox.typeCheck(tree)
+  ttree.foreach(sub => if (sub.hasSymbol) sub.symbol.typeSignature)
   println(ttree.toString)
 
   // test 3: import and compile
diff --git a/test/files/run/reify_ann1b.scala b/test/files/run/reify_ann1b.scala
index 3e0d3e0802..eb00b4cb10 100644
--- a/test/files/run/reify_ann1b.scala
+++ b/test/files/run/reify_ann1b.scala
@@ -21,6 +21,7 @@ object Test extends App {
   // test 2: import and typecheck
   val toolbox = cm.mkToolBox()
   val ttree = toolbox.typeCheck(tree)
+  ttree.foreach(sub => if (sub.hasSymbol) sub.symbol.typeSignature)
   println(ttree.toString)
 
   // test 3: import and compile
diff --git a/test/files/run/reify_ann2a.scala b/test/files/run/reify_ann2a.scala
index 63a17ee192..9f901d86bd 100644
--- a/test/files/run/reify_ann2a.scala
+++ b/test/files/run/reify_ann2a.scala
@@ -21,6 +21,7 @@ object Test extends App {
   // test 2: import and typecheck
   val toolbox = cm.mkToolBox()
   val ttree = toolbox.typeCheck(tree)
+  ttree.foreach(sub => if (sub.hasSymbol) sub.symbol.typeSignature)
   println(ttree.toString)
 
   // test 3: import and compile
diff --git a/test/files/run/reify_ann3.scala b/test/files/run/reify_ann3.scala
index dbb6a1b443..cbf1e10063 100644
--- a/test/files/run/reify_ann3.scala
+++ b/test/files/run/reify_ann3.scala
@@ -15,6 +15,7 @@ object Test extends App {
   // test 2: import and typecheck
   val toolbox = cm.mkToolBox()
   val ttree = toolbox.typeCheck(tree)
+  ttree.foreach(sub => if (sub.hasSymbol) sub.symbol.typeSignature)
   println(ttree.toString)
 
   // test 3: import and compile
diff --git a/test/files/run/reify_ann4.scala b/test/files/run/reify_ann4.scala
index b4845d1586..58c8c2c521 100644
--- a/test/files/run/reify_ann4.scala
+++ b/test/files/run/reify_ann4.scala
@@ -19,6 +19,7 @@ object Test extends App {
   // test 2: import and typecheck
   val toolbox = cm.mkToolBox()
   val ttree = toolbox.typeCheck(tree)
+  ttree.foreach(sub => if (sub.hasSymbol) sub.symbol.typeSignature)
   println(ttree.toString)
 
   // test 3: import and compile
diff --git a/test/files/run/reify_ann5.scala b/test/files/run/reify_ann5.scala
index 0ae8d317ce..801db07960 100644
--- a/test/files/run/reify_ann5.scala
+++ b/test/files/run/reify_ann5.scala
@@ -16,6 +16,7 @@ object Test extends App {
   // test 2: import and typecheck
   val toolbox = cm.mkToolBox()
   val ttree = toolbox.typeCheck(tree)
+  ttree.foreach(sub => if (sub.hasSymbol) sub.symbol.typeSignature)
   println(ttree.toString)
 
   // test 3: import and compile