diff options
| author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-11-02 00:15:06 +0000 |
|---|---|---|
| committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-11-02 00:15:06 +0000 |
| commit | b80f27780458da880d47392e4ac747d196af355e (patch) | |
| tree | db857dc93086a6e11d4af0cef7a8a8506a55ba00 /test/files/neg | |
| parent | b9982a3d3d338d097fbee082c5f6778f6494f5cd (diff) | |
| download | scala-b80f27780458da880d47392e4ac747d196af355e.tar.gz scala-b80f27780458da880d47392e4ac747d196af355e.tar.bz2 scala-b80f27780458da880d47392e4ac747d196af355e.zip | |
Don't crash the compiler for the 'companions in...
Don't crash the compiler for the 'companions in different files'
error. This turned out to be pretty bad for the presentation compiler.
References #1286. Review by extempore
Diffstat (limited to 'test/files/neg')
| -rw-r--r-- | test/files/neg/bug1286.check | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/files/neg/bug1286.check b/test/files/neg/bug1286.check index 9bf63252cc..734964e9cf 100644 --- a/test/files/neg/bug1286.check +++ b/test/files/neg/bug1286.check @@ -1,2 +1,7 @@ -error: fatal error: Companions 'object Foo' and 'trait Foo' must be defined in same file. -one error found +a.scala:1: error: Companions 'object Foo' and 'trait Foo' must be defined in same file +trait Foo { + ^ +b.scala:1: error: Companions 'trait Foo' and 'object Foo' must be defined in same file +object Foo extends Foo { + ^ +two errors found |