summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2003-09-18 10:00:06 +0000
committerMartin Odersky <odersky@gmail.com>2003-09-18 10:00:06 +0000
commitc0de8fd882c937b7d05368ce0dd5548edea7f839 (patch)
tree5c744cef4bb771689c8e81c896b337bd43199fa9 /test
parent5b9b5356411cbd5e4de94d6c84832f99cd10b5de (diff)
downloadscala-c0de8fd882c937b7d05368ce0dd5548edea7f839.tar.gz
scala-c0de8fd882c937b7d05368ce0dd5548edea7f839.tar.bz2
scala-c0de8fd882c937b7d05368ce0dd5548edea7f839.zip
*** empty log message ***
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/S6.check2
-rw-r--r--test/files/neg/S7.check2
-rw-r--r--test/files/neg/bug128_129.check9
-rw-r--r--test/files/neg/bug96.check3
-rw-r--r--test/files/neg/matthias2.check4
-rw-r--r--test/neg/S6.check2
-rw-r--r--test/neg/S7.check2
-rw-r--r--test/neg/bug128_129.check9
-rw-r--r--test/neg/bug96.check3
-rw-r--r--test/neg/matthias2.check4
10 files changed, 22 insertions, 18 deletions
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
diff --git a/test/neg/S6.check b/test/neg/S6.check
index 0647138103..6303e4c8e2 100644
--- a/test/neg/S6.check
+++ b/test/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/neg/S7.check b/test/neg/S7.check
index c12c624cd7..59c57786b3 100644
--- a/test/neg/S7.check
+++ b/test/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/neg/bug128_129.check b/test/neg/bug128_129.check
index d410b57095..79b20ec4a5 100644
--- a/test/neg/bug128_129.check
+++ b/test/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/neg/bug96.check b/test/neg/bug96.check
index ab5871b39e..1ceaa84a94 100644
--- a/test/neg/bug96.check
+++ b/test/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/neg/matthias2.check b/test/neg/matthias2.check
index 052be577b5..b9a6d799f9 100644
--- a/test/neg/matthias2.check
+++ b/test/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