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

1 files changed, 19 insertions, 0 deletions

diff --git a/test/files/run/macro-reify-freevars/Macros_1.scala b/test/files/run/macro-reify-freevars/Macros_1.scala
new file mode 100644
index 0000000000..3cc559a0af
--- /dev/null
+++ b/test/files/run/macro-reify-freevars/Macros_1.scala
@@ -0,0 +1,19 @@
+package scala.collection.slick
+object QueryableMacros{
+  def map[T:c.TypeTag, S:c.TypeTag]
+         (c: scala.reflect.makro.Context)
+         (projection: c.mirror.Expr[T => S])
+         : c.mirror.Expr[scala.collection.slick.Queryable[S]] = {
+    import c.mirror._
+    val code = EmptyTree
+    c.reify{
+      Queryable.factory[S]( code.asInstanceOf[reflect.mirror.Tree] )
+    }
+  }
+}
+class Queryable[T]{
+  def map[S]( projection: T => S ) : Queryable[S] = macro QueryableMacros.map[T,S]
+}
+object Queryable{
+  def factory[S]( projection:scala.reflect.mirror.Tree ) : Queryable[S] = null
+}
\ No newline at end of file