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

2 files changed, 41 insertions, 0 deletions

diff --git a/test/files/run/macro-sip19/Impls_Macros_1.scala b/test/files/run/macro-sip19/Impls_Macros_1.scala
new file mode 100644
index 0000000000..39b29ad64c
--- /dev/null
+++ b/test/files/run/macro-sip19/Impls_Macros_1.scala
@@ -0,0 +1,25 @@
+import scala.reflect.makro.Context
+
+object Macros {
+  def impl(c: Context) = {
+    import c.mirror._
+    val Apply(fun, args) = c.enclosingImplicits(0)._2
+    val fileName = fun.pos.fileInfo.getName
+    val line = fun.pos.line
+    val charOffset = fun.pos.point
+    c.reify { SourceLocation(c.literal(fileName).eval, c.literal(line).eval, c.literal(charOffset).eval) }
+  }
+
+  implicit def sourceLocation: SourceLocation = macro impl
+}
+
+case class SourceLocation(
+  /** The name of the source file */
+  val fileName: String,
+
+  /** The line number */
+  val line: Int,
+
+  /** The character offset */
+  val charOffset: Int
+)
diff --git a/test/files/run/macro-sip19/Test_2.scala b/test/files/run/macro-sip19/Test_2.scala
new file mode 100644
index 0000000000..32326e6352
--- /dev/null
+++ b/test/files/run/macro-sip19/Test_2.scala
@@ -0,0 +1,16 @@
+import Macros._
+
+object Test extends App {
+  def foo(x: Int, y: Int)(implicit loc0: SourceLocation): Int = {
+    var loc = loc0;
+    {
+      var loc0 = 0 // shadow loc0 to disambiguate with the implicit macro
+      println("hey, i've been called from %s".format(loc))
+      if (x < y) foo(y, x)
+      else if (y == 0) x
+      else foo(x - y, y)
+    }
+  }
+
+  println(foo(4, 2))
+}