diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-05-25 07:03:13 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-05-25 07:03:13 -0700 |
| commit | 825ef677016d5a4506eb601a1c49b283751fdee5 (patch) | |
| tree | f68487aa5ca92c171f724ff12427e8d9eb5bc4a0 /test/files | |
| parent | e506e8a2ca52ebc31d31dc0c82b6f266a0675466 (diff) | |
| parent | ea78793c618968d8211c5eb353b057b7b5d1bfbb (diff) | |
| download | scala-825ef677016d5a4506eb601a1c49b283751fdee5.tar.gz scala-825ef677016d5a4506eb601a1c49b283751fdee5.tar.bz2 scala-825ef677016d5a4506eb601a1c49b283751fdee5.zip | |
Merge pull request #613 from hubertp/issue/5821
Closes SI-5821.
Diffstat (limited to 'test/files')
| -rw-r--r-- | test/files/buildmanager/t2792/t2792.check | 3 | ||||
| -rw-r--r-- | test/files/neg/t5821.check | 4 | ||||
| -rw-r--r-- | test/files/neg/t5821.scala | 8 | ||||
| -rw-r--r-- | test/files/neg/t639.check | 5 |
4 files changed, 19 insertions, 1 deletions
diff --git a/test/files/buildmanager/t2792/t2792.check b/test/files/buildmanager/t2792/t2792.check index 68e14c6386..00a2b83469 100644 --- a/test/files/buildmanager/t2792/t2792.check +++ b/test/files/buildmanager/t2792/t2792.check @@ -9,3 +9,6 @@ compiling Set(A2.scala) A2.scala:2: error: stable identifier required, but A.x found. import A.x.y ^ +A2.scala:3: error: not found: value y + val z = y + ^ diff --git a/test/files/neg/t5821.check b/test/files/neg/t5821.check new file mode 100644 index 0000000000..f9c00604bc --- /dev/null +++ b/test/files/neg/t5821.check @@ -0,0 +1,4 @@ +t5821.scala:1: error: not found: object SthImportant +import SthImportant._ + ^ +one error found diff --git a/test/files/neg/t5821.scala b/test/files/neg/t5821.scala new file mode 100644 index 0000000000..4af0a2bf7f --- /dev/null +++ b/test/files/neg/t5821.scala @@ -0,0 +1,8 @@ +import SthImportant._ + +class Bar + +class Foo2 { + type Sth = Array[Bar] + def foo(xs: Sth): Bar = if ((xs eq null) || (xs.length == 0)) null else xs(0) +} diff --git a/test/files/neg/t639.check b/test/files/neg/t639.check index 3b53da0515..6d41d872de 100644 --- a/test/files/neg/t639.check +++ b/test/files/neg/t639.check @@ -1,4 +1,7 @@ t639.scala:3: error: not found: object a import a._ ^ -one error found +t639.scala:5: error: not found: type B +@B + ^ +two errors found |