Merge pull request #909 from lrytz/t5892

SI-5892 allow implicit views in annotation args

3 files changed, 47 insertions, 0 deletions

diff --git a/test/files/neg/t5892.check b/test/files/neg/t5892.check
new file mode 100644
index 0000000000..839bf9de23
--- /dev/null
+++ b/test/files/neg/t5892.check
@@ -0,0 +1,17 @@
+t5892.scala:5: error: type mismatch;
+ found   : Boolean(false)
+ required: String
+class C[@annot(false) X] {
+               ^
+t5892.scala:9: error: not found: value b2s
+class D[@annot(b2s(false)) X] {
+               ^
+t5892.scala:13: error: type mismatch;
+ found   : Boolean(false)
+ required: String
+@annot(false) class E {
+       ^
+t5892.scala:17: error: not found: value b2s
+@annot(b2s(false)) class F {
+       ^
+four errors found
diff --git a/test/files/neg/t5892.scala b/test/files/neg/t5892.scala
new file mode 100644
index 0000000000..5e3b2f313e
--- /dev/null
+++ b/test/files/neg/t5892.scala
@@ -0,0 +1,25 @@
+import language.implicitConversions
+
+class annot(a: String) extends annotation.StaticAnnotation
+
+class C[@annot(false) X] {
+  implicit def b2s(b: Boolean): String = ""
+}
+
+class D[@annot(b2s(false)) X] {
+  implicit def b2s(b: Boolean): String = ""
+}
+
+@annot(false) class E {
+  implicit def b2s(b: Boolean): String = ""
+}
+
+@annot(b2s(false)) class F {
+  implicit def b2s(b: Boolean): String = ""
+}
+
+object T {
+  implicit def b2s(b: Boolean): String = ""
+  @annot(false) val x = 0
+  @annot(b2s(false)) val y = 0
+}
diff --git a/test/files/pos/t5892.scala b/test/files/pos/t5892.scala
new file mode 100644
index 0000000000..241e59860a
--- /dev/null
+++ b/test/files/pos/t5892.scala
@@ -0,0 +1,5 @@
+class foo(a: String) extends annotation.StaticAnnotation
+object o {
+  implicit def i2s(i: Int) = ""
+  @foo(1: String) def blerg { }
+}