4 files changed, 169 insertions, 1 deletions
diff --git a/test/files/neg/macro-qmarkqmarkqmark.check b/test/files/neg/macro-qmarkqmarkqmark.check
index afd49e7d90..bc3e25edaf 100644
--- a/test/files/neg/macro-qmarkqmarkqmark.check
+++ b/test/files/neg/macro-qmarkqmarkqmark.check
@@ -1,7 +1,7 @@
 macro-qmarkqmarkqmark.scala:5: error: macro implementation is missing
   foo1
   ^
-macro-qmarkqmarkqmark.scala:8: error: macros cannot be partially applied
+macro-qmarkqmarkqmark.scala:8: error: too few argument lists for macro invocation
   foo2
   ^
 macro-qmarkqmarkqmark.scala:9: error: macro implementation is missing
diff --git a/test/files/neg/t7157.check b/test/files/neg/t7157.check
new file mode 100644
index 0000000000..c6a7af9a23
--- /dev/null
+++ b/test/files/neg/t7157.check
@@ -0,0 +1,73 @@
+Test_2.scala:5: error: too many arguments for macro method m1_0_0: ()Unit
+  m1_0_0(1)
+        ^
+Test_2.scala:6: error: too many arguments for macro method m1_0_0: ()Unit
+  m1_0_0(1, 2)
+        ^
+Test_2.scala:7: error: too many arguments for macro method m1_0_0: ()Unit
+  m1_0_0(1, 2, 3)
+        ^
+Test_2.scala:9: error: macro applications do not support named and/or default arguments
+  m1_1_1()
+        ^
+Test_2.scala:11: error: too many arguments for macro method m1_1_1: (x: Int)Unit
+  m1_1_1(1, 2)
+        ^
+Test_2.scala:12: error: too many arguments for macro method m1_1_1: (x: Int)Unit
+  m1_1_1(1, 2, 3)
+        ^
+Test_2.scala:14: error: macro applications do not support named and/or default arguments
+  m1_2_2()
+        ^
+Test_2.scala:15: error: macro applications do not support named and/or default arguments
+  m1_2_2(1)
+        ^
+Test_2.scala:17: error: too many arguments for macro method m1_2_2: (x: Int, y: Int)Unit
+  m1_2_2(1, 2, 3)
+        ^
+Test_2.scala:24: error: macro applications do not support named and/or default arguments
+  m1_1_inf()
+          ^
+Test_2.scala:29: error: macro applications do not support named and/or default arguments
+  m1_2_inf()
+          ^
+Test_2.scala:30: error: macro applications do not support named and/or default arguments
+  m1_2_inf(1)
+          ^
+Test_2.scala:35: error: too many arguments for macro method m2_0_0: ()Unit
+  m2_0_0()(1)
+          ^
+Test_2.scala:36: error: too many arguments for macro method m2_0_0: ()Unit
+  m2_0_0()(1, 2)
+          ^
+Test_2.scala:37: error: too many arguments for macro method m2_0_0: ()Unit
+  m2_0_0()(1, 2, 3)
+          ^
+Test_2.scala:39: error: macro applications do not support named and/or default arguments
+  m2_1_1()()
+          ^
+Test_2.scala:41: error: too many arguments for macro method m2_1_1: (x: Int)Unit
+  m2_1_1()(1, 2)
+          ^
+Test_2.scala:42: error: too many arguments for macro method m2_1_1: (x: Int)Unit
+  m2_1_1()(1, 2, 3)
+          ^
+Test_2.scala:44: error: macro applications do not support named and/or default arguments
+  m2_2_2()()
+          ^
+Test_2.scala:45: error: macro applications do not support named and/or default arguments
+  m2_2_2()(1)
+          ^
+Test_2.scala:47: error: too many arguments for macro method m2_2_2: (x: Int, y: Int)Unit
+  m2_2_2()(1, 2, 3)
+          ^
+Test_2.scala:54: error: macro applications do not support named and/or default arguments
+  m2_1_inf()()
+            ^
+Test_2.scala:59: error: macro applications do not support named and/or default arguments
+  m2_2_inf()()
+            ^
+Test_2.scala:60: error: macro applications do not support named and/or default arguments
+  m2_2_inf()(1)
+            ^
+24 errors found
diff --git a/test/files/neg/t7157/Impls_Macros_1.scala b/test/files/neg/t7157/Impls_Macros_1.scala
new file mode 100644
index 0000000000..09f423fbab
--- /dev/null
+++ b/test/files/neg/t7157/Impls_Macros_1.scala
@@ -0,0 +1,32 @@
+import scala.reflect.macros.Context
+import language.experimental.macros
+
+object Macros {
+  def impl1_0_0(c: Context)() = c.literalUnit
+  def impl1_1_1(c: Context)(x: c.Expr[Int]) = c.literalUnit
+  def impl1_2_2(c: Context)(x: c.Expr[Int], y: c.Expr[Int]) = c.literalUnit
+  def m1_0_0() = macro impl1_0_0
+  def m1_1_1(x: Int) = macro impl1_1_1
+  def m1_2_2(x: Int, y: Int) = macro impl1_2_2
+
+  def impl1_0_inf(c: Context)(x: c.Expr[Int]*) = c.literalUnit
+  def impl1_1_inf(c: Context)(x: c.Expr[Int], y: c.Expr[Int]*) = c.literalUnit
+  def impl1_2_inf(c: Context)(x: c.Expr[Int], y: c.Expr[Int], z: c.Expr[Int]*) = c.literalUnit
+  def m1_0_inf(x: Int*) = macro impl1_0_inf
+  def m1_1_inf(x: Int, y: Int*) = macro impl1_1_inf
+  def m1_2_inf(x: Int, y: Int, z: Int*) = macro impl1_2_inf
+
+  def impl2_0_0(c: Context)()() = c.literalUnit
+  def impl2_1_1(c: Context)()(x: c.Expr[Int]) = c.literalUnit
+  def impl2_2_2(c: Context)()(x: c.Expr[Int], y: c.Expr[Int]) = c.literalUnit
+  def m2_0_0()() = macro impl2_0_0
+  def m2_1_1()(x: Int) = macro impl2_1_1
+  def m2_2_2()(x: Int, y: Int) = macro impl2_2_2
+
+  def impl2_0_inf(c: Context)()(x: c.Expr[Int]*) = c.literalUnit
+  def impl2_1_inf(c: Context)()(x: c.Expr[Int], y: c.Expr[Int]*) = c.literalUnit
+  def impl2_2_inf(c: Context)()(x: c.Expr[Int], y: c.Expr[Int], z: c.Expr[Int]*) = c.literalUnit
+  def m2_0_inf()(x: Int*) = macro impl2_0_inf
+  def m2_1_inf()(x: Int, y: Int*) = macro impl2_1_inf
+  def m2_2_inf()(x: Int, y: Int, z: Int*) = macro impl2_2_inf
+}
+\ No newline at end of file
diff --git a/test/files/neg/t7157/Test_2.scala b/test/files/neg/t7157/Test_2.scala
new file mode 100644
index 0000000000..45a6026399
--- /dev/null
+++ b/test/files/neg/t7157/Test_2.scala
@@ -0,0 +1,63 @@
+import Macros._
+
+object Test extends App {
+  m1_0_0()
+  m1_0_0(1)
+  m1_0_0(1, 2)
+  m1_0_0(1, 2, 3)
+
+  m1_1_1()
+  m1_1_1(1)
+  m1_1_1(1, 2)
+  m1_1_1(1, 2, 3)
+
+  m1_2_2()
+  m1_2_2(1)
+  m1_2_2(1, 2)
+  m1_2_2(1, 2, 3)
+
+  m1_0_inf()
+  m1_0_inf(1)
+  m1_0_inf(1, 2)
+  m1_0_inf(1, 2, 3)
+
+  m1_1_inf()
+  m1_1_inf(1)
+  m1_1_inf(1, 2)
+  m1_1_inf(1, 2, 3)
+
+  m1_2_inf()
+  m1_2_inf(1)
+  m1_2_inf(1, 2)
+  m1_2_inf(1, 2, 3)
+
+  m2_0_0()()
+  m2_0_0()(1)
+  m2_0_0()(1, 2)
+  m2_0_0()(1, 2, 3)
+
+  m2_1_1()()
+  m2_1_1()(1)
+  m2_1_1()(1, 2)
+  m2_1_1()(1, 2, 3)
+
+  m2_2_2()()
+  m2_2_2()(1)
+  m2_2_2()(1, 2)
+  m2_2_2()(1, 2, 3)
+
+  m2_0_inf()()
+  m2_0_inf()(1)
+  m2_0_inf()(1, 2)
+  m2_0_inf()(1, 2, 3)
+
+  m2_1_inf()()
+  m2_1_inf()(1)
+  m2_1_inf()(1, 2)
+  m2_1_inf()(1, 2, 3)
+
+  m2_2_inf()()
+  m2_2_inf()(1)
+  m2_2_inf()(1, 2)
+  m2_2_inf()(1, 2, 3)
+}
+\ No newline at end of file