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/inner/classesInClassObjectHeader.kt
+1 -1
View File
@@ -1,6 +1,6 @@
class Test {
[`InnerAnnotation`InnerAnnotation]
class object : StaticClass(), <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!><!MANY_CLASSES_IN_SUPERTYPE_LIST!>InnerClass<!>()<!> {
default object : StaticClass(), <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!><!MANY_CLASSES_IN_SUPERTYPE_LIST!>InnerClass<!>()<!> {
}
compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt
+1 -1
View File
@@ -6,7 +6,7 @@ internal final class Test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
Test.InnerAnnotation() Test.InnerAnnotation() internal class object Default : Test.StaticClass, Test.InnerClass {
Test.InnerAnnotation() Test.InnerAnnotation() internal default object Default : Test.StaticClass, Test.InnerClass {
private constructor Default()
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/inner/deepInnerClass.kt
+1 -1
View File
@@ -4,7 +4,7 @@ class A<T> {
class B {
fun test() {
class C<W>() : P<W, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>> {
<!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> : P<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>W<!>, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>> {
default <!DEFAULT_OBJECT_NOT_ALLOWED!>object<!> : P<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>W<!>, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>> {
}
inner class D : P<W, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>>
compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.kt
+1 -1
View File
@@ -7,7 +7,7 @@ object A {
}
class B {
class object {
default object {
class LoginFormPage() : Request({
val <!UNUSED_VARIABLE!>failed<!> = session.get("LOGIN_FAILED")
})
compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.txt
+1 -1
View File
@@ -45,7 +45,7 @@ package f {
}
}
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/inner/illegalModifier.kt
+2 -2
View File
@@ -11,7 +11,7 @@ class D {
<!ILLEGAL_MODIFIER!>inner<!> object G
<!ILLEGAL_MODIFIER!>inner<!> enum class R
<!ILLEGAL_MODIFIER!>inner<!> annotation class S
<!ILLEGAL_MODIFIER!>inner<!> class object
<!ILLEGAL_MODIFIER!>inner<!> default object
}
enum class H {
@@ -31,7 +31,7 @@ object N {
}
class P {
class object {
default object {
<!INNER_CLASS_IN_OBJECT!>inner<!> class Q
}
}
compiler/testData/diagnostics/tests/inner/illegalModifier.txt
+2 -2
View File
@@ -30,7 +30,7 @@ internal final class D {
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
@@ -150,7 +150,7 @@ internal final class P {
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/inner/innerClassesInStaticParameters.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Test {
class object {
default object {
fun test(<!UNUSED_PARAMETER!>t<!>: TestInner) = 42
}
compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.txt
+1 -1
View File
@@ -6,7 +6,7 @@ internal final class Test {
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/inner/innerErrorForClassObjects.kt
+2 -2
View File
@@ -1,11 +1,11 @@
open class SomeClass<T>
class TestSome<P> {
class object : SomeClass<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>P<!>>() {
default object : SomeClass<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>P<!>>() {
}
}
class Test {
class object : <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!> {
default object : <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!> {
val a = object: <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!> {
}
compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.txt
+2 -2
View File
@@ -15,7 +15,7 @@ internal final class Test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default : Test.InnerClass {
internal default object Default : Test.InnerClass {
private constructor Default()
internal final val a: Test.InnerClass
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -38,7 +38,7 @@ internal final class TestSome</*0*/ P> {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default : SomeClass<P> {
internal default object Default : SomeClass<P> {
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/inner/nestedClassAccessedViaInstanceReference.kt
+4 -4
View File
@@ -1,24 +1,24 @@
trait N { fun foo() = 1 }
class WithClassObject {
class object {}
default object {}
class Nested()
class NestedWithClassObject { class object : N }
class NestedWithClassObject { default object : N }
enum class NestedEnum { A }
object NestedObj : N { fun invoke() = 1 }
}
class WithoutClassObject {
class Nested()
class NestedWithClassObject { class object : N }
class NestedWithClassObject { default object : N }
enum class NestedEnum { A }
object NestedObj : N { fun invoke() = 1 }
}
object Obj {
class Nested()
class NestedWithClassObject { class object : N }
class NestedWithClassObject { default object : N }
enum class NestedEnum { A }
object NestedObj : N { fun invoke() = 1 }
}
compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt
+4 -4
View File
@@ -61,7 +61,7 @@ internal object Obj {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default : N {
internal default object Default : N {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
@@ -77,7 +77,7 @@ internal final class WithClassObject {
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
@@ -130,7 +130,7 @@ internal final class WithClassObject {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default : N {
internal default object Default : N {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
@@ -192,7 +192,7 @@ internal final class WithoutClassObject {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default : N {
internal default object Default : N {
private constructor Default()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.kt
+2 -2
View File
@@ -1,11 +1,11 @@
class Outer {
class Nested {
class object {
default object {
fun foo() = 42
}
}
class object {
default object {
fun bar() = 239
}
}
compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.txt
+2 -2
View File
@@ -9,7 +9,7 @@ internal final class Outer {
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()
internal final fun bar(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -23,7 +23,7 @@ internal final class Outer {
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/inner/resolvePackageClassInObjects.kt
+1 -1
View File
@@ -1,7 +1,7 @@
open class PackageTest
class MoreTest() {
class object: PackageTest() {
default object: PackageTest() {
}
compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.txt
+1 -1
View File
@@ -6,7 +6,7 @@ internal final class MoreTest {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default : PackageTest {
internal default object Default : PackageTest {
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/inner/selfAnnotationForClassObject.kt
+1 -1
View File
@@ -1,7 +1,7 @@
class Test {
[ClassObjectAnnotation]
[NestedAnnotation]
class object {
default object {
annotation class ClassObjectAnnotation
}
compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt
+1 -1
View File
@@ -6,7 +6,7 @@ internal final class Test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
Test.Default.ClassObjectAnnotation() Test.NestedAnnotation() internal class object Default {
Test.Default.ClassObjectAnnotation() Test.NestedAnnotation() 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