Merge commit 'refs/pull/1844/head' into merge/pr-1844

* commit 'refs/pull/1844/head':
  macroExpandAll is now triggered by typed
  SI-5923 adapt macros when they are deferred
  generalizes macroExpand
  typedPrimaryConstrBody now returns supercall
  more precise errors for macros
  parentTypes => typedParentTypes
  changes isTermMacro checks to something more universal
  fixes printing of AppliedTypeTree
  adds Trees.replace(Tree, Tree)
  makes macro override error more consistent
  refactors handling of macros in repl
  SI-5903 extractor macros do work
  adds c.macroRole

Conflicts:
	src/compiler/scala/tools/nsc/typechecker/Macros.scala
	src/compiler/scala/tools/nsc/typechecker/Typers.scala

1 files changed, 15 insertions, 0 deletions

diff --git a/test/files/run/macro-expand-unapply-a/Impls_Macros_1.scala b/test/files/run/macro-expand-unapply-a/Impls_Macros_1.scala
new file mode 100644
index 0000000000..61d6345f16
--- /dev/null
+++ b/test/files/run/macro-expand-unapply-a/Impls_Macros_1.scala
@@ -0,0 +1,15 @@
+import scala.reflect.macros.Context
+
+object Helper {
+  def unapplySeq[T](x: List[T]): Option[Seq[T]] = List.unapplySeq[T](x)
+}
+
+object Macros {
+  def impl[T: c.WeakTypeTag](c: Context)(x: c.Expr[List[T]]) = {
+    c.universe.reify(Helper.unapplySeq(x.splice))
+  }
+
+  object UnapplyMacro {
+    def unapplySeq[T](x: List[T]): Option[Seq[T]] = macro impl[T]
+  }
+}
\ No newline at end of file