From 78f9ef3906c78413ff8835fdad3849bfe5516be2 Mon Sep 17 00:00:00 2001
From: Eugene Burmako <xeno.by@gmail.com>
Date: Thu, 16 Aug 2012 22:16:56 +0200
Subject: shaves more than 150 lines off typedMacroBody

---
 test/files/neg/macro-invalidshape-a.check                 |  3 +--
 test/files/neg/macro-invalidshape-b.check                 |  3 +--
 test/files/neg/macro-invalidshape-c.check                 | 11 +++++++----
 test/files/neg/macro-invalidsig-params-namemismatch.check |  1 -
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'test/files')

diff --git a/test/files/neg/macro-invalidshape-a.check b/test/files/neg/macro-invalidshape-a.check
index 246b5c3226..098ec35a00 100644
--- a/test/files/neg/macro-invalidshape-a.check
+++ b/test/files/neg/macro-invalidshape-a.check
@@ -1,6 +1,5 @@
 Macros_Test_2.scala:2: error: macro body has wrong shape:
- required: macro <reference to implementation object>.<implementation method name>
- or      : macro <implementation method name>
+ required: macro [<implementation object>].<method name>[[<type args>]]
   def foo(x: Any) = macro 2
       ^
 one error found
diff --git a/test/files/neg/macro-invalidshape-b.check b/test/files/neg/macro-invalidshape-b.check
index 59701d023b..297ff69199 100644
--- a/test/files/neg/macro-invalidshape-b.check
+++ b/test/files/neg/macro-invalidshape-b.check
@@ -1,6 +1,5 @@
 Macros_Test_2.scala:2: error: macro body has wrong shape:
- required: macro <reference to implementation object>.<implementation method name>
- or      : macro <implementation method name>
+ required: macro [<implementation object>].<method name>[[<type args>]]
   def foo(x: Any) = macro Impls.foo(null)(null)
       ^
 one error found
diff --git a/test/files/neg/macro-invalidshape-c.check b/test/files/neg/macro-invalidshape-c.check
index 84d8c35222..6513df166e 100644
--- a/test/files/neg/macro-invalidshape-c.check
+++ b/test/files/neg/macro-invalidshape-c.check
@@ -1,6 +1,9 @@
-Macros_Test_2.scala:2: error: macro body has wrong shape:
- required: macro <reference to implementation object>.<implementation method name>
- or      : macro <implementation method name>
+Macros_Test_2.scala:2: warning: a pure expression does nothing in statement position; you may be omitting necessary parentheses
   def foo(x: Any) = macro {2; Impls.foo}
-      ^
+                           ^
+Macros_Test_2.scala:2: error: missing arguments for method foo in object Impls;
+follow this method with `_' if you want to treat it as a partially applied function
+  def foo(x: Any) = macro {2; Impls.foo}
+                                    ^
+one warning found
 one error found
diff --git a/test/files/neg/macro-invalidsig-params-namemismatch.check b/test/files/neg/macro-invalidsig-params-namemismatch.check
index f2639d9350..00d781a2ac 100644
--- a/test/files/neg/macro-invalidsig-params-namemismatch.check
+++ b/test/files/neg/macro-invalidsig-params-namemismatch.check
@@ -2,7 +2,6 @@ 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
-- 
cgit v1.2.3