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/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.kt
+1 -1
View File
@@ -4,7 +4,7 @@ annotation class AnnClass(val a: Class<*>)
class MyClass {
AnnClass(javaClass<MyClass>()) default object {
AnnClass(javaClass<MyClass>()) companion object {
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.txt
+2 -2
View File
@@ -16,8 +16,8 @@ package test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
test.AnnClass(a = test.MyClass.class: java.lang.Class<test.MyClass>) internal default object Default {
private constructor Default()
test.AnnClass(a = test.MyClass.class: java.lang.Class<test.MyClass>) 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/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt
+1 -1
View File
@@ -23,7 +23,7 @@ object B: A() {
class C {
default object: A() {
companion object: A() {
[platformStatic] override fun a() {}
[platformStatic] override fun b() {}
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.txt
+2 -2
View File
@@ -27,8 +27,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 {
private constructor Default()
internal companion object Companion : A {
private constructor Companion()
kotlin.platform.platformStatic() internal open override /*1*/ fun a(): kotlin.Unit
kotlin.platform.platformStatic() internal open override /*1*/ fun b(): kotlin.Unit
kotlin.platform.platformStatic() internal final override /*1*/ fun c(): kotlin.Unit
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt
+2 -2
View File
@@ -2,7 +2,7 @@
import kotlin.platform.platformStatic
class A {
default object {
companion object {
platformStatic fun a1() {
}
@@ -28,7 +28,7 @@ class A {
}
trait B {
default object {
companion object {
<!PLATFORM_STATIC_NOT_IN_OBJECT!>platformStatic fun a1()<!> {
}
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.txt
+4 -4
View File
@@ -16,8 +16,8 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
kotlin.platform.platformStatic() internal final fun a1(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -40,8 +40,8 @@ internal trait B {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
kotlin.platform.platformStatic() internal final fun a1(): kotlin.Unit
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/testsWithStdLib/annotations/platformStatic/property.kt
+1 -1
View File
@@ -7,7 +7,7 @@ open class B {
}
class A {
default object : B() {
companion object : B() {
var p1:Int = 1
[platformStatic] set(p: Int) {
p1 = 1
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.txt
+2 -2
View File
@@ -20,8 +20,8 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal default object Default : B {
private constructor Default()
internal companion object Companion : B {
private constructor Companion()
kotlin.platform.platformStatic() public open override /*1*/ val base1: kotlin.Int = 0
public open override /*1*/ val base2: kotlin.Int = 0
internal final var p1: kotlin.Int
compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt
+1 -1
View File
@@ -12,7 +12,7 @@ class A {
y : KMemberFunction0<A, Inner>
}
default object {
companion object {
fun main() {
::<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>Inner<!>
val y = A::Inner
compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.txt
+2 -2
View File
@@ -7,8 +7,8 @@ internal final class A {
internal final fun main(): 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
internal final fun main(): kotlin.Unit
compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt
+1 -1
View File
@@ -12,7 +12,7 @@ class A {
y : KFunction0<Nested>
}
default object {
companion object {
fun main() {
::Nested
val y = A::Nested
compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.txt
+2 -2
View File
@@ -7,8 +7,8 @@ internal final class A {
internal final fun main(): 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
internal final fun main(): kotlin.Unit
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.kt
+1 -1
View File
@@ -5,7 +5,7 @@ open class Base {
}
class Derived : Base() {
default object {
companion object {
<!ACCIDENTAL_OVERRIDE!>platformStatic fun foo()<!> {}
}
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.txt
+2 -2
View File
@@ -15,8 +15,8 @@ internal final class Derived : Base {
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
kotlin.platform.platformStatic() internal final fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/testsWithStdLib/native/body.kt
+1 -1
View File
@@ -5,7 +5,7 @@ import kotlin.jvm.*
class C {
<!NATIVE_DECLARATION_CANNOT_HAVE_BODY!>native fun foo()<!> {}
default object {
companion object {
<!NATIVE_DECLARATION_CANNOT_HAVE_BODY!>native fun foo()<!> {}
}
}
compiler/testData/diagnostics/testsWithStdLib/native/body.txt
+2 -2
View File
@@ -10,8 +10,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()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.jvm.native() internal final fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/testsWithStdLib/native/noBody.kt
+1 -1
View File
@@ -5,7 +5,7 @@ native fun foo()
class C {
native fun foo()
default object {
companion object {
native fun foo()
}
}
compiler/testData/diagnostics/testsWithStdLib/native/noBody.txt
+2 -2
View File
@@ -10,8 +10,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()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.jvm.native() internal final fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/testsWithStdLib/native/trait.kt
+1 -1
View File
@@ -4,7 +4,7 @@ trait Tr {
<!NATIVE_DECLARATION_IN_TRAIT!>native fun foo()<!>
<!NATIVE_DECLARATION_IN_TRAIT, NATIVE_DECLARATION_CANNOT_HAVE_BODY!>native fun bar()<!> {}
default object {
companion object {
native fun foo()
<!NATIVE_DECLARATION_CANNOT_HAVE_BODY!>native fun bar()<!> {}
}
compiler/testData/diagnostics/testsWithStdLib/native/trait.txt
+2 -2
View File
@@ -7,8 +7,8 @@ internal trait Tr {
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()
kotlin.jvm.native() internal final fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.jvm.native() internal final fun foo(): kotlin.Unit