Replace 'class object' with 'default object' in renderers and test data

Includes changes to decompiled text
Old syntax is used in builtins and project code for now

compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt

@@ -237,9 +237,6 @@ private object DebugTextBuildingVisitor : JetVisitor<String, Unit>() {
         return buildText {
             append("STUB: ")
             appendInn(declaration.getModifierList(), suffix = " ")
-            if (declaration.isDefault()) {
-                append("class ")
-            }
             append("object ")
             appendInn(declaration.getNameAsName())
             appendInn(declaration.getDelegationSpecifierList(), prefix = " : ")
@@ -273,9 +270,6 @@ private object DebugTextBuildingVisitor : JetVisitor<String, Unit>() {
 
     override fun visitTypeConstraint(constraint: JetTypeConstraint, data: Unit?): String? {
         return buildText {
-            if (constraint.isDefaultObjectConstraint()) {
-                append("class object ")
-            }
             appendInn(constraint.getSubjectTypeParameterName())
             appendInn(constraint.getBoundTypeReference(), prefix = " : ")
         }

compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.java

@@ -123,7 +123,7 @@ public class OverloadResolver {
         if (jetClass instanceof JetObjectDeclaration) {
             // must be default object
             name = classDescriptor.getContainingDeclaration().getName().asString();
-            return "class object " + name;
+            return "default object " + name;
         }
         // safe
         return "<unknown>";

compiler/testData/asJava/lightClassStructure/ClassObject.kt

@@ -1,6 +1,6 @@
 package test
 
 class WithClassObject {
-  class object {
+  default object {
   }
 }

compiler/testData/asJava/lightClassStructure/PlatformStaticMethodsGenerics.kt

@@ -3,7 +3,7 @@ package test
 import kotlin.platform.platformStatic
 
 class PlatformStaticClass {
-    class object {
+    default object {
         platformStatic
         fun inClassObject<T>() {}
     }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt

@@ -1,7 +1,7 @@
 // ClassObjectField
 
 class ClassObjectField {
-    class object {
+    default object {
         val x: String? = ""
         private val y: String? = ""
     }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.kt

@@ -1,7 +1,7 @@
 // TraitClassObjectField
 
 trait TraitClassObjectField {
-    class object {
+    default object {
         val x: String? = ""
         private val y: String? = ""
     }

compiler/testData/builtin-classes.txt

@@ -109,7 +109,7 @@ public final class Byte : kotlin.Number, kotlin.Comparable<kotlin.Byte> {
     public open override /*1*/ fun toLong(): kotlin.Long
     public open override /*1*/ fun toShort(): kotlin.Short
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
     }
 }
@@ -171,7 +171,7 @@ public final class ByteRange : kotlin.Range<kotlin.Byte>, kotlin.Progression<kot
     public open override /*1*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.ByteIterator
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
         public final val EMPTY: kotlin.ByteRange
             public final fun <get-EMPTY>(): kotlin.ByteRange
@@ -289,7 +289,7 @@ public final class CharRange : kotlin.Range<kotlin.Char>, kotlin.Progression<kot
     public open override /*1*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.CharIterator
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
         public final val EMPTY: kotlin.CharRange
             public final fun <get-EMPTY>(): kotlin.CharRange
@@ -380,7 +380,7 @@ public final class Double : kotlin.Number, kotlin.Comparable<kotlin.Double> {
     public open override /*1*/ fun toLong(): kotlin.Long
     public open override /*1*/ fun toShort(): kotlin.Short
 
-    public class object Default : kotlin.FloatingPointConstants<kotlin.Double> {
+    public default object Default : kotlin.FloatingPointConstants<kotlin.Double> {
         /*primary*/ private constructor Default()
         public abstract override /*1*/ /*fake_override*/ val NEGATIVE_INFINITY: kotlin.Double
             public abstract override /*1*/ /*fake_override*/ fun <get-NEGATIVE_INFINITY>(): kotlin.Double
@@ -445,7 +445,7 @@ public final class DoubleRange : kotlin.Range<kotlin.Double>, kotlin.Progression
     public open override /*1*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.DoubleIterator
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
         public final val EMPTY: kotlin.DoubleRange
             public final fun <get-EMPTY>(): kotlin.DoubleRange
@@ -458,7 +458,7 @@ public abstract class Enum</*0*/ E : kotlin.Enum<E>> : kotlin.Comparable<E> {
     public final fun name(): kotlin.String
     public final fun ordinal(): kotlin.Int
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
     }
 }
@@ -618,7 +618,7 @@ public final class Float : kotlin.Number, kotlin.Comparable<kotlin.Float> {
     public open override /*1*/ fun toLong(): kotlin.Long
     public open override /*1*/ fun toShort(): kotlin.Short
 
-    public class object Default : kotlin.FloatingPointConstants<kotlin.Float> {
+    public default object Default : kotlin.FloatingPointConstants<kotlin.Float> {
         /*primary*/ private constructor Default()
         public abstract override /*1*/ /*fake_override*/ val NEGATIVE_INFINITY: kotlin.Float
             public abstract override /*1*/ /*fake_override*/ fun <get-NEGATIVE_INFINITY>(): kotlin.Float
@@ -683,7 +683,7 @@ public final class FloatRange : kotlin.Range<kotlin.Float>, kotlin.Progression<k
     public open override /*1*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.FloatIterator
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
         public final val EMPTY: kotlin.FloatRange
             public final fun <get-EMPTY>(): kotlin.FloatRange
@@ -911,7 +911,7 @@ public final class Int : kotlin.Number, kotlin.Comparable<kotlin.Int> {
     public final fun ushr(/*0*/ bits: kotlin.Int): kotlin.Int
     public final fun xor(/*0*/ other: kotlin.Int): kotlin.Int
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
     }
 }
@@ -973,7 +973,7 @@ public final class IntRange : kotlin.Range<kotlin.Int>, kotlin.Progression<kotli
     public open override /*1*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.IntIterator
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
         public final val EMPTY: kotlin.IntRange
             public final fun <get-EMPTY>(): kotlin.IntRange
@@ -1082,7 +1082,7 @@ public final class Long : kotlin.Number, kotlin.Comparable<kotlin.Long> {
     public final fun ushr(/*0*/ bits: kotlin.Int): kotlin.Long
     public final fun xor(/*0*/ other: kotlin.Long): kotlin.Long
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
     }
 }
@@ -1144,7 +1144,7 @@ public final class LongRange : kotlin.Range<kotlin.Long>, kotlin.Progression<kot
     public open override /*1*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.LongIterator
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
         public final val EMPTY: kotlin.LongRange
             public final fun <get-EMPTY>(): kotlin.LongRange
@@ -1378,7 +1378,7 @@ public final class Short : kotlin.Number, kotlin.Comparable<kotlin.Short> {
     public open override /*1*/ fun toLong(): kotlin.Long
     public open override /*1*/ fun toShort(): kotlin.Short
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
     }
 }
@@ -1440,7 +1440,7 @@ public final class ShortRange : kotlin.Range<kotlin.Short>, kotlin.Progression<k
     public open override /*1*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): kotlin.ShortIterator
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
         public final val EMPTY: kotlin.ShortRange
             public final fun <get-EMPTY>(): kotlin.ShortRange
@@ -1456,7 +1456,7 @@ public final class String : kotlin.Comparable<kotlin.String>, kotlin.CharSequenc
     public final fun plus(/*0*/ other: kotlin.Any?): kotlin.String
     public open override /*1*/ fun subSequence(/*0*/ start: kotlin.Int, /*1*/ end: kotlin.Int): kotlin.CharSequence
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
     }
 }

compiler/testData/cfg/declarations/local/LocalDeclarations.instructions

@@ -2,7 +2,7 @@
 class C() {
     val a: Int = 1
 
-    class object {
+    default object {
         val x : Int
 
         {

compiler/testData/cfg/declarations/local/LocalDeclarations.kt

@@ -1,7 +1,7 @@
 class C() {
     val a: Int = 1
 
-    class object {
+    default object {
         val x : Int
 
         {

compiler/testData/cfg/declarations/local/LocalDeclarations.values

@@ -2,7 +2,7 @@
 class C() {
     val a: Int = 1
 
-    class object {
+    default object {
         val x : Int
 
         {

compiler/testData/codegen/box/classes/boxPrimitiveTypeInClinitOfClassObject.kt

@@ -1,5 +1,5 @@
 class A {
-  class object {
+  default object {
     var xi = 0
     var xin : Int? = 0
     var xinn : Int? = null

compiler/testData/codegen/box/classes/classObject.kt

@@ -1,5 +1,5 @@
 class C() {
-  class object {
+  default object {
     fun create() = C()
   }
 }

compiler/testData/codegen/box/classes/classObjectAsExtensionReceiver.kt

@@ -1,7 +1,7 @@
 fun Any.foo() = 1
 
 class A {
-    class object
+    default object
 }
 
 fun box() = if (A.foo() == 1) "OK" else "fail"

compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt

@@ -1,7 +1,7 @@
 var global = 0;
 
 class C {
-  class object {
+  default object {
       {
         global = 1;
       }

compiler/testData/codegen/box/classes/classObjectField.kt

@@ -1,5 +1,5 @@
 class A() {
-    class object {
+    default object {
         val value = 10
     }
 }

compiler/testData/codegen/box/classes/classObjectInTrait.kt

@@ -1,7 +1,7 @@
 // EA-38323 - Illegal field modifiers in class: classObject field in C must be static and final 
 
 trait C {
-  class object {
+  default object {
     public val FOO: String = "OK"
   }
 }

compiler/testData/codegen/box/classes/classObjectNotOfEnum.kt

@@ -1,5 +1,5 @@
 class A {
-    class object {
+    default object {
         fun values() = "O"
         fun valueOf() = "K"
     }

compiler/testData/codegen/box/classes/classObjectToString.kt

@@ -1,4 +1,4 @@
-class SomeClass { class object }
+class SomeClass { default object }
 
 fun box() = 
     if ((SomeClass.toString() as java.lang.String).matches("SomeClass\\\$Default@[0-9a-fA-F]+"))

compiler/testData/codegen/box/classes/classObjectWithPrivateGenericMember.kt

@@ -1,5 +1,5 @@
 class C() {
-    class object {
+    default object {
         private fun <T> create() = C()
     }
 

compiler/testData/codegen/box/classes/classObjectsWithParentClasses.kt

@@ -1,5 +1,5 @@
 open class Test {
-    class object {
+    default object {
         fun testStatic(ic: InnerClass): NotInnerClass = NotInnerClass(ic.value)
     }
 

compiler/testData/codegen/box/classes/extensionOnNamedClassObject.kt

@@ -1,5 +1,5 @@
 class C() {
-    class object Foo
+    default object Foo
 }
 
 fun C.Foo.create() = 3

compiler/testData/codegen/box/classes/kt1018.kt

@@ -4,7 +4,7 @@ public class StockMarketTableModel() {
         return COLUMN_TITLES?.size()!!
     }
 
-    class object {
+    default object {
         private val COLUMN_TITLES : Array<Int?> = arrayOfNulls<Int>(10)
     }
 }

compiler/testData/codegen/box/classes/kt2384.kt

@@ -1,5 +1,5 @@
 class A {
-    class object {
+    default object {
         val b = 0
         val c = b
         

compiler/testData/codegen/box/classes/kt249.kt

@@ -1,7 +1,7 @@
 package x
 
 class Outer() {
-    class object {
+    default object {
         class Inner() {
         }
     }

compiler/testData/codegen/box/classes/kt2784.kt

@@ -1,7 +1,7 @@
 open class Factory(p: Int)
 
 class A {
-    class object : Factory(1)
+    default object : Factory(1)
 }
 
 fun box() : String {

compiler/testData/codegen/box/classes/kt508.kt

@@ -2,7 +2,7 @@ package mult_constructors_3_bug
 
 public open class Identifier() {
     private var myNullable : Boolean = true
-    class object {
+    default object {
         open public fun init(isNullable : Boolean) : Identifier {
             val __ = Identifier()
             __.myNullable = isNullable

compiler/testData/codegen/box/classes/namedClassObject.kt

@@ -1,5 +1,5 @@
 class C() {
-    class object Foo {
+    default object Foo {
         fun create() = 3
     }
 }

compiler/testData/codegen/box/defaultArguments/constructor/kt3060.kt

@@ -1,5 +1,5 @@
 class Foo private(val param: String = "OK") {
-    class object {
+    default object {
         val s = Foo()
     }
 }

compiler/testData/codegen/box/defaultArguments/function/extentionFunctionInClassObject.kt

@@ -1,5 +1,5 @@
 class A {
-  class object {
+  default object {
     fun Int.foo(a: Int = 1): Int {
         return a
     }

compiler/testData/codegen/box/delegatedProperty/kt4138.kt

@@ -5,14 +5,14 @@ class Delegate<T>(var inner: T) {
 
 
 class Foo (val f: Int) {
-    class object {
+    default object {
         val A: Foo by Delegate(Foo(11))
         var B: Foo by Delegate(Foo(11))
     }
 }
 
 trait FooTrait {
-    class object {
+    default object {
         val A: Foo by Delegate(Foo(11))
         var B: Foo by Delegate(Foo(11))
     }

compiler/testData/codegen/box/delegatedProperty/propertyMetadataShouldBeCached.kt

@@ -3,7 +3,7 @@ import java.util.IdentityHashMap
 class A {
     var foo: Int by IntHandler
 
-    class object {
+    default object {
         var bar: Any? by AnyHandler
     }
 }

compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.kt

@@ -1,5 +1,5 @@
 class A {
-    class object {
+    default object {
         fun invoke(i: Int) = i
     }
 }

compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.txt

@@ -8,7 +8,7 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.kt

@@ -3,7 +3,7 @@ trait B
 fun B.invoke(i: Int) = i
 
 class A {
-    class object: B {
+    default object: B {
     }
 }
 

compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.txt

@@ -9,7 +9,7 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default : B {
+    internal default object Default : B {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt

@@ -1,6 +1,6 @@
 class A {
     class Nested {
-        class object {
+        default object {
             fun invoke(i: Int) = i
         }
     }

compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.txt

@@ -14,7 +14,7 @@ internal final class A {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt

@@ -2,7 +2,7 @@ import A.Nested
 
 class A {
     class Nested {
-        class object {
+        default object {
             fun invoke(i: Int) = i
         }
     }

compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.txt

@@ -14,7 +14,7 @@ internal final class A {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/codegen/box/enum/classObjectInEnum.kt

@@ -3,7 +3,7 @@ enum class Game {
     PAPER
     SCISSORS
 
-    class object {
+    default object {
         fun foo() = ROCK
         val bar = PAPER
     }

compiler/testData/codegen/box/enum/inclassobj.kt

@@ -2,7 +2,7 @@ fun box() = if(Context.operatingSystemType == Context.Default.OsType.OTHER) "OK"
 
 public class Context
 {
-        class object
+        default object
         {
                 public enum class OsType {
                         LINUX;

compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt

@@ -1,5 +1,5 @@
 class A {
-    class object {}
+    default object {}
     enum class E {
         OK
     }

compiler/testData/codegen/box/extensionFunctions/kt4228.kt

@@ -1,5 +1,5 @@
 class A {
-    class object
+    default object
 }
 
 val foo: Any.() -> Unit = {}

compiler/testData/codegen/box/fieldRename/constructorAndClassObject.kt

@@ -1,6 +1,6 @@
 class Test(val prop: String) {
 
-  class object {
+  default object {
     public val prop : String = "CO";
   }
 

compiler/testData/codegen/box/functions/kt2716.kt

@@ -1,7 +1,7 @@
 package someTest
 
 public class Some private(val v: String) {
-    class object {
+    default object {
         public fun init(v: String): Some {
             return Some(v)
         }

compiler/testData/codegen/box/innerNested/nestedClassObject.kt

@@ -1,6 +1,6 @@
 class Outer {
     class Nested {
-        class object {
+        default object {
             val O = "O"
             val K = "K"
         }

compiler/testData/codegen/box/objects/flist.kt

@@ -3,7 +3,7 @@ public abstract class FList<T>() {
     public abstract val tail: FList<T>
     public abstract val empty: Boolean
 
-    class object {
+    default object {
         val emptyFList = object: FList<Any>() {
             public override val head: Any
                 get() = throw UnsupportedOperationException();

compiler/testData/codegen/box/objects/kt1047.kt

@@ -2,7 +2,7 @@ public open class Test() {
     open public fun test() : Unit {
         System.out?.println(hello)
     }
-    class object {
+    default object {
         private val hello : String? = "Hello"
     }
 }

compiler/testData/codegen/box/objects/kt2719.kt

@@ -1,5 +1,5 @@
 class Clazz {
-    class object {
+    default object {
         val a = object {
             fun run(x: String) = x
         }

compiler/testData/codegen/box/objects/kt535.kt

@@ -3,7 +3,7 @@ class Identifier<T>(t : T?, myHasDollar : Boolean) {
 
     public fun getName() : T? { return myT }
 
-    class object {
+    default object {
         open public fun init<T>(name : T?) : Identifier<T> {
             val __ = Identifier<T>(name, false)
             return __

compiler/testData/codegen/box/objects/kt560.kt

@@ -4,7 +4,7 @@ import java.io.*
 
 open class AllEvenNum() {
 
-    class object {
+    default object {
         open public fun main(args : Array<String?>?) : Unit {
             var i : Int = 1
             while ((i <= 100)) {

compiler/testData/codegen/box/objects/kt640.kt

@@ -14,7 +14,7 @@ public open class Identifier<T>(myName : T?, myHasDollar : Boolean) {
         return myName
     }
 
-    class object {
+    default object {
         open public fun init<T>(name : T?) : Identifier<T> {
             val __ = Identifier<T>(name, false)
             return __

compiler/testData/codegen/box/properties/classObjectProperties.kt

@@ -1,6 +1,6 @@
 class Test {
 
-    class object {
+    default object {
 
         public val prop1 : Int = 10
 

compiler/testData/codegen/box/properties/kt1482_2279.kt

@@ -1,7 +1,7 @@
 abstract class ClassValAbstract {
     abstract var a: Int
 
-    class object {
+    default object {
         val methods = (this as java.lang.Object).getClass()?.getClassLoader()?.loadClass("ClassValAbstract")?.getMethods()!!
     }
 }

compiler/testData/codegen/box/properties/kt3551.kt

@@ -8,7 +8,7 @@ class Identifier() {
         return myNullable
     }
 
-    class object {
+    default object {
         fun init(isNullable : Boolean) : Identifier {
             val id = Identifier()
             id.myNullable = isNullable

compiler/testData/codegen/box/properties/kt4140.kt

@@ -1,6 +1,6 @@
 class TestObject()
 {
-    class object {
+    default object {
         var prop: Int = 1
             get() = $prop++
     }

compiler/testData/codegen/box/properties/kt4252.kt

@@ -2,7 +2,7 @@ class CallbackBlock {}
 
 public class Foo
 {
-    class object {
+    default object {
         private var bar = 0
     }
 

compiler/testData/codegen/box/properties/kt4252_2.kt

@@ -1,5 +1,5 @@
 class Foo() {
-    class object {
+    default object {
         val bar = "OK";
         var boo = "FAIL";
     }

compiler/testData/codegen/box/staticFields/anonymousInitializerInClassObject.kt

@@ -1,5 +1,5 @@
 class Foo {
-    class object {
+    default object {
         val bar: String
 
         {

compiler/testData/codegen/box/staticFields/incInClassObject.kt

@@ -1,6 +1,6 @@
 
 class A {
-    class object {
+    default object {
         private var r: Int = 1;
 
         fun test(): Int {

compiler/testData/codegen/box/staticFields/inheritedPropertyInClassObject.kt

@@ -1,6 +1,6 @@
 open class Bar<T>(val prop: String)
 class Foo {
-    class object : Bar<Foo>("OK") {
+    default object : Bar<Foo>("OK") {
         val p = Foo.prop
         val p2 = prop
         val p3 = this.prop

compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funClassObject.kt

@@ -1,5 +1,5 @@
 class A {
-  class object: funClassObject() {
+  default object: funClassObject() {
     fun test(): String {
       return funClassObject.protectedFun()!!
     }

compiler/testData/codegen/boxInline/simple/classObject.2.kt

@@ -10,7 +10,7 @@ class InlineAll {
         return s()
     }
 
-    class object {
+    default object {
         inline fun inline(s: () -> String): String {
             return s()
         }

compiler/testData/codegen/boxInline/trait/trait.2.kt

@@ -6,7 +6,7 @@ trait InlineTrait {
         return s()
     }
 
-    class object {
+    default object {
         inline final fun finalInline(s: () -> String): String {
             return s()
         }

compiler/testData/codegen/boxWithJava/classObjectAccessor/classObject.kt

@@ -1,12 +1,12 @@
 class A {
-    class object {
+    default object {
         val i1 = 1
         val i2 = 2
     }
 }
 
 class B {
-    class object Named {
+    default object Named {
         val i1 = 3
         val i2 = 4
     }

compiler/testData/codegen/boxWithJava/platformStatic/annotations/simpleClassObject.kt

@@ -7,7 +7,7 @@ annotation class testAnnotation
 
 class A {
 
-    class object {
+    default object {
         val b: String = "OK"
 
         platformStatic testAnnotation fun test1() = b

compiler/testData/codegen/boxWithJava/platformStatic/classObject/simpleClassObject.kt

@@ -2,7 +2,7 @@ import kotlin.platform.platformStatic
 
 class A {
 
-    class object {
+    default object {
         val b: String = "OK"
 
         platformStatic val c: String = "OK"

compiler/testData/codegen/boxWithJava/properties/classObjectProperties/classObjectProperties.kt

@@ -1,17 +1,17 @@
 class Klass {
-    class object {
+    default object {
         val NAME = "Klass"
     }
 }
 
 trait Trait {
-    class object {
+    default object {
         val NAME = "Trait"
     }
 }
 
 enum class Enoom {
-    class object {
+    default object {
         val NAME = "Enoom"
     }
 }

compiler/testData/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.kt

@@ -32,7 +32,7 @@ annotation class Ann(
 )
 
 class Foo {
-    class object {
+    default object {
         val i: Int = 2
         val s: Short = 2
         val f: Float = 2.0.toFloat()

compiler/testData/codegen/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt

@@ -15,7 +15,7 @@ annotation class Ann(val i: Int)
 
 class A {
    class B {
-      class object {
+      default object {
         val i = 1
       }
    }

compiler/testData/codegen/boxWithStdlib/callableReference/property/kClassInstanceIsInitializedFirst.kt

@@ -1,7 +1,7 @@
 import kotlin.reflect.KMemberProperty
 
 class A {
-    class object {
+    default object {
         val ref: KMemberProperty<A, String> = A::foo
     }
 

compiler/testData/codegen/boxWithStdlib/native/nativePropertyAccessors.kt

@@ -1,5 +1,5 @@
 class C {
-    class object {
+    default object {
         val defaultGetter: Int = 1
             [native] get
 

compiler/testData/codegen/boxWithStdlib/native/privateStatic.kt

@@ -2,7 +2,7 @@ import kotlin.jvm.*
 import kotlin.platform.*
 
 class C {
-    class object {
+    default object {
         private platformStatic native fun foo()
     }
 

compiler/testData/codegen/boxWithStdlib/native/staticNative.kt

@@ -4,7 +4,7 @@ import kotlin.jvm.*
 import kotlin.platform.*
 
 class WithNative {
-    class object {
+    default object {
         platformStatic native fun bar(l: Long, s: String): Double
     }
 }

compiler/testData/codegen/boxWithStdlib/platformStatic/syntheticAccessor.kt

@@ -1,7 +1,7 @@
 import kotlin.platform.*
 
 class C {
-    class object {
+    default object {
         private platformStatic fun foo(): String {
             return "OK"
         }

compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInClassObject.kt

@@ -1,5 +1,5 @@
 class O {
-    class object {
+    default object {
         // Currently we consider <clinit> in class O as the enclosing method of this lambda,
         // so we write outer class = O and enclosing method = null
         val f = {}

compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt5112.kt

@@ -5,13 +5,13 @@ class G<T>(val s: T) {
 }
 
 public trait ErrorsJvmTrait {
-    class object {
+    default object {
         public val param : G<String> = G("STRING")
     }
 }
 
 public class ErrorsJvmClass {
-    class object {
+    default object {
         public val param : G<String> = G("STRING")
     }
 }

compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt6106.kt

@@ -6,7 +6,7 @@ open class B
 
 class A {
 
-    class object {
+    default object {
         [platformStatic]
         fun <T: B> a(s: T) : T {
             return s

compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/enumInsideClassObject.kt

@@ -1,7 +1,7 @@
 import kotlin.test.assertEquals
 
 class A {
-    class object {
+    default object {
         enum class Season {
             WINTER
             SPRING

compiler/testData/codegen/bytecodeText/staticFields/classObject.kt

@@ -1,7 +1,7 @@
 class A {
-    class object {
+    default object {
         val r: Int = 1;
     }
 }
-// A and class object constructor call
+// A and default object constructor call
 // 2 ALOAD 0

compiler/testData/codegen/bytecodeText/staticFields/classObjectSyntheticAccessor.kt

@@ -1,8 +1,8 @@
 class A {
-    class object {
+    default object {
         private var r: Int = 1;
     }
 }
-// A and class object constructor call
+// A and default object constructor call
 // 2 ALOAD 0
 // 1 synthetic access\$getR

compiler/testData/codegen/classes/classObjectInterface.kt

@@ -1,7 +1,7 @@
 class C() {
   fun getInstance(): Runnable = C
 
-  class object: Runnable {
+  default object: Runnable {
     override fun run(): Unit { }
   }
 }

compiler/testData/codegen/classes/classObjectIsInnerClass.kt

@@ -1,3 +1,3 @@
 class A {
-    class object
+    default object
 }

compiler/testData/codegen/defaultArguments/reflection/classInClassObject.kt

@@ -1,5 +1,5 @@
 class A {
-    class object {
+    default object {
         class Foo(val a: Int = 1) {}
     }
 }

compiler/testData/codegen/innerClassInfo/innerClassInfo.kt

@@ -3,5 +3,5 @@ class A {
         inner class C
     }
     
-    class object
+    default object
 }

compiler/testData/codegen/notNullAssertions/noAssertionsForKotlin.kt

@@ -3,7 +3,7 @@ class A {
     
     fun foo(): String = ""
     
-    class object {
+    default object {
         val y: Any? = 239
         
         fun bar(): String = ""

compiler/testData/codegen/outerClassInfo/outerClassInfo.kt

@@ -2,7 +2,7 @@ package foo
 
 class Foo {
 
-  class object {
+  default object {
       fun objectFoo() { }
   }
 

compiler/testData/codegen/properties/privateClassPropertyAccessors.kt

@@ -13,7 +13,7 @@ class C {
         get() = this
         set(value) {}
 
-    class object {
+    default object {
         private val classObjectVal: Long
             get() = 1L
     }

compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt

@@ -1,7 +1,7 @@
 package test
 
 class WithClassObject {
-  class object {
+  default object {
     fun foo() {}
 
     val value: Int = 0

compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObject.kt

@@ -4,7 +4,7 @@ import kotlin.platform.platformStatic
 
 class A {
 
-    class object {
+    default object {
         val b: String = "OK"
 
         platformStatic fun test1() {

compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.kt

@@ -3,7 +3,7 @@ package test
 import kotlin.platform.platformStatic
 
 class A {
-    class object {
+    default object {
         [platformStatic] val b: String = "OK"
 
         var A.c: String

compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt

@@ -10,7 +10,7 @@ annotation class AFloat(val value: Float)
 
 class Test {
 
-    class object {
+    default object {
         val vstring: String = "Test"
         val vchar: Char = 'c'
         val vint: Int = 10

compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt

@@ -10,7 +10,7 @@ annotation class AFloat(val value: Float)
 
 trait Test {
 
-    class object {
+    default object {
         val vstring: String = "Test"
         val vchar: Char = 'c'
         val vint: Int = 10

compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt

@@ -1,7 +1,7 @@
 package test
 
 class KotlinClass {
-    class object {
+    default object {
         val FOO: Int = 10
     }
 }

compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt

@@ -2,7 +2,7 @@ package test
 
 class Test {
 
-  class object {
+  default object {
     public val valProp: Int = 10
 
     public var varProp: Int = 10

compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt

@@ -2,7 +2,7 @@ package test
 
 trait Test {
 
-  class object {
+  default object {
     public val valProp: Int = 10
   }
 

compiler/testData/compileKotlinAgainstKotlin/ClassObjectInEnum.A.kt

@@ -3,7 +3,7 @@ package library
 public enum class EnumClass {
     ENTRY
 
-    public class object {
+    public default object {
         public fun entry(): EnumClass = ENTRY
     }
 }

compiler/testData/compileKotlinAgainstKotlin/ClassObjectMember.A.kt

@@ -1,5 +1,5 @@
 class A {
-    class object {
+    default object {
         fun foo() = 42
         val bar = "OK"
     }

compiler/testData/diagnostics/tests/MultipleBounds.kt

@@ -17,7 +17,7 @@ trait G<X> {
 class C() : A(), B
 
 class D() {
-  class object : A(), B {}
+  default object : A(), B {}
 }
 
 class Test1<T : A>()

compiler/testData/diagnostics/tests/MultipleBounds.txt

@@ -52,7 +52,7 @@ package Jet87 {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default : Jet87.A, Jet87.B {
+        internal default object Default : Jet87.A, Jet87.B {
             private constructor Default()
             internal open override /*1*/ /*fake_override*/ fun bar(): kotlin.Double
             public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean