Updated checkfiles to subtract ScalaObject.

18 files changed, 26 insertions, 37 deletions

diff --git a/test/files/buildmanager/t2556_3/t2556_3.check b/test/files/buildmanager/t2556_3/t2556_3.check
index bf26602494..37808d2b31 100644
--- a/test/files/buildmanager/t2556_3/t2556_3.check
+++ b/test/files/buildmanager/t2556_3/t2556_3.check
@@ -3,8 +3,8 @@ compiling Set(A.scala, B.scala, C.scala)
 Changes: Map()
 builder > A.scala
 compiling Set(A.scala)
-Changes: Map(class A -> List(), class B -> List(Changed(Class(B))[List((A,Object), (ScalaObject,ScalaObject))]))
-invalidate C.scala because parents have changed [Changed(Class(B))[List((A,Object), (ScalaObject,ScalaObject))]]
+Changes: Map(class A -> List(), class B -> List(Changed(Class(B))[List((A,Object))]))
+invalidate C.scala because parents have changed [Changed(Class(B))[List((A,Object))]]
 invalidate B.scala because it references invalid (no longer inherited) definition [ParentChanged(Class(C))]
 compiling Set(B.scala, C.scala)
 B.scala:3: error: type mismatch;
diff --git a/test/files/jvm/manifests.check b/test/files/jvm/manifests.check
index 54f504b929..453db81a3b 100644
--- a/test/files/jvm/manifests.check
+++ b/test/files/jvm/manifests.check
@@ -29,7 +29,7 @@ x=Foo, m=Foo[scala.collection.immutable.List[Int]]
 x=Foo, m=Foo[Foo[Int]]
 x=Foo, m=Foo[scala.collection.immutable.List[Foo[Int]]]
 
-x=Test1$$anon$1, m=Object with Bar[java.lang.String]
+x=Test1$$anon$1, m=Object with Bar[java.lang.String] with Object
 
 ()=()
 true=true
diff --git a/test/files/neg/anyval-children.check b/test/files/neg/anyval-children.check
index cbb5a2b1d1..f1149a5ce3 100644
--- a/test/files/neg/anyval-children.check
+++ b/test/files/neg/anyval-children.check
@@ -1,6 +1,4 @@
-anyval-children.scala:7: error: illegal inheritance; superclass Bippy
- is not a subclass of the superclass Object
- of the mixin trait ScalaObject
+anyval-children.scala:7: error: Bippy does not have a constructor
 class NotOkBippy1 extends Bippy // fail
                   ^
 anyval-children.scala:9: error: illegal inheritance; superclass Bippy
@@ -8,9 +6,7 @@ anyval-children.scala:9: error: illegal inheritance; superclass Bippy
  of the mixin trait Immutable
 class NotOkBippy2 extends Bippy with Immutable //fail
                                      ^
-anyval-children.scala:9: error: illegal inheritance; superclass Bippy
- is not a subclass of the superclass Object
- of the mixin trait ScalaObject
+anyval-children.scala:9: error: Bippy does not have a constructor
 class NotOkBippy2 extends Bippy with Immutable //fail
                   ^
 anyval-children.scala:11: error: illegal inheritance; superclass Bippy
@@ -18,9 +14,7 @@ anyval-children.scala:11: error: illegal inheritance; superclass Bippy
  of the mixin trait Immutable
 @inline class NotOkBippy3 extends Bippy with Immutable //fail
                                              ^
-anyval-children.scala:11: error: illegal inheritance; superclass Bippy
- is not a subclass of the superclass Object
- of the mixin trait ScalaObject
+anyval-children.scala:11: error: Bippy does not have a constructor
 @inline class NotOkBippy3 extends Bippy with Immutable //fail
                           ^
 5 errors found
diff --git a/test/files/neg/t0764.check b/test/files/neg/t0764.check
index 0788db7f6e..e14c7705b8 100644
--- a/test/files/neg/t0764.check
+++ b/test/files/neg/t0764.check
@@ -1,5 +1,5 @@
 t0764.scala:13: error: type mismatch;
- found   : Object with Node{type T = _1.type} where val _1: Node{type T = NextType}
+ found   : Node{type T = _1.type} where val _1: Node{type T = NextType}
  required: Node{type T = Main.this.AType}
 	new Main[AType]( (value: AType).prepend )
                                         ^
diff --git a/test/files/neg/t2641.check b/test/files/neg/t2641.check
index 9e2f02ac47..909f4f0cf3 100644
--- a/test/files/neg/t2641.check
+++ b/test/files/neg/t2641.check
@@ -9,11 +9,7 @@ t2641.scala:17: error: illegal inheritance;
  self-type ManagedSeq does not conform to scala.collection.TraversableView[A,ManagedSeqStrict[A]]'s selftype scala.collection.TraversableView[A,ManagedSeqStrict[A]]
         with TraversableView[A, ManagedSeqStrict[A]]
              ^
-t2641.scala:16: error: illegal inheritance;
- self-type ManagedSeq does not conform to ScalaObject's selftype ScalaObject
-        extends ManagedSeqStrict[A]
-        ^
 t2641.scala:27: error: value managedIterator is not a member of ManagedSeq
     override def managedIterator = self.managedIterator slice (from, until)
                                         ^
-5 errors found
+four errors found
diff --git a/test/files/neg/t3691.check b/test/files/neg/t3691.check
index cd7b440dce..bdf6c268b2 100644
--- a/test/files/neg/t3691.check
+++ b/test/files/neg/t3691.check
@@ -1,10 +1,10 @@
 t3691.scala:4: error: type mismatch;
- found   : Object with Test.A[String]
+ found   : Test.A[String]
  required: AnyRef{type A[x]}
  val b = (new A[String]{}): { type A[x] } // not ok
           ^
 t3691.scala:5: error: type mismatch;
- found   : Object with Test.A[String]
+ found   : Test.A[String]
  required: AnyRef{type A}
  val c = (new A[String]{}): { type A } // not ok
           ^
diff --git a/test/files/neg/t464-neg.check b/test/files/neg/t464-neg.check
index aea1987b2e..e822e7fb6b 100644
--- a/test/files/neg/t464-neg.check
+++ b/test/files/neg/t464-neg.check
@@ -1,7 +1,7 @@
 t464-neg.scala:7: error: not found: value f1
   f1()
   ^
-t464-neg.scala:8: error: method f1 in class A cannot be accessed in A with ScalaObject
+t464-neg.scala:8: error: method f1 in class A cannot be accessed in A
   super.f1()
         ^
 t464-neg.scala:9: error: value f2 is not a member of B
@@ -10,7 +10,7 @@ t464-neg.scala:9: error: value f2 is not a member of B
 t464-neg.scala:10: error: method f3 in class A cannot be accessed in B
   f3()
   ^
-t464-neg.scala:11: error: method f3 in class A cannot be accessed in A with ScalaObject
+t464-neg.scala:11: error: method f3 in class A cannot be accessed in A
   super.f3()
         ^
 5 errors found
diff --git a/test/files/neg/t4877.check b/test/files/neg/t4877.check
index 0f72300bb4..a4b1e6a50d 100644
--- a/test/files/neg/t4877.check
+++ b/test/files/neg/t4877.check
@@ -9,7 +9,7 @@ t4877.scala:6: error: type mismatch;
   def foo3: AnyRef { def bar(x: Int): Int } = new AnyRef { def bar(x: Int) = "abc" }
                                               ^
 t4877.scala:7: error: type mismatch;
- found   : Object with C{def bar(x: Int): Int}
+ found   : C{def bar(x: Int): Int}
  required: C{def bar(x: Int): Int; def quux(x: Int): Int}
   def foo4: C { def bar(x: Int): Int ; def quux(x: Int): Int } = new C { def bar(x: Int) = 5 }
                                                                  ^
diff --git a/test/files/neg/t5060.check b/test/files/neg/t5060.check
index ab860c9d5b..e71f30ccdb 100644
--- a/test/files/neg/t5060.check
+++ b/test/files/neg/t5060.check
@@ -1,7 +1,7 @@
-t5060.scala:2: error: covariant type T occurs in contravariant position in type => Object with ScalaObject{def contains(x: T): Unit} of value foo0
+t5060.scala:2: error: covariant type T occurs in contravariant position in type => Object{def contains(x: T): Unit} of value foo0
   val foo0 = {
       ^
-t5060.scala:6: error: covariant type T occurs in contravariant position in type => Object with ScalaObject{def contains(x: T): Unit} of method foo1
+t5060.scala:6: error: covariant type T occurs in contravariant position in type => Object{def contains(x: T): Unit} of method foo1
   def foo1 = {
       ^
 two errors found
diff --git a/test/files/neg/t664.check b/test/files/neg/t664.check
index 43a6bea074..cbdf53daea 100644
--- a/test/files/neg/t664.check
+++ b/test/files/neg/t664.check
@@ -1,7 +1,7 @@
-t664.scala:4: error: type Foo is not a member of test.Test with ScalaObject
+t664.scala:4: error: type Foo is not a member of test.Test
   trait Foo extends super.Foo {
                           ^
-t664.scala:5: error: type Bar is not a member of AnyRef with ScalaObject
+t664.scala:5: error: type Bar is not a member of AnyRef
     trait Bar extends super.Bar;
                             ^
 two errors found
diff --git a/test/files/neg/variances.check b/test/files/neg/variances.check
index 4eaab56cef..dc72b05e1e 100644
--- a/test/files/neg/variances.check
+++ b/test/files/neg/variances.check
@@ -4,7 +4,7 @@ variances.scala:4: error: covariant type A occurs in contravariant position in t
 variances.scala:14: error: covariant type A occurs in contravariant position in type A of value a
     private[this] def setA(a : A) = this.a = a 
                            ^
-variances.scala:16: error: covariant type A occurs in invariant position in supertype test.C[A] with ScalaObject of object Baz
+variances.scala:16: error: covariant type A occurs in invariant position in supertype test.C[A] of object Baz
     object Baz extends C[A]
            ^
 variances.scala:63: error: covariant type A occurs in contravariant position in type => test.Covariant.T[A]{val m: A => A} of value x
diff --git a/test/files/pos/t1050.scala b/test/files/pos/t1050.scala
index e017e30713..d34b0cff16 100644
--- a/test/files/pos/t1050.scala
+++ b/test/files/pos/t1050.scala
@@ -1,7 +1,7 @@
 package t1050
 
 abstract class A {
-  type T <: scala.ScalaObject
+  type T <: scala.AnyRef
   class A { this: T =>
     def b = 3
     def c = b
diff --git a/test/files/presentation/callcc-interpreter.check b/test/files/presentation/callcc-interpreter.check
index 3385ef12b7..41b07b07dc 100644
--- a/test/files/presentation/callcc-interpreter.check
+++ b/test/files/presentation/callcc-interpreter.check
@@ -20,7 +20,7 @@ retrieved 64 members
 `method ->[B](y: B)(callccInterpreter.type, B)`
 `method ==(x$1: Any)Boolean`
 `method ==(x$1: AnyRef)Boolean`
-`method add(a: callccInterpreter.Value, b: callccInterpreter.Value)callccInterpreter.M[_ >: callccInterpreter.Num with callccInterpreter.Wrong.type <: Product with Serializable with callccInterpreter.Value]`
+`method add(a: callccInterpreter.Value, b: callccInterpreter.Value)callccInterpreter.M[_ >: callccInterpreter.Num with callccInterpreter.Wrong.type <: Serializable with Product with callccInterpreter.Value]`
 `method apply(a: callccInterpreter.Value, b: callccInterpreter.Value)callccInterpreter.M[callccInterpreter.Value]`
 `method asInstanceOf[T0]=> T0`
 `method callCC[A](h: (A => callccInterpreter.M[A]) => callccInterpreter.M[A])callccInterpreter.M[A]`
@@ -87,7 +87,7 @@ def showM(m: callccInterpreter.M[callccInterpreter.Value]): String = m.in.apply(
 askType at CallccInterpreter.scala(50,30)
 ================================================================================
 [response] askTypeAt at (50,30)
-def add(a: callccInterpreter.Value, b: callccInterpreter.Value): callccInterpreter.M[_ >: callccInterpreter.Num with callccInterpreter.Wrong.type <: Product with Serializable with callccInterpreter.Value] = scala.this.Predef.Pair.apply[callccInterpreter.Value, callccInterpreter.Value](a, b) match {
+def add(a: callccInterpreter.Value, b: callccInterpreter.Value): callccInterpreter.M[_ >: callccInterpreter.Num with callccInterpreter.Wrong.type <: Serializable with Product with callccInterpreter.Value] = scala.this.Predef.Pair.apply[callccInterpreter.Value, callccInterpreter.Value](a, b) match {
   case scala.this.Predef.Pair.unapply[callccInterpreter.Value, callccInterpreter.Value](<unapply-selector>) <unapply> ((n: Int)callccInterpreter.Num((m @ _)), (n: Int)callccInterpreter.Num((n @ _))) => this.unitM[callccInterpreter.Num](callccInterpreter.this.Num.apply(m.+(n)))
   case _ => callccInterpreter.this.unitM[callccInterpreter.Wrong.type](callccInterpreter.this.Wrong)
 }
diff --git a/test/files/run/primitive-sigs-2.check b/test/files/run/primitive-sigs-2.check
index c69d1b54a6..0af1434cea 100644
--- a/test/files/run/primitive-sigs-2.check
+++ b/test/files/run/primitive-sigs-2.check
@@ -1,4 +1,4 @@
-T<java.lang.Object> interface scala.ScalaObject
+T<java.lang.Object> class java.lang.Object
 List(A, char, class java.lang.Object)
 a
 public <T> java.lang.Object Arr.arr4(java.lang.Object[],scala.reflect.Manifest<T>)
diff --git a/test/files/run/repl-parens.check b/test/files/run/repl-parens.check
index 944846541f..69f0a9ce30 100644
--- a/test/files/run/repl-parens.check
+++ b/test/files/run/repl-parens.check
@@ -66,7 +66,7 @@ scala> 55 ; () => 5
 res13: () => Int = <function0>
 
 scala> () => { class X ; new X }
-res14: () => Object with ScalaObject = <function0>
+res14: () => Object = <function0>
 
 scala> 
 
diff --git a/test/files/run/t4110.check b/test/files/run/t4110.check
index 8b005989de..dea7e5957c 100644
--- a/test/files/run/t4110.check
+++ b/test/files/run/t4110.check
@@ -1,2 +1,2 @@
-Object with Test$A with Test$B
-Object with Test$A with Test$B
+Object with Test$A with Test$B with Object
+Object with Test$A with Test$B with Object
diff --git a/test/files/run/t4172.check b/test/files/run/t4172.check
index 95e3eb950d..da467e27ea 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 with ScalaObject } = (C,C)
+c: (C, C{def f: Int}) forSome { type C <: Object } = (C,C)
 
 scala> 
 
diff --git a/test/files/run/t4891.check b/test/files/run/t4891.check
index 072f8df8d4..79fd7f6fbb 100644
--- a/test/files/run/t4891.check
+++ b/test/files/run/t4891.check
@@ -5,4 +5,3 @@ test.generic.C1
 test.generic.C2
   (m) public void test.generic.C1.m1()
 null
-interface scala.ScalaObject