diff options
author | Paul Phillips <paulp@improving.org> | 2011-10-15 00:14:04 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-10-15 00:14:04 +0000 |
commit | e52053f10b65105ca6ba58806da41a0d14803a37 (patch) | |
tree | 644632ac8a1f7c7e2a34f15286b6c859ea964847 /test/files | |
parent | 9ea2cefb2079aebad2b215f6a699fe6262e2c7a7 (diff) | |
download | scala-e52053f10b65105ca6ba58806da41a0d14803a37.tar.gz scala-e52053f10b65105ca6ba58806da41a0d14803a37.tar.bz2 scala-e52053f10b65105ca6ba58806da41a0d14803a37.zip |
Fix regression in companion check.
Pulling back from expensive path normalization caused a regression where
companions were no longer recognized as such after specialization.
(Specifically, the paths turned up as "test.scala" and "./test.scala".)
I made it a two-level check, doing the expensive one before failing.
Closes SI-5023, no review.
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/neg/t1286.check | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/files/neg/t1286.check b/test/files/neg/t1286.check index 734964e9cf..2699f0789d 100644 --- a/test/files/neg/t1286.check +++ b/test/files/neg/t1286.check @@ -1,7 +1,9 @@ -a.scala:1: error: Companions 'object Foo' and 'trait Foo' must be defined in same file +a.scala:1: error: Companions 'object Foo' and 'trait Foo' must be defined in same file: + Found in files/neg/t1286/b.scala and files/neg/t1286/a.scala trait Foo { ^ -b.scala:1: error: Companions 'trait Foo' and 'object Foo' must be defined in same file +b.scala:1: error: Companions 'trait Foo' and 'object Foo' must be defined in same file: + Found in files/neg/t1286/a.scala and files/neg/t1286/b.scala object Foo extends Foo { ^ two errors found |