Merge branch 'master' into topic/sip18

Conflicts:
	src/compiler/scala/reflect/internal/Definitions.scala

Various improvements to SIP 18 reporting. Made scala library and compiler feature-clean.

1 files changed, 14 insertions, 0 deletions

diff --git a/test/files/run/macro-invalidusage-partialapplication/Impls_Macros_1.scala b/test/files/run/macro-invalidusage-partialapplication/Impls_Macros_1.scala
new file mode 100644
index 0000000000..449b91d074
--- /dev/null
+++ b/test/files/run/macro-invalidusage-partialapplication/Impls_Macros_1.scala
@@ -0,0 +1,14 @@
+import scala.reflect.makro.{Context => Ctx}
+
+object Impls {
+  def foo(c: Ctx)(x: c.Expr[Int])(y: c.Expr[Int]) = {
+    import c.mirror._
+    val sum = Apply(Select(x.tree, newTermName("$plus")), List(y.tree))
+    val body = Apply(Select(Ident(definitions.PredefModule), newTermName("println")), List(sum))
+    Expr[Unit](body)
+  }
+}
+
+object Macros {
+  def foo(x: Int)(y: Int) = macro Impls.foo
+}
\ No newline at end of file