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
2015-03-06 12:51:59 +03:00
parent 28ed30bcb3
commit 59f192ef90
794 changed files with 1120 additions and 1109 deletions
@@ -30,7 +30,7 @@ import java.util.*
  }

  class HTML() : TagWithText("html") {
-    class object : Factory<HTML> {
+    default object : Factory<HTML> {
      override fun create() = HTML()
    }

@@ -40,7 +40,7 @@ import java.util.*
  }

  class Head() : TagWithText("head") {
-    class object : Factory<Head> {
+    default object : Factory<Head> {
      override fun create() = Head()
    }

@@ -53,7 +53,7 @@ import java.util.*
  }

  class Body() : BodyTag("body") {
-    class object : Factory<Body> {
+    default object : Factory<Body> {
      override fun create() = Body()
    }

@@ -1,7 +1,7 @@
 enum class E {
    ENTRY

-    class object {
+    default object {
        fun foo(): E = ENTRY
        fun bar(): Array<E> = values()
        fun baz(): E = valueOf("ENTRY")
@@ -1,10 +1,10 @@
 package Jet86

 class A {
-  class object {
+  default object {
    val x = 1
  }
-  <error descr="[MANY_DEFAULT_OBJECTS] Only one default object is allowed per class">class object Another</error> { // error
+  default <error descr="[MANY_DEFAULT_OBJECTS] Only one default object is allowed per class">object Another</error> { // error
    val x = 1
  }
 }
@@ -14,7 +14,7 @@ class B() {
 }

 object b {
-  <error descr="[DEFAULT_OBJECT_NOT_ALLOWED] A default object is not allowed here">class object</error> {
+  default <error descr="[DEFAULT_OBJECT_NOT_ALLOWED] A default object is not allowed here">object</error> {
    val x = 1
  }
  // error
@@ -11,7 +11,7 @@ trait B {
 class C() : A(), B

 class D() {
-  class object : A(), B {}
+  default object : A(), B {}
 }

 class Test1<T : A>()
@@ -3,7 +3,7 @@ import kotlin.platform.platformStatic
 platformStatic
 class <error descr="[PLATFORM_STATIC_ILLEGAL_USAGE] This declaration does not support 'platformStatic'">A</error> {
    platformStatic
-    <error descr="[PLATFORM_STATIC_ILLEGAL_USAGE] This declaration does not support 'platformStatic'">class object</error> {
+    default <error descr="[PLATFORM_STATIC_ILLEGAL_USAGE] This declaration does not support 'platformStatic'">object</error> {
        platformStatic fun a1() {

        }
@@ -31,7 +31,7 @@ class <error descr="[PLATFORM_STATIC_ILLEGAL_USAGE] This declaration does not su

 platformStatic
 trait <error descr="[PLATFORM_STATIC_ILLEGAL_USAGE] This declaration does not support 'platformStatic'">B</error> {
-    class object {
+    default object {
        <error descr="[PLATFORM_STATIC_NOT_IN_OBJECT] Only functions in named objects and default objects of classes can be annotated with 'platformStatic'">platformStatic fun a1()</error> {

        }
@@ -1,5 +1,5 @@
 class C {
-    <error>class object</error> {
+    default <error>object</error> {
        val <error>Default</error> = this
    }

@@ -1,5 +1,5 @@
 class C {
-    class object {
+    default object {
        <error>val x</error> = 1
        <error>fun getX()</error> = 1
    }
@@ -3,7 +3,7 @@ trait Bar {
 }

 class A {
-    class object : Bar
+    default object : Bar
 }

 fun test() {