summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-02-04 22:25:03 -0800
committerPaul Phillips <paulp@improving.org>2012-02-04 22:38:06 -0800
commitb2720bdaef5bd7b84b4054e963eef4af959faf59 (patch)
treee6056c217c6c12370c60e9c348c2557467f913ab
parentb5eab2f3640f458d40f3e3cb87055e871af70947 (diff)
downloadscala-b2720bdaef5bd7b84b4054e963eef4af959faf59.tar.gz
scala-b2720bdaef5bd7b84b4054e963eef4af959faf59.tar.bz2
scala-b2720bdaef5bd7b84b4054e963eef4af959faf59.zip
A couple more checkfiles and comments.
I guess I have to suck up the "C with Object" here in order to get the "Array[T with Object]" I need in a different test. Now all tests pass for reals.
-rw-r--r--test/files/run/t4172.check2
-rw-r--r--test/files/scalap/caseClass/result.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/files/run/t4172.check b/test/files/run/t4172.check
index da467e27ea..b94da0c9d8 100644
--- a/test/files/run/t4172.check
+++ b/test/files/run/t4172.check
@@ -4,7 +4,7 @@ Type :help for more information.
scala>
scala> val c = { class C { override def toString = "C" }; ((new C, new C { def f = 2 })) }
-c: (C, C{def f: Int}) forSome { type C <: Object } = (C,C)
+c: (C, C with Object{def f: Int}) forSome { type C <: Object } = (C,C)
scala>
diff --git a/test/files/scalap/caseClass/result.test b/test/files/scalap/caseClass/result.test
index 8e3255859f..7c94b52cf7 100644
--- a/test/files/scalap/caseClass/result.test
+++ b/test/files/scalap/caseClass/result.test
@@ -1,4 +1,4 @@
-case class CaseClass[A <: scala.Seq[scala.Int]](i : A, s : scala.Predef.String) extends java.lang.Object with scala.Product with scala.Serializable {
+case class CaseClass[A <: scala.Seq[scala.Int]](i : A, s : scala.Predef.String) extends java.lang.Object with scala.Product with scala.Serializable with scala.AnyRef {
val i : A = { /* compiled code */ }
val s : scala.Predef.String = { /* compiled code */ }
def foo : scala.Int = { /* compiled code */ }