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:
@@ -2,7 +2,7 @@
|
||||
package test
|
||||
|
||||
class ClassObjectDeclaresProperty {
|
||||
class object {
|
||||
default object {
|
||||
val i = 1
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ package test
|
||||
internal final class ClassObjectDeclaresProperty {
|
||||
/*primary*/ public constructor ClassObjectDeclaresProperty()
|
||||
|
||||
internal class object Default {
|
||||
internal default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
internal final val i: kotlin.Int = 1
|
||||
internal final fun <get-i>(): kotlin.Int
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
package test
|
||||
|
||||
class ClassObjectDeclaresProperty {
|
||||
class object {
|
||||
default object {
|
||||
var s = ""
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ package test
|
||||
internal final class ClassObjectDeclaresProperty {
|
||||
/*primary*/ public constructor ClassObjectDeclaresProperty()
|
||||
|
||||
internal class object Default {
|
||||
internal default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
internal final var s: kotlin.String
|
||||
internal final fun <get-s>(): kotlin.String
|
||||
|
||||
+3
-3
@@ -1,14 +1,14 @@
|
||||
package test
|
||||
|
||||
public class Pub {
|
||||
class object {}
|
||||
default object {}
|
||||
}
|
||||
|
||||
private class Pri {
|
||||
class object {}
|
||||
default object {}
|
||||
}
|
||||
|
||||
class Int {
|
||||
class object {}
|
||||
default object {}
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -3,7 +3,7 @@ package test
|
||||
internal final class Int {
|
||||
/*primary*/ public constructor Int()
|
||||
|
||||
internal class object Default {
|
||||
internal default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,7 @@ internal final class Int {
|
||||
private final class Pri {
|
||||
/*primary*/ public constructor Pri()
|
||||
|
||||
private class object Default {
|
||||
private default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
}
|
||||
}
|
||||
@@ -19,7 +19,7 @@ private final class Pri {
|
||||
public final class Pub {
|
||||
/*primary*/ public constructor Pub()
|
||||
|
||||
public class object Default {
|
||||
public default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
}
|
||||
}
|
||||
|
||||
+9
-9
@@ -1,37 +1,37 @@
|
||||
package test
|
||||
|
||||
public class PubPri {
|
||||
private class object {}
|
||||
private default object {}
|
||||
}
|
||||
|
||||
public class PubInt {
|
||||
internal class object {}
|
||||
internal default object {}
|
||||
}
|
||||
|
||||
public class PubPub {
|
||||
public class object {}
|
||||
public default object {}
|
||||
}
|
||||
|
||||
internal class IntPri {
|
||||
private class object {}
|
||||
private default object {}
|
||||
}
|
||||
|
||||
internal class IntInt {
|
||||
internal class object {}
|
||||
internal default object {}
|
||||
}
|
||||
|
||||
internal class IntPub {
|
||||
public class object {}
|
||||
public default object {}
|
||||
}
|
||||
|
||||
private class PriPri {
|
||||
private class object {}
|
||||
private default object {}
|
||||
}
|
||||
|
||||
private class PriInt {
|
||||
internal class object {}
|
||||
internal default object {}
|
||||
}
|
||||
|
||||
private class PriPub {
|
||||
public class object {}
|
||||
public default object {}
|
||||
}
|
||||
+9
-9
@@ -3,7 +3,7 @@ package test
|
||||
internal final class IntInt {
|
||||
/*primary*/ public constructor IntInt()
|
||||
|
||||
internal class object Default {
|
||||
internal default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,7 @@ internal final class IntInt {
|
||||
internal final class IntPri {
|
||||
/*primary*/ public constructor IntPri()
|
||||
|
||||
private class object Default {
|
||||
private default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
}
|
||||
}
|
||||
@@ -19,7 +19,7 @@ internal final class IntPri {
|
||||
internal final class IntPub {
|
||||
/*primary*/ public constructor IntPub()
|
||||
|
||||
public class object Default {
|
||||
public default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,7 @@ internal final class IntPub {
|
||||
private final class PriInt {
|
||||
/*primary*/ public constructor PriInt()
|
||||
|
||||
internal class object Default {
|
||||
internal default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
}
|
||||
}
|
||||
@@ -35,7 +35,7 @@ private final class PriInt {
|
||||
private final class PriPri {
|
||||
/*primary*/ public constructor PriPri()
|
||||
|
||||
private class object Default {
|
||||
private default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
}
|
||||
}
|
||||
@@ -43,7 +43,7 @@ private final class PriPri {
|
||||
private final class PriPub {
|
||||
/*primary*/ public constructor PriPub()
|
||||
|
||||
public class object Default {
|
||||
public default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
}
|
||||
}
|
||||
@@ -51,7 +51,7 @@ private final class PriPub {
|
||||
public final class PubInt {
|
||||
/*primary*/ public constructor PubInt()
|
||||
|
||||
internal class object Default {
|
||||
internal default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
}
|
||||
}
|
||||
@@ -59,7 +59,7 @@ public final class PubInt {
|
||||
public final class PubPri {
|
||||
/*primary*/ public constructor PubPri()
|
||||
|
||||
private class object Default {
|
||||
private default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
}
|
||||
}
|
||||
@@ -67,7 +67,7 @@ public final class PubPri {
|
||||
public final class PubPub {
|
||||
/*primary*/ public constructor PubPub()
|
||||
|
||||
public class object Default {
|
||||
public default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,6 @@ package test
|
||||
trait Bbb
|
||||
|
||||
class ClassObjectextendsTrait {
|
||||
class object : Bbb {
|
||||
default object : Bbb {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ internal trait Bbb {
|
||||
internal final class ClassObjectextendsTrait {
|
||||
/*primary*/ public constructor ClassObjectextendsTrait()
|
||||
|
||||
internal class object Default : test.Bbb {
|
||||
internal default object Default : test.Bbb {
|
||||
/*primary*/ private constructor Default()
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -3,6 +3,6 @@ package test
|
||||
trait Bbb<P>
|
||||
|
||||
class ClassObjectExtendsTraitWithTP {
|
||||
class object : Bbb<String> {
|
||||
default object : Bbb<String> {
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ internal trait Bbb</*0*/ P> {
|
||||
internal final class ClassObjectExtendsTraitWithTP {
|
||||
/*primary*/ public constructor ClassObjectExtendsTraitWithTP()
|
||||
|
||||
internal class object Default : test.Bbb<kotlin.String> {
|
||||
internal default object Default : test.Bbb<kotlin.String> {
|
||||
/*primary*/ private constructor Default()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
package test
|
||||
|
||||
class A {
|
||||
class object {
|
||||
default object {
|
||||
val some = 1
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ internal final class A {
|
||||
internal final val other: kotlin.Int = 1
|
||||
internal final fun <get-other>(): kotlin.Int
|
||||
|
||||
internal class object Default {
|
||||
internal default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
internal final val some: kotlin.Int = 1
|
||||
internal final fun <get-some>(): kotlin.Int
|
||||
|
||||
@@ -7,5 +7,5 @@ trait T {
|
||||
class A : T {
|
||||
override fun foo(): Int = 42
|
||||
|
||||
class object : T by A()
|
||||
default object : T by A()
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ internal final class A : test.T {
|
||||
/*primary*/ public constructor A()
|
||||
internal open override /*1*/ fun foo(): kotlin.Int
|
||||
|
||||
internal class object Default : test.T {
|
||||
internal default object Default : test.T {
|
||||
/*primary*/ private constructor Default()
|
||||
internal open override /*1*/ /*delegation*/ fun foo(): kotlin.Int
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
package test
|
||||
|
||||
class TestFirst {
|
||||
class object {
|
||||
default object {
|
||||
fun testing(a: InnerClass) = 45
|
||||
fun testing(a: NotInnerClass) = 45
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ package test
|
||||
internal final class TestFirst {
|
||||
/*primary*/ public constructor TestFirst()
|
||||
|
||||
internal class object Default {
|
||||
internal default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
internal final fun testing(/*0*/ a: test.TestFirst.InnerClass): kotlin.Int
|
||||
internal final fun testing(/*0*/ a: test.TestFirst.NotInnerClass): kotlin.Int
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package test
|
||||
|
||||
class NamedClassObject {
|
||||
class object Named {
|
||||
default object Named {
|
||||
fun f(): Int = 1
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ package test
|
||||
internal final class NamedClassObject {
|
||||
/*primary*/ public constructor NamedClassObject()
|
||||
|
||||
internal class object Named {
|
||||
internal default object Named {
|
||||
/*primary*/ private constructor Named()
|
||||
internal final fun f(): kotlin.Int
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package test
|
||||
|
||||
class SimpleClassObject() {
|
||||
class object {
|
||||
default object {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ package test
|
||||
internal final class SimpleClassObject {
|
||||
/*primary*/ public constructor SimpleClassObject()
|
||||
|
||||
internal class object Default {
|
||||
internal default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package test
|
||||
|
||||
class Test {
|
||||
|
||||
class object {
|
||||
default object {
|
||||
|
||||
public val prop1 : Int = 10
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package test
|
||||
internal final class Test {
|
||||
/*primary*/ public constructor Test()
|
||||
|
||||
internal class object Default {
|
||||
internal default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
public final val prop1: kotlin.Int = 10
|
||||
public final fun <get-prop1>(): kotlin.Int
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package test
|
||||
|
||||
trait Test {
|
||||
|
||||
class object {
|
||||
default object {
|
||||
|
||||
public val prop1 : Int = 10
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ package test
|
||||
|
||||
internal trait Test {
|
||||
|
||||
internal class object Default {
|
||||
internal default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
public final val prop1: kotlin.Int = 10
|
||||
public final fun <get-prop1>(): kotlin.Int
|
||||
|
||||
Reference in New Issue
Block a user