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/objects/invokeOnInnerObject.kt
+2 -2
View File
@@ -1,10 +1,10 @@
//no nested class access via instance reference error
fun test() {
A.Default.f(<!TYPE_MISMATCH!>""<!>)
A.Companion.f(<!TYPE_MISMATCH!>""<!>)
}
class A() {
default object {
companion object {
object f {
fun invoke(i: Int) = i
}
compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.txt
+2 -2
View File
@@ -8,8 +8,8 @@ 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 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/objects/upperBoundViolated.kt
+1 -1
View File
@@ -5,5 +5,5 @@ object O1 : Trait<Int>
object O2 : Trait<<!UPPER_BOUND_VIOLATED!>String<!>>
class C {
default object : Trait<<!UPPER_BOUND_VIOLATED!>IntRange<!>>
companion object : Trait<<!UPPER_BOUND_VIOLATED!>IntRange<!>>
}
compiler/testData/diagnostics/tests/objects/upperBoundViolated.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 : Trait<kotlin.IntRange> {
private constructor Default()
internal companion object Companion : Trait<kotlin.IntRange> {
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