summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-06-09 10:41:25 -0700
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-06-09 10:41:25 -0700
commit30ef129f322687cbc885d344ca73dd4877fbedd6 (patch)
treed1f4291d42b4d558507fc9b7a2d2a9828d73da55 /test/files/neg
parentc9602af1d7a601604cc813a6ec73323bccaf0259 (diff)
parent666bbe730aa647a8476a33ca79beba671b80b3d2 (diff)
downloadscala-30ef129f322687cbc885d344ca73dd4877fbedd6.tar.gz
scala-30ef129f322687cbc885d344ca73dd4877fbedd6.tar.bz2
scala-30ef129f322687cbc885d344ca73dd4877fbedd6.zip
Merge pull request #694 from retronym/ticket/4831-2
SI-4831 Fix ambiguous import detection for renamed imports.
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/t4831.check7
-rw-r--r--test/files/neg/t4831.scala11
2 files changed, 18 insertions, 0 deletions
diff --git a/test/files/neg/t4831.check b/test/files/neg/t4831.check
new file mode 100644
index 0000000000..3b8b836f05
--- /dev/null
+++ b/test/files/neg/t4831.check
@@ -0,0 +1,7 @@
+t4831.scala:10: error: reference to b is ambiguous;
+it is imported twice in the same scope by
+import O.b
+and import O.{a=>b}
+ println(b)
+ ^
+one error found
diff --git a/test/files/neg/t4831.scala b/test/files/neg/t4831.scala
new file mode 100644
index 0000000000..82346ec57d
--- /dev/null
+++ b/test/files/neg/t4831.scala
@@ -0,0 +1,11 @@
+object O {
+ val a = 0
+ val b = 1
+}
+
+import O.{a => b}
+import O.b
+
+object test {
+ println(b)
+}