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

default -> companion: replace all mentions of default and default object

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-03-16 14:56:06 +03:00
parent a0783757e8
commit 06916d98c6
1019 changed files with 2468 additions and 2469 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 {
default object {
companion object {
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.txt
+2 -2
View File
@@ -6,8 +6,8 @@ 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 default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val x: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun getX(): kotlin.Int
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt
+3 -3
View File
@@ -1,11 +1,11 @@
class C {
default <!REDECLARATION!>object<!> {}
companion <!REDECLARATION!>object<!> {}
val <!REDECLARATION!>Default<!> = C
val <!REDECLARATION!>Companion<!> = C
}
class D {
default <!CONFLICTING_JVM_DECLARATIONS!>object<!> {}
companion <!CONFLICTING_JVM_DECLARATIONS!>object<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = D
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt
+6 -6
View File
@@ -2,13 +2,13 @@ package
internal final class C {
public constructor C()
internal final val Default: C.Default
internal final val Companion: C.Companion
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -17,13 +17,13 @@ internal final class C {
internal final class D {
public constructor D()
internal final val `OBJECT$`: D.Default
internal final val `OBJECT$`: D.Companion
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class C {
default object {
companion object {
val X = 1
<!CONFLICTING_JVM_DECLARATIONS!>val `X$1`<!> = 1
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.txt
+2 -2
View File
@@ -7,8 +7,8 @@ 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 default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val X: kotlin.Int = 1
internal final val `X$1`: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt
+3 -3
View File
@@ -1,19 +1,19 @@
class B {
default object <!REDECLARATION!>A<!> {
companion object <!REDECLARATION!>A<!> {
}
val <!REDECLARATION!>A<!> = this
}
class C {
default <!CONFLICTING_JVM_DECLARATIONS!>object A<!> {
companion <!CONFLICTING_JVM_DECLARATIONS!>object A<!> {
<!CONFLICTING_JVM_DECLARATIONS!>val A<!> = this
}
}
class D {
default <!CONFLICTING_JVM_DECLARATIONS!>object<!> {
companion <!CONFLICTING_JVM_DECLARATIONS!>object<!> {
<!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = this
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt
+6 -6
View File
@@ -7,7 +7,7 @@ internal final class B {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object A {
internal companion object A {
private constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -21,7 +21,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 default object A {
internal companion object A {
private constructor A()
internal final val A: C.A
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -32,14 +32,14 @@ internal final class C {
internal final class D {
public constructor D()
internal final val `OBJECT$`: D.Default
internal final val `OBJECT$`: D.Companion
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal final val `OBJECT$`: D.Default
internal companion object Companion {
private constructor Companion()
internal final val `OBJECT$`: D.Companion
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String