summaryrefslogtreecommitdiff
path: root/test/files/neg/bug1183.check
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2007-07-02 16:30:19 +0000
committerMartin Odersky <odersky@gmail.com>2007-07-02 16:30:19 +0000
commit01292462bee9479f4ef5731f8ad7d4d8b00cc805 (patch)
treef144e698b66b3b44dd002843913cc665677310df /test/files/neg/bug1183.check
parent6f5102c26b0f96778810b2600c14aa05c8c1a64a (diff)
downloadscala-01292462bee9479f4ef5731f8ad7d4d8b00cc805.tar.gz
scala-01292462bee9479f4ef5731f8ad7d4d8b00cc805.tar.bz2
scala-01292462bee9479f4ef5731f8ad7d4d8b00cc805.zip
updated check file
Diffstat (limited to 'test/files/neg/bug1183.check')
-rw-r--r--test/files/neg/bug1183.check8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/files/neg/bug1183.check b/test/files/neg/bug1183.check
index 9b42dccb8d..50b236187e 100644
--- a/test/files/neg/bug1183.check
+++ b/test/files/neg/bug1183.check
@@ -1,17 +1,17 @@
bug1183.scala:10: error: name clash: class Foo defines object Baz
- and its companion module object Foo defines class Baz
+and its companion object Foo also defines class Baz
object Baz
^
bug1183.scala:11: error: name clash: class Foo defines class Bam
- and its companion module object Foo defines object Bam
+and its companion object Foo also defines object Bam
class Bam
^
bug1183.scala:12: error: name clash: class Foo defines object Bar
- and its companion module object Foo defines class Bar
+and its companion object Foo also defines class Bar
object Bar
^
bug1183.scala:13: error: name clash: class Foo defines class Bar
- and its companion module object Foo defines class Bar
+and its companion object Foo also defines class Bar
case class Bar(i:Int)
^
four errors found