summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2009-08-13 08:37:29 +0000
committerAdriaan Moors <adriaan.moors@epfl.ch>2009-08-13 08:37:29 +0000
commitabc5b5f47f4bb963e229cb90a6ff93152ee09a98 (patch)
tree91ce7d7d7da87a069b62ab2647cea99b568c55e6 /test/files/neg
parent2416d5724eb7fba3ed5b80092194a27e333a23f3 (diff)
downloadscala-abc5b5f47f4bb963e229cb90a6ff93152ee09a98.tar.gz
scala-abc5b5f47f4bb963e229cb90a6ff93152ee09a98.tar.bz2
scala-abc5b5f47f4bb963e229cb90a6ff93152ee09a98.zip
fixed #2251
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/bug987.check29
1 files changed, 13 insertions, 16 deletions
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