azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class C {
class object {
default object {
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.txt
+1 -1
View File
@@ -6,7 +6,7 @@ internal final class C {
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()
internal final val x: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt
+2 -2
View File
@@ -1,11 +1,11 @@
class C {
<!REDECLARATION!>class object<!> {}
default <!REDECLARATION!>object<!> {}
val <!REDECLARATION!>Default<!> = C
}
class D {
<!CONFLICTING_JVM_DECLARATIONS!>class object<!> {}
default <!CONFLICTING_JVM_DECLARATIONS!>object<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = D
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt
+2 -2
View File
@@ -7,7 +7,7 @@ internal final class C {
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
@@ -22,7 +22,7 @@ internal final class D {
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/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class C {
class object {
default object {
val X = 1
<!CONFLICTING_JVM_DECLARATIONS!>val `X$1`<!> = 1
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.txt
+1 -1
View File
@@ -7,7 +7,7 @@ internal final class C {
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()
internal final val X: kotlin.Int = 1
internal final val `X$1`: kotlin.Int = 1
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt
+2 -2
View File
@@ -1,5 +1,5 @@
class C {
<!REDECLARATION!>class object<!> {
default <!REDECLARATION!>object<!> {
val <!REDECLARATION!>Default<!> = this
}
@@ -7,7 +7,7 @@ class C {
}
class D {
<!CONFLICTING_JVM_DECLARATIONS!>class object<!> {
default <!CONFLICTING_JVM_DECLARATIONS!>object<!> {
<!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = this
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt
+2 -2
View File
@@ -7,7 +7,7 @@ internal final class C {
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()
internal final val Default: C.Default
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -23,7 +23,7 @@ internal final class D {
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()
internal final val `OBJECT$`: D.Default
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean