summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-10-23 00:55:22 -0700
committerJason Zaugg <jzaugg@gmail.com>2013-10-23 00:55:22 -0700
commitb9c46ff6d7f337c9fc9c2c58b1c7bc5b95171661 (patch)
tree29698dfa12f8c6a77d431bb4f6f5575a8e9af906
parent6062a9c599ae1b7ecc89ae5296cf04d4627907af (diff)
parente72c32db03b44d6eaf1c1872765a578c5445e15f (diff)
downloadscala-b9c46ff6d7f337c9fc9c2c58b1c7bc5b95171661.tar.gz
scala-b9c46ff6d7f337c9fc9c2c58b1c7bc5b95171661.tar.bz2
scala-b9c46ff6d7f337c9fc9c2c58b1c7bc5b95171661.zip
Merge pull request #3060 from harrah/t7519-b
SI-7519: Additional test case covering sbt/sbt#914
-rw-r--r--test/files/neg/t7519-b.check6
-rw-r--r--test/files/neg/t7519-b/Mac_1.scala14
-rw-r--r--test/files/neg/t7519-b/Use_2.scala8
3 files changed, 28 insertions, 0 deletions
diff --git a/test/files/neg/t7519-b.check b/test/files/neg/t7519-b.check
new file mode 100644
index 0000000000..08d819eeec
--- /dev/null
+++ b/test/files/neg/t7519-b.check
@@ -0,0 +1,6 @@
+Use_2.scala:6: error: type mismatch;
+ found : String
+ required: Q
+ val x: Q = ex.Mac.mac("asdf")
+ ^
+one error found
diff --git a/test/files/neg/t7519-b/Mac_1.scala b/test/files/neg/t7519-b/Mac_1.scala
new file mode 100644
index 0000000000..55b583d24b
--- /dev/null
+++ b/test/files/neg/t7519-b/Mac_1.scala
@@ -0,0 +1,14 @@
+// get expected error message without package declaration
+package ex
+
+import scala.language.experimental.macros
+import scala.reflect.macros._
+
+object IW {
+ def foo(a: String): String = ???
+}
+object Mac {
+ def mac(s: String): String = macro macImpl
+ def macImpl(c: Context)(s: c.Expr[String]): c.Expr[String] =
+ c.universe.reify(IW.foo(s.splice))
+}
diff --git a/test/files/neg/t7519-b/Use_2.scala b/test/files/neg/t7519-b/Use_2.scala
new file mode 100644
index 0000000000..413e40e25e
--- /dev/null
+++ b/test/files/neg/t7519-b/Use_2.scala
@@ -0,0 +1,8 @@
+trait Q
+trait K
+
+object Use {
+ implicit def cd[T](p: T)(implicit ev: T => K): Q = ???
+ val x: Q = ex.Mac.mac("asdf")
+}
+