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/overload/ConstructorVsFunOverload.kt
+2 -2
View File
@@ -13,7 +13,7 @@ class Tram {
}
class Yvayva {
default object {
companion object {
<!CONFLICTING_OVERLOADS!>fun fghj()<!> { }
class <!CONFLICTING_OVERLOADS!>fghj()<!> { }
@@ -23,7 +23,7 @@ class Yvayva {
class Rtyu {
fun ololo() { }
default object {
companion object {
class ololo() { }
}
}
compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.txt
+4 -4
View File
@@ -10,8 +10,8 @@ package constructorVsFun {
internal final fun ololo(): kotlin.Unit
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
@@ -46,8 +46,8 @@ package constructorVsFun {
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
internal final fun fghj(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int