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/override/kt4785classObject.kt
+1 -1
View File
@@ -7,7 +7,7 @@ trait B {
}
class C {
default <!CANNOT_INFER_VISIBILITY!>object<!> : A, B {
companion <!CANNOT_INFER_VISIBILITY!>object<!> : A, B {
fun bar() = null
}
}
compiler/testData/diagnostics/tests/override/kt4785classObject.txt
+2 -2
View File
@@ -20,8 +20,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 : A, B {
private constructor Default()
internal companion object Companion : A, B {
private constructor Companion()
internal final fun bar(): kotlin.Nothing?
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*fake_override*/ fun foo(): kotlin.Unit