diff options
author | Martin Odersky <odersky@gmail.com> | 2004-01-12 10:56:44 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2004-01-12 10:56:44 +0000 |
commit | 5665f6b29c900fbfeee2f8f45752bc74947093d7 (patch) | |
tree | 16754135e12c6d8ac32d941dfb45cc80cf4c40e0 /test/files | |
parent | 8698d99b934a7982353db3632abfc54d0acb80f3 (diff) | |
download | scala-5665f6b29c900fbfeee2f8f45752bc74947093d7.tar.gz scala-5665f6b29c900fbfeee2f8f45752bc74947093d7.tar.bz2 scala-5665f6b29c900fbfeee2f8f45752bc74947093d7.zip |
*** empty log message ***
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/neg/S4.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug152.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug58.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug95.check | 10 | ||||
-rw-r--r-- | test/files/neg/constrparams.check | 2 |
5 files changed, 13 insertions, 5 deletions
diff --git a/test/files/neg/S4.check b/test/files/neg/S4.check index 1297b6d18c..c8de54cd39 100644 --- a/test/files/neg/S4.check +++ b/test/files/neg/S4.check @@ -1,4 +1,4 @@ -S4.scala:4: type a.type escapes its defining scope as part of a.Inner { def foo(a.Inner): a.Inner, val b$: Other, def b: Other } +S4.scala:4: type a.type escapes its defining scope as part of a.Inner with scala.ScalaObject { def foo(a.Inner): a.Inner, val b$: Other, def b: Other } class S4(a: Other) extends a.Inner() { ^ one error found diff --git a/test/files/neg/bug152.check b/test/files/neg/bug152.check index fddfbfa879..7b1f3262ce 100644 --- a/test/files/neg/bug152.check +++ b/test/files/neg/bug152.check @@ -1,4 +1,4 @@ -bug152.scala:5: type foo.type escapes its defining scope as part of scala.Object { def a: foo.T } +bug152.scala:5: type foo.type escapes its defining scope as part of java.lang.Object with scala.ScalaObject { def a: foo.T } class Bar(foo: Foo) { ^ one error found diff --git a/test/files/neg/bug58.check b/test/files/neg/bug58.check index 1872ecd0d9..0dff5495cf 100644 --- a/test/files/neg/bug58.check +++ b/test/files/neg/bug58.check @@ -1,4 +1,4 @@ -bug58.scala:1: type x.type escapes its defining scope as part of x.C +bug58.scala:1: type x.type escapes its defining scope as part of x.C with scala.ScalaObject class A(x: B) extends x.C {} ^ one error found diff --git a/test/files/neg/bug95.check b/test/files/neg/bug95.check index 0f67daa2fe..8dd3507cd9 100644 --- a/test/files/neg/bug95.check +++ b/test/files/neg/bug95.check @@ -1,7 +1,15 @@ bug95.scala:1: illegal inheritance from sealed class class C extends AnyVal; ^ +bug95.scala:1: illegal inheritance; + scala.AnyVal does not conform to scala.ScalaObject's supertype +class C extends AnyVal; + ^ bug95.scala:2: illegal inheritance from sealed class class T extends Unit; ^ -two errors found +bug95.scala:2: illegal inheritance; + scala.Unit does not conform to scala.ScalaObject's supertype +class T extends Unit; + ^ +four errors found diff --git a/test/files/neg/constrparams.check b/test/files/neg/constrparams.check index a9b7c39573..6aef035af0 100644 --- a/test/files/neg/constrparams.check +++ b/test/files/neg/constrparams.check @@ -3,7 +3,7 @@ constrparams.scala:4: type mismatch; required: x.t private val z: x.t = null; //error ^ -constrparams.scala:1: type x.type escapes its defining scope as part of scala.Object { type t, val y$: x.type, def y: x.type, val z$: x.t, def z: x.t } +constrparams.scala:1: type x.type escapes its defining scope as part of java.lang.Object with scala.ScalaObject { type t, val y$: x.type, def y: x.type, val z$: x.t, def z: x.t } abstract class C(x: C) { ^ two errors found |