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:
+1
-1
@@ -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()
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ annotation class Ann(val i: Int)
|
||||
|
||||
class A {
|
||||
class B {
|
||||
class object {
|
||||
default object {
|
||||
val i = 1
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
import kotlin.reflect.KMemberProperty
|
||||
|
||||
class A {
|
||||
class object {
|
||||
default object {
|
||||
val ref: KMemberProperty<A, String> = A::foo
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
class C {
|
||||
class object {
|
||||
default object {
|
||||
val defaultGetter: Int = 1
|
||||
[native] get
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ import kotlin.jvm.*
|
||||
import kotlin.platform.*
|
||||
|
||||
class C {
|
||||
class object {
|
||||
default object {
|
||||
private platformStatic native fun foo()
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import kotlin.platform.*
|
||||
|
||||
class C {
|
||||
class object {
|
||||
default object {
|
||||
private platformStatic fun foo(): String {
|
||||
return "OK"
|
||||
}
|
||||
|
||||
@@ -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 = {}
|
||||
|
||||
@@ -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")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ open class B
|
||||
|
||||
class A {
|
||||
|
||||
class object {
|
||||
default object {
|
||||
[platformStatic]
|
||||
fun <T: B> a(s: T) : T {
|
||||
return s
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
import kotlin.test.assertEquals
|
||||
|
||||
class A {
|
||||
class object {
|
||||
default object {
|
||||
enum class Season {
|
||||
WINTER
|
||||
SPRING
|
||||
|
||||
Reference in New Issue
Block a user