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/extensions/classObject.kt
+2 -2
View File
@@ -1,7 +1,7 @@
trait Tr
class A { default object }
class B { default object : Tr }
class A { companion object }
class B { companion object : Tr }
fun Any.f1() {}
fun Any?.f2() {}
compiler/testData/diagnostics/tests/extensions/classObject.txt
+4 -4
View File
@@ -13,8 +13,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
@@ -27,8 +27,8 @@ internal final class B {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : Tr {
private constructor Default()
internal companion object Companion : Tr {
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/extensions/extensionMemberInClassObject.kt
+1 -1
View File
@@ -5,7 +5,7 @@ trait JPAEntityClass<D> {
}
class Foo {
default object : JPAEntityClass<Foo>
companion object : JPAEntityClass<Foo>
}
fun main(args: Array<String>) {
compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.txt
+2 -2
View File
@@ -9,8 +9,8 @@ internal final class Foo {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal default object Default : JPAEntityClass<Foo> {
private constructor Default()
internal companion object Companion : JPAEntityClass<Foo> {
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/extensions/kt3470.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class A {
default object {
companion object {
fun foo() = toString()
}
}
compiler/testData/diagnostics/tests/extensions/kt3470.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
internal final fun foo(): kotlin.String
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int