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/redeclarations/NoRedeclarationForClassesInDefaultObject.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package kt2247
class B {
default object {
companion object {
class Y {
}
}
compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.txt
+2 -2
View File
@@ -8,8 +8,8 @@ package kt2247 {
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/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.kt
+1 -1
View File
@@ -3,7 +3,7 @@ enum class E {
SECOND
default object {
companion object {
class FIRST
val SECOND = this
compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt
+3 -3
View File
@@ -29,9 +29,9 @@ internal final enum class E : kotlin.Enum<E> {
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default {
private constructor Default()
internal final val SECOND: E.Default
internal companion object Companion {
private constructor Companion()
internal final val SECOND: E.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/redeclarations/PropertyAndInnerClass.kt
+1 -1
View File
@@ -5,7 +5,7 @@ public class A() {
}
public class B() {
default object {
companion object {
public val <!REDECLARATION!>FOO<!>: String = "test"
public class <!REDECLARATION!>FOO<!>() { }
compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.txt
+2 -2
View File
@@ -21,8 +21,8 @@ public final class B {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public default object Default {
private constructor Default()
public companion object Companion {
private constructor Companion()
public final val FOO: kotlin.String = "test"
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/redeclarations/RedeclarationInDefaultObject.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class A {
default object B {
companion object B {
class <!REDECLARATION!>G<!>
val <!REDECLARATION!>G<!> = 1
}
compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.txt
+1 -1
View File
@@ -6,7 +6,7 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object B {
internal companion object B {
private constructor B()
internal final val G: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/redeclarations/kt2438.kt
+1 -1
View File
@@ -12,7 +12,7 @@ class B {
class A {
class <!REDECLARATION!>B<!>
default object {
companion object {
class <!REDECLARATION!>B<!>
class <!REDECLARATION!>B<!>
}
compiler/testData/diagnostics/tests/redeclarations/kt2438.txt
+2 -2
View File
@@ -22,8 +22,8 @@ package kt2438 {
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