azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace 'class object' with 'default object' in renderers and test data

Browse Source 
Includes changes to decompiled text
Old syntax is used in builtins and project code for now
This commit is contained in:
Pavel V. Talanov
2015-03-06 12:51:59 +03:00
parent 28ed30bcb3
commit 59f192ef90
794 changed files with 1120 additions and 1109 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
class object {
default object {
fun entry() = ENTRY
}
}
compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt
+1 -1
View File
@@ -21,7 +21,7 @@ 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 class object Default {
internal default object Default {
private constructor Default()
internal final fun entry(): E
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.kt
+1 -1
View File
@@ -1,7 +1,7 @@
enum class E {
ENTRY
private class object
private default object
}
fun foo() = E.values()
compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt
+1 -1
View File
@@ -24,7 +24,7 @@ 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 class object Default {
private default object Default {
private constructor Default()
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/enumEntryCannotHaveClassObject.kt
+1 -1
View File
@@ -2,7 +2,7 @@ enum class E {
FIRST
SECOND {
<!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> {
default <!DEFAULT_OBJECT_NOT_ALLOWED!>object<!> {
fun foo() = 42
}
}
compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt
+1 -1
View File
@@ -22,7 +22,7 @@ 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 class object Default {
public default object Default {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): 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<!> class object {}
<!ILLEGAL_ENUM_ANNOTATION!>enum<!> default object {}
}
<!ILLEGAL_ENUM_ANNOTATION!>enum<!> object O {}
compiler/testData/diagnostics/tests/enum/enumModifier.txt
+1 -1
View File
@@ -10,7 +10,7 @@ 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 class object Default {
internal default object Default {
private constructor Default()
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/inner/existingClassObject.kt
+2 -2
View File
@@ -3,14 +3,14 @@ class A {
ENTRY
}
class object {
default object {
}
}
class B {
class object {
default object {
}
enum class E {
compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt
+2 -2
View File
@@ -6,7 +6,7 @@ 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 class object Default {
internal default object Default {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -44,7 +44,7 @@ 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 class object Default {
internal default object Default {
private constructor Default()
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/inner/insideClassObject.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class A {
class object {
default object {
enum class E {
ENTRY
}
compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt
+1 -1
View File
@@ -6,7 +6,7 @@ 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 class object Default {
internal default object Default {
private constructor Default()
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/inner/redeclarationInClassObject.kt
+1 -1
View File
@@ -3,7 +3,7 @@ class A {
ENTRY
}
class object {
default object {
enum class <!REDECLARATION!>E<!> {
ENTRY2
}
compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt
+1 -1
View File
@@ -6,7 +6,7 @@ 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 class object Default {
internal default object Default {
private constructor Default()
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/inner/twoEnumsInClassObjectAndInnerClass.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class A {
class object {
default object {
enum class E { ENTRY } // OK
}
compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt
+1 -1
View File
@@ -37,7 +37,7 @@ internal final class A {
}
}
internal class object Default {
internal default object Default {
private constructor Default()
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/starImportNestedClassAndEntries.kt
+1 -1
View File
@@ -6,7 +6,7 @@ enum class E {
ANOTHER
class Nested {
class object {
default object {
fun foo() = 42
}
}
compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt
+1 -1
View File
@@ -45,7 +45,7 @@ package foo {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default {
internal default object Default {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.Int
compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.kt
+1 -1
View File
@@ -1,7 +1,7 @@
enum class E {
ENTRY
class object {
default object {
fun foo(): E = ENTRY
fun bar(): Array<E> = values()
fun baz(): E = valueOf("ENTRY")
compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt
+1 -1
View File
@@ -29,7 +29,7 @@ internal final enum class E : kotlin.Enum<E> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal final fun zab(): E
internal class object Default {
internal default object Default {
private constructor Default()
internal final val valuez: kotlin.Array<E>
internal final fun bar(): kotlin.Array<E>