summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2011-05-11 12:25:38 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2011-05-11 12:25:38 +0000
commit5cb02cfac450f3c283aaf7ff113ee727b6ee68fe (patch)
tree1022206cbf4f0385ebcbb2f2ccf7fc5b113a2f7a
parent70d1014c4f9b8799ba91d050697943fe82edaf19 (diff)
downloadscala-5cb02cfac450f3c283aaf7ff113ee727b6ee68fe.tar.gz
scala-5cb02cfac450f3c283aaf7ff113ee727b6ee68fe.tar.bz2
scala-5cb02cfac450f3c283aaf7ff113ee727b6ee68fe.zip
Merged revisions 24925 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r24925 | odersky | 2011-05-11 14:16:21 +0200 (Wed, 11 May 2011) | 1 line New test. No review. ........
-rw-r--r--test/files/run/t4560.check1
-rw-r--r--test/files/run/t4560.scala23
2 files changed, 24 insertions, 0 deletions
diff --git a/test/files/run/t4560.check b/test/files/run/t4560.check
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/test/files/run/t4560.check
@@ -0,0 +1 @@
+5
diff --git a/test/files/run/t4560.scala b/test/files/run/t4560.scala
new file mode 100644
index 0000000000..f1eb5d4169
--- /dev/null
+++ b/test/files/run/t4560.scala
@@ -0,0 +1,23 @@
+object Pimper {
+ implicit def pimp(i: Int) = new {
+ def test: String = i.toString
+ }
+}
+
+trait A
+
+trait B {
+ self: A =>
+
+ def test {
+ import Pimper.pimp
+
+ println(5.test)
+ }
+}
+
+object Test extends A with B {
+ def main(args: Array[String]) {
+ test
+ }
+}