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
This commit is contained in:
Pavel V. Talanov
2015-03-06 12:51:59 +03:00
parent 28ed30bcb3
commit 59f192ef90
794 changed files with 1120 additions and 1109 deletions
@@ -4,7 +4,7 @@
package test
internal final class ClassWithClassObject() {
internal class object {
internal default object {
internal final val a: test.A /* compiled code */
public final var b: test.B /* compiled code */
@@ -4,7 +4,7 @@ class ClassWithClassObject {
fun f() {
}
class object {
default object {
fun f() {
}
@@ -8,7 +8,7 @@ class D {
class Nested
}
class object {
default object {
class NestedInClassObject
}
}
@@ -4,7 +4,7 @@
package testData.libraries
[[public final class WithInnerAndObject() {
[[public class object {
[[public default object {
[internal final fun foo(): kotlin.Unit { /* compiled code */ }]
}]]
@@ -4,6 +4,6 @@
package testData.libraries
[[public final class WithTraitClassObject() {
[[public class object : testData.libraries.SimpleTrait {
[[public default object : testData.libraries.SimpleTrait {
}]]
}]]
@@ -10,7 +10,7 @@ public class SimpleTraitImpl : SimpleTrait {
}
public class WithInnerAndObject {
class object {
default object {
fun foo() {
}
}
@@ -23,7 +23,7 @@ public class WithInnerAndObject {
}
public class WithTraitClassObject {
class object : SimpleTrait
default object : SimpleTrait
}
public abstract class AbstractClass {
@@ -5,5 +5,5 @@ fun foo() {
}
// main.kt
// class <1>object {
// default <1>object {
// fun <2>foo() {
@@ -17,7 +17,7 @@ a public class Annotations private [a] (private [a] val c1: Int, [a] val c2: Int
[a] private set
private b(E.E2) class object {
private b(E.E2) default object {
}
}
@@ -6,7 +6,7 @@ class ClassObject {
val c = 1
public class object {
public default object {
val j = 0
fun z() = 0
@@ -20,11 +20,11 @@ class ClassObject {
class B {
class object {
default object {
class C {
class object {
default object {
class D {
class object {
default object {
val i = 3
fun f() {
}
@@ -8,7 +8,7 @@ class D {
class Nested
}
class object {
default object {
class NestedInClassObject
}
}
@@ -7,7 +7,7 @@ enum class Enum {
open fun f() = 3
class object {
default object {
val c: Int = 1
}
}