diff options
author | Martin Odersky <odersky@gmail.com> | 2004-01-15 16:17:59 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2004-01-15 16:17:59 +0000 |
commit | 399482a6ba2e61f379703c05aeb47c6c39f0fdfa (patch) | |
tree | 54afc8ff65d5c1a56539ad3af5955034a1f9e6a9 /test/files | |
parent | 08ab698c371a7cf5e0621c3c2d9c882721d79aa8 (diff) | |
download | scala-399482a6ba2e61f379703c05aeb47c6c39f0fdfa.tar.gz scala-399482a6ba2e61f379703c05aeb47c6c39f0fdfa.tar.bz2 scala-399482a6ba2e61f379703c05aeb47c6c39f0fdfa.zip |
*** empty log message ***
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/neg/bug44.check | 4 | ||||
-rw-r--r-- | test/files/neg/refine.check | 4 | ||||
-rw-r--r-- | test/files/neg/vincent1.check | 2 | ||||
-rw-r--r-- | test/files/pos/MailBox.scala | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/test/files/neg/bug44.check b/test/files/neg/bug44.check index 9347758ac9..d40af82749 100644 --- a/test/files/neg/bug44.check +++ b/test/files/neg/bug44.check @@ -1,6 +1,6 @@ bug44.scala:2: type mismatch; - found : scala.Object - required: scala.Object { def t: scala.Int } + found : java.lang.Object + required: java.lang.Object { def t: scala.Int } var x: Object { def t: Int; } = new Object() { ^ one error found diff --git a/test/files/neg/refine.check b/test/files/neg/refine.check index 271451e65e..18f4fad76a 100644 --- a/test/files/neg/refine.check +++ b/test/files/neg/refine.check @@ -1,6 +1,6 @@ refine.scala:3: type mismatch; - found : scala.Object - required: scala.Object { def t(): java.lang.String } + found : java.lang.Object + required: java.lang.Object { def t(): java.lang.String } val x: Object { def t(): String } = new Object { ^ one error found diff --git a/test/files/neg/vincent1.check b/test/files/neg/vincent1.check index a9f60e9ad2..aa65a52341 100644 --- a/test/files/neg/vincent1.check +++ b/test/files/neg/vincent1.check @@ -1,4 +1,4 @@ -vincent1.scala:7: type x.type escapes its defining scope as part of scala.Object { type T = x.T } +vincent1.scala:7: type x.type escapes its defining scope as part of java.lang.Object with scala.ScalaObject { type T = x.T } class Functor(x: A) { type T = x.T } ^ vincent1.scala:9: type x.type escapes its defining scope as part of test.B { type T = x.T } diff --git a/test/files/pos/MailBox.scala b/test/files/pos/MailBox.scala index 9094b73399..3a633e3fbe 100644 --- a/test/files/pos/MailBox.scala +++ b/test/files/pos/MailBox.scala @@ -2,7 +2,7 @@ package test; import scala.concurrent._; -class MailBox with Monitor { +class MailBox { private class LinkedList[a] { var elem: a = _; var next: LinkedList[a] = null; |