From c0de8fd882c937b7d05368ce0dd5548edea7f839 Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Thu, 18 Sep 2003 10:00:06 +0000
Subject: *** empty log message ***

---
 test/files/neg/S6.check         | 2 +-
 test/files/neg/S7.check         | 2 +-
 test/files/neg/bug128_129.check | 9 ++++++---
 test/files/neg/bug96.check      | 3 +--
 test/files/neg/matthias2.check  | 4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'test/files')

diff --git a/test/files/neg/S6.check b/test/files/neg/S6.check
index 0647138103..6303e4c8e2 100644
--- a/test/files/neg/S6.check
+++ b/test/files/neg/S6.check
@@ -1,4 +1,4 @@
-S6.scala:11: cyclic aliasing or subtyping involving type S
+S6.scala:11: illegal cyclic reference involving type S
     type S <: T;
          ^
 one error found
diff --git a/test/files/neg/S7.check b/test/files/neg/S7.check
index c12c624cd7..59c57786b3 100644
--- a/test/files/neg/S7.check
+++ b/test/files/neg/S7.check
@@ -1,4 +1,4 @@
 S7.scala:6: illegal cyclic reference involving class S7.A
     class C() extends a.A() {}
-                         ^
+                       ^
 one error found
diff --git a/test/files/neg/bug128_129.check b/test/files/neg/bug128_129.check
index d410b57095..79b20ec4a5 100644
--- a/test/files/neg/bug128_129.check
+++ b/test/files/neg/bug128_129.check
@@ -1,7 +1,10 @@
-bug128_129.scala:3: variable not allowed under alternative
+bug128_129.scala:3: '=' expected but identifier found.
     val x | 1 = 2; // not allowed
-        ^
+          ^
+bug128_129.scala:3: illegal start of expression
+    val x | 1 = 2; // not allowed
+                 ^
 bug128_129.scala:10: recursive patterns not allowed
         case PT(a@PT(a)) =>  // not allowed
                      ^
-two errors found
+three errors found
diff --git a/test/files/neg/bug96.check b/test/files/neg/bug96.check
index ab5871b39e..1ceaa84a94 100644
--- a/test/files/neg/bug96.check
+++ b/test/files/neg/bug96.check
@@ -1,5 +1,4 @@
-bug96.scala:5: method foo in class B of type (def scala.Any)scala.Object
- cannot override method foo in class A of type (scala.Any)scala.Object
+bug96.scala:5: method foo overrides nothing
     override def foo(def x: Any): Object = null;
                  ^
 one error found
diff --git a/test/files/neg/matthias2.check b/test/files/neg/matthias2.check
index 052be577b5..b9a6d799f9 100644
--- a/test/files/neg/matthias2.check
+++ b/test/files/neg/matthias2.check
@@ -1,4 +1,4 @@
-matthias2.scala:7: cyclic aliasing or subtyping involving value y
+matthias2.scala:7: illegal cyclic reference involving value y
     override val y: T;
-                 ^
+                    ^
 one error found
-- 
cgit v1.2.3