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/enum/classObjectInEnum.kt
+1 -1
View File
@@ -1,7 +1,7 @@
enum class E {
ENTRY
default object {
companion object {
fun entry() = ENTRY
}
}
compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt
+2 -2
View File
@@ -21,8 +21,8 @@ internal final enum class E : kotlin.Enum<E> {
public final override /*1*/ /*fake_override*/ fun ordinal(): 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 fun entry(): E
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/enum/classObjectInEnumPrivate.kt
+1 -1
View File
@@ -1,7 +1,7 @@
enum class E {
ENTRY
private default object
private companion object
}
fun foo() = E.values()
compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt
+3 -3
View File
@@ -3,7 +3,7 @@ package
internal fun bar(): E
internal fun baz(): E
internal fun foo(): kotlin.Array<E>
internal fun quux(): E.Default
internal fun quux(): E.Companion
internal final enum class E : kotlin.Enum<E> {
public enum entry ENTRY : E {
@@ -24,8 +24,8 @@ internal final enum class E : kotlin.Enum<E> {
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
private default object Default {
private constructor Default()
private 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/enum/enumEntryCannotHaveClassObject.kt
+1 -1
View File
@@ -2,7 +2,7 @@ enum class E {
FIRST
SECOND {
<!DEFAULT_OBJECT_NOT_ALLOWED!>default<!> object {
<!COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object {
fun foo() = 42
}
}
compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt
+2 -2
View File
@@ -22,8 +22,8 @@ internal final enum class E : kotlin.Enum<E> {
public final override /*1*/ /*fake_override*/ fun ordinal(): 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 open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/enum/enumModifier.kt
+1 -1
View File
@@ -1,7 +1,7 @@
enum class B {}
class A {
<!ILLEGAL_ENUM_ANNOTATION!>enum<!> default object {}
<!ILLEGAL_ENUM_ANNOTATION!>enum<!> companion object {}
}
<!ILLEGAL_ENUM_ANNOTATION!>enum<!> object O {}
compiler/testData/diagnostics/tests/enum/enumModifier.txt
+2 -2
View File
@@ -10,8 +10,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/enum/inner/existingClassObject.kt
+2 -2
View File
@@ -3,14 +3,14 @@ class A {
ENTRY
}
default object {
companion object {
}
}
class B {
default object {
companion object {
}
enum class E {
compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt
+4 -4
View File
@@ -6,8 +6,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
@@ -44,8 +44,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 {
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/enum/inner/insideClassObject.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class A {
default object {
companion object {
enum class E {
ENTRY
}
compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt
+8 -8
View File
@@ -6,16 +6,16 @@ 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
internal final enum class E : kotlin.Enum<A.Default.E> {
public enum entry ENTRY : A.Default.E {
internal final enum class E : kotlin.Enum<A.Companion.E> {
public enum entry ENTRY : A.Companion.E {
private constructor ENTRY()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -24,7 +24,7 @@ internal final class A {
}
private constructor E()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -32,8 +32,8 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Default.E
public final /*synthesized*/ fun values(): kotlin.Array<A.Default.E>
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E
public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
}
}
}
compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.kt
+1 -1
View File
@@ -3,7 +3,7 @@ class A {
ENTRY
}
default object {
companion object {
enum class E {
ENTRY2
}
compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt
+8 -8
View File
@@ -6,16 +6,16 @@ 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
internal final enum class E : kotlin.Enum<A.Default.E> {
public enum entry ENTRY2 : A.Default.E {
internal final enum class E : kotlin.Enum<A.Companion.E> {
public enum entry ENTRY2 : A.Companion.E {
private constructor ENTRY2()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -24,7 +24,7 @@ internal final class A {
}
private constructor E()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -32,8 +32,8 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Default.E
public final /*synthesized*/ fun values(): kotlin.Array<A.Default.E>
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E
public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
}
}
compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class A {
default object {
companion object {
enum class E { ENTRY } // OK
}
compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt
+8 -8
View File
@@ -37,16 +37,16 @@ internal final class A {
}
}
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
internal final enum class E : kotlin.Enum<A.Default.E> {
public enum entry ENTRY : A.Default.E {
internal final enum class E : kotlin.Enum<A.Companion.E> {
public enum entry ENTRY : A.Companion.E {
private constructor ENTRY()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -55,7 +55,7 @@ internal final class A {
}
private constructor E()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -63,8 +63,8 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Default.E
public final /*synthesized*/ fun values(): kotlin.Array<A.Default.E>
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E
public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
}
}
}
compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.kt
+1 -1
View File
@@ -6,7 +6,7 @@ enum class E {
ANOTHER
class Nested {
default object {
companion object {
fun foo() = 42
}
}
compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt
+2 -2
View File
@@ -45,8 +45,8 @@ package 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()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.kt
+1 -1
View File
@@ -1,7 +1,7 @@
enum class E {
ENTRY
default object {
companion object {
fun foo(): E = ENTRY
fun bar(): Array<E> = values()
fun baz(): E = valueOf("ENTRY")
compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt
+2 -2
View File
@@ -29,8 +29,8 @@ internal final enum class E : kotlin.Enum<E> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal final fun zab(): E
internal default object Default {
private constructor Default()
internal companion object Companion {
private constructor Companion()
internal final val valuez: kotlin.Array<E>
internal final fun bar(): kotlin.Array<E>
internal final fun baz(): E