From 7838ff734a2018d626086b02cdae0a1416b84e84 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Fri, 14 Aug 2009 19:59:02 +0000 Subject: fixed check file --- test/files/neg/bug987.check | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'test') diff --git a/test/files/neg/bug987.check b/test/files/neg/bug987.check index 4cad622ab8..ec2ca621fd 100644 --- a/test/files/neg/bug987.check +++ b/test/files/neg/bug987.check @@ -1,19 +1,16 @@ -bug987.scala:15: error: illegal inheritance; - class E inherits different type instances of trait B: -B[D] and B[C] +bug987.scala:15: error: the type intersection D with ScalaObject is malformed + --- because --- +no common type instance of base types B[C], and B[D] exists. class E extends D - ^ -bug987.scala:20: error: illegal inheritance; - class F inherits different type instances of trait B: -B[D] and B[C] + ^ +bug987.scala:20: error: the type intersection D with ScalaObject is malformed + --- because --- +no common type instance of base types B[C], and B[D] exists. class F extends D - ^ -bug987.scala:25: error: illegal inheritance; - class D inherits different type instances of trait B: -B[D] and B[C] + ^ +bug987.scala:25: error: the type intersection C with B[D] with ScalaObject is malformed + --- because --- +no common type instance of base types B[D], and B[C] exists. abstract class D extends C with B[D] {} - ^ -bug987.scala:25: error: type arguments [D] do not conform to trait B's type parameter bounds [T <: B[T]] -abstract class D extends C with B[D] {} - ^ -four errors found + ^ +three errors found -- cgit v1.2.3