Merge branch 'master' of https://github.com/scala/scala into wip-sip14-fixes

1 files changed, 17 insertions, 0 deletions

diff --git a/test/files/run/macro-undetparams-consfromsls/Impls_Macros_1.scala b/test/files/run/macro-undetparams-consfromsls/Impls_Macros_1.scala
new file mode 100644
index 0000000000..c22ff96028
--- /dev/null
+++ b/test/files/run/macro-undetparams-consfromsls/Impls_Macros_1.scala
@@ -0,0 +1,17 @@
+import scala.reflect.makro.Context
+
+object Macros {
+  def cons_impl[A: c.TypeTag](c: Context)(x: c.Expr[A], xs: c.Expr[List[A]]): c.Expr[List[A]] = c.reify {
+    println("A = " + c.literal(implicitly[c.TypeTag[A]].toString).eval)
+    x.eval :: xs.eval
+  }
+
+  def nil_impl[B: c.TypeTag](c: Context): c.Expr[List[B]] = c.reify {
+    println("B = " + c.literal(implicitly[c.TypeTag[B]].toString).eval)
+    Nil
+  }
+
+  def cons[A](x: A, xs: List[A]): List[A] = macro cons_impl[A]
+
+  def nil[B]: List[B] = macro nil_impl[B]
+}
\ No newline at end of file