summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2007-10-26 17:29:12 +0000
committerMartin Odersky <odersky@gmail.com>2007-10-26 17:29:12 +0000
commitf5aa270473e0c335bd1a7a6b7f10f87b54a5d45e (patch)
treef215dcc233074a2047264c955eca26a0bf76cb74 /test/files/neg
parente97eb8f50e2ae30c3a651b7f975282659a57e817 (diff)
downloadscala-f5aa270473e0c335bd1a7a6b7f10f87b54a5d45e.tar.gz
scala-f5aa270473e0c335bd1a7a6b7f10f87b54a5d45e.tar.bz2
scala-f5aa270473e0c335bd1a7a6b7f10f87b54a5d45e.zip
added/modified check files
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/bug987.check6
-rw-r--r--test/files/neg/t0152.check6
2 files changed, 9 insertions, 3 deletions
diff --git a/test/files/neg/bug987.check b/test/files/neg/bug987.check
index 5da1e1cbe3..4cad622ab8 100644
--- a/test/files/neg/bug987.check
+++ b/test/files/neg/bug987.check
@@ -1,16 +1,16 @@
bug987.scala:15: error: illegal inheritance;
class E inherits different type instances of trait B:
-B[C] and B[D]
+B[D] and B[C]
class E extends D
^
bug987.scala:20: error: illegal inheritance;
class F inherits different type instances of trait B:
-B[C] and B[D]
+B[D] and B[C]
class F extends D
^
bug987.scala:25: error: illegal inheritance;
class D inherits different type instances of trait B:
-B[C] and B[D]
+B[D] and B[C]
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]]
diff --git a/test/files/neg/t0152.check b/test/files/neg/t0152.check
new file mode 100644
index 0000000000..84f78dc83c
--- /dev/null
+++ b/test/files/neg/t0152.check
@@ -0,0 +1,6 @@
+t0152.scala:10: error: illegal inheritance;
+ object boom inherits different type instances of class Value:
+Value[Int] and Value[java.lang.String]
+ object boom extends Value[java.lang.String]("foo") with PlusOne
+ ^
+one error found