diff options
| author | Guillaume Martres <smarter@ubuntu.com> | 2015-10-30 18:32:47 +0900 |
|---|---|---|
| committer | Guillaume Martres <smarter@ubuntu.com> | 2015-10-30 18:32:47 +0900 |
| commit | edfb6e72076b216c4762b52a5b9558fd9d106148 (patch) | |
| tree | 2b8d79b296ce5c8bc56dcb831e6b324a0330748d /tests | |
| parent | 201ce2f1d11bf3940291f6c800ec9dedead6c2a5 (diff) | |
| parent | 4f9b5cc0b785e8a4e5375407b695278fecb94588 (diff) | |
| download | dotty-edfb6e72076b216c4762b52a5b9558fd9d106148.tar.gz dotty-edfb6e72076b216c4762b52a5b9558fd9d106148.tar.bz2 dotty-edfb6e72076b216c4762b52a5b9558fd9d106148.zip | |
Merge pull request #886 from dotty-staging/fix-#884
Fix #884 - misdiagnosed ambiguous definition.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/neg/typedIdents/PQ.scala | 6 | ||||
| -rw-r--r-- | tests/neg/typedIdents/typedIdents.scala (renamed from tests/neg/typedIdents.scala) | 6 | ||||
| -rw-r--r-- | tests/pos/i884.scala | 4 | ||||
| -rw-r--r-- | tests/pos/overloadedAccess.scala | 1 | ||||
| -rw-r--r-- | tests/pos/typedIdents/PQ.scala | 6 | ||||
| -rw-r--r-- | tests/pos/typedIdents/typedIdents.scala (renamed from tests/pos/typedIdents.scala) | 6 |
6 files changed, 16 insertions, 13 deletions
diff --git a/tests/neg/typedIdents/PQ.scala b/tests/neg/typedIdents/PQ.scala new file mode 100644 index 000000000..8a5afede0 --- /dev/null +++ b/tests/neg/typedIdents/PQ.scala @@ -0,0 +1,6 @@ +package P { + object X { val x = 1; val y = 2 } +} +package Q { + object X { val x = true; val y = "" } +} diff --git a/tests/neg/typedIdents.scala b/tests/neg/typedIdents/typedIdents.scala index cb7cca743..4937edfe3 100644 --- a/tests/neg/typedIdents.scala +++ b/tests/neg/typedIdents/typedIdents.scala @@ -1,9 +1,3 @@ -package P { - object X { val x = 1; val y = 2 } -} -package Q { - object X { val x = true; val y = "" } -} package P { // `X' bound by package clause import Console._ // `println' bound by wildcard import object A { diff --git a/tests/pos/i884.scala b/tests/pos/i884.scala new file mode 100644 index 000000000..29e53b9be --- /dev/null +++ b/tests/pos/i884.scala @@ -0,0 +1,4 @@ +import scala.reflect._ + +object `package` { +} diff --git a/tests/pos/overloadedAccess.scala b/tests/pos/overloadedAccess.scala index a2d72f583..10168b61d 100644 --- a/tests/pos/overloadedAccess.scala +++ b/tests/pos/overloadedAccess.scala @@ -14,5 +14,4 @@ object overloadedAccess { val x = f("abc") val y: Int = x } - } diff --git a/tests/pos/typedIdents/PQ.scala b/tests/pos/typedIdents/PQ.scala new file mode 100644 index 000000000..8a5afede0 --- /dev/null +++ b/tests/pos/typedIdents/PQ.scala @@ -0,0 +1,6 @@ +package P { + object X { val x = 1; val y = 2 } +} +package Q { + object X { val x = true; val y = "" } +} diff --git a/tests/pos/typedIdents.scala b/tests/pos/typedIdents/typedIdents.scala index e99b5a045..95b9f1b63 100644 --- a/tests/pos/typedIdents.scala +++ b/tests/pos/typedIdents/typedIdents.scala @@ -1,9 +1,3 @@ -package P { - object X { val x = 1; val y = 2 } -} -package Q { - object X { val x = true; val y = "" } -} package P { // `X' bound by package clause import Console._ // `println' bound by wildcard import object A { |