summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2012-02-03 07:44:41 +0100
committerMartin Odersky <odersky@gmail.com>2012-02-03 07:44:41 +0100
commitb4cfd1161e9f549a909d9f563f557c17dbddad00 (patch)
tree63d64dfdd30322c211e1805df670aec3aeb3659e /test/files/neg
parente9a70f564a29ec0e2262cc9e6608c990b6b05274 (diff)
downloadscala-b4cfd1161e9f549a909d9f563f557c17dbddad00.tar.gz
scala-b4cfd1161e9f549a909d9f563f557c17dbddad00.tar.bz2
scala-b4cfd1161e9f549a909d9f563f557c17dbddad00.zip
intermediate work towards a new starr for value classes.
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/override-object-no.check12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/files/neg/override-object-no.check b/test/files/neg/override-object-no.check
index 6e028d0add..f9fb37381b 100644
--- a/test/files/neg/override-object-no.check
+++ b/test/files/neg/override-object-no.check
@@ -1,13 +1,13 @@
override-object-no.scala:14: error: overriding object Bar in trait Foo with object Bar in trait Foo2:
an overriding object must conform to the overridden object's class bound;
- found : case1.Bippy with ScalaObject
- required: case1.Bippy with case1.Bippo with ScalaObject
+ found : case1.Bippy
+ required: case1.Bippy with case1.Bippo
override object Bar extends Bippy { // err
^
override-object-no.scala:21: error: overriding object Bar in trait Quux1 with object Bar in trait Quux2:
an overriding object must conform to the overridden object's class bound;
- found : Object with ScalaObject{def g: String}
- required: Object with ScalaObject{def g: Int}
+ found : Object{def g: String}
+ required: Object{def g: Int}
trait Quux2 extends Quux1 { override object Bar { def g = "abc" } } // err
^
override-object-no.scala:25: error: overriding object Bar in trait Quux3 of type object Quux4.this.Bar;
@@ -16,8 +16,8 @@ override-object-no.scala:25: error: overriding object Bar in trait Quux3 of type
^
override-object-no.scala:43: error: overriding object A in class Foo with object A in class P2:
an overriding object must conform to the overridden object's class bound;
- found : case2.Bar[List[String]] with ScalaObject
- required: case2.Bar[Traversable[String]] with ScalaObject
+ found : case2.Bar[List[String]]
+ required: case2.Bar[Traversable[String]]
override object A extends Bar[List[String]] // err
^
four errors found