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/j+k/InnerClassFromJava.kt
+1 -1
View File
@@ -6,7 +6,7 @@ public interface I extends Boo {
// FILE: Baz.kt
public trait Foo {
default object {
companion object {
public val EMPTY: Foo = object : Foo{}
}
}
compiler/testData/diagnostics/tests/j+k/InnerClassFromJava.txt
+2 -2
View File
@@ -31,8 +31,8 @@ public trait Foo {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public default object Default {
private constructor Default()
public companion object Companion {
private constructor Companion()
public final val EMPTY: Foo
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/tests/j+k/accessClassObjectFromJava.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Foo {
default object {
companion object {
val bar = 1
fun test(<!UNUSED_PARAMETER!>a<!>: Foo.<!UNRESOLVED_REFERENCE!>`object`<!>) {
compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.txt
+2 -2
View File
@@ -6,8 +6,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 {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val bar: kotlin.Int = 1
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/tests/j+k/javaStaticImport.kt
+1 -1
View File
@@ -16,7 +16,7 @@ public class AsmUtil {
// FILE: First.kt
package frontend
public class JvmDeclarationOrigin {
default object {
companion object {
public val NO_ORIGIN: JvmDeclarationOrigin = JvmDeclarationOrigin()
}
}
compiler/testData/diagnostics/tests/j+k/javaStaticImport.txt
+2 -2
View File
@@ -32,8 +32,8 @@ package frontend {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public default object Default {
private constructor Default()
public companion object Companion {
private constructor Companion()
public final val NO_ORIGIN: frontend.JvmDeclarationOrigin
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int