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/scopes/VisibilityInClassObject.kt
+1 -1
View File
@@ -1,7 +1,7 @@
fun devNull(<!UNUSED_PARAMETER!>obj<!>: Any?) {}
open class A {
default object {
companion object {
val internal_val = 1
public val public_val: Int = 2
private val private_val = 3
compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.txt
+2 -2
View File
@@ -10,8 +10,8 @@ internal open 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()
internal final val internal_val: kotlin.Int = 1
private final val private_val: kotlin.Int = 3
protected final val protected_val: kotlin.Int = 5
compiler/testData/diagnostics/tests/scopes/kt587.kt
+2 -2
View File
@@ -1,9 +1,9 @@
// KT-587 Unresolved reference
class Main {
default object {
companion object {
class States() {
default object {
companion object {
public val N: States = States() // : States unresolved
}
}
compiler/testData/diagnostics/tests/scopes/kt587.txt
+5 -5
View File
@@ -6,8 +6,8 @@ internal final class Main {
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
@@ -18,9 +18,9 @@ internal final class Main {
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()
public final val N: Main.Default.States
internal companion object Companion {
private constructor Companion()
public final val N: Main.Companion.States
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/scopes/kt900-1.kt
+4 -4
View File
@@ -1,7 +1,7 @@
// import all members from default object
// import all members from companion object
package c
import c.A.Default.B
import c.A.Companion.B
import c.<!CANNOT_IMPORT_ON_DEMAND_FROM_SINGLETON!>M<!>.*
fun foo() {
@@ -10,9 +10,9 @@ fun foo() {
}
class A() {
default object {
companion object {
class B() {
default object {
companion object {
}
}
}
compiler/testData/diagnostics/tests/scopes/kt900-1.txt
+4 -4
View File
@@ -9,8 +9,8 @@ package 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
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -21,8 +21,8 @@ package 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
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/scopes/kt900.kt
+6 -6
View File
@@ -13,9 +13,9 @@ fun foo() {
}
class A() {
default object {
companion object {
class B() {
default object {
companion object {
fun foo() {}
}
}
@@ -36,8 +36,8 @@ object N {
package b
import b.N.M
import b.A.Default.P
import b.A.Default.B
import b.A.Companion.P
import b.A.Companion.B
fun foo() {
val <!UNUSED_VARIABLE!>b<!> : B = B()
@@ -49,9 +49,9 @@ fun foo() {
}
class A() {
default object {
companion object {
class B() {
default object {
companion object {
fun foo() {}
}
}
compiler/testData/diagnostics/tests/scopes/kt900.txt
+8 -8
View File
@@ -9,8 +9,8 @@ package 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
@@ -21,8 +21,8 @@ package 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.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -65,8 +65,8 @@ package 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 {
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
@@ -77,8 +77,8 @@ package 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 {
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.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int