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

Restore some of the tests for deprecated OBJECT$ field

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-02-11 19:37:50 +03:00
parent 2d59791cf2
commit ed5e2a21d1
12 changed files with 97 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt
+6
View File
@@ -2,4 +2,10 @@ class C {
<!REDECLARATION!>class object<!> {}
val <!REDECLARATION!>Default<!> = C
}
class D {
<!CONFLICTING_JVM_DECLARATIONS!>class object<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = D
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt
+15
View File
@@ -14,3 +14,18 @@ internal final class C {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
internal final class D {
public constructor D()
internal final val `OBJECT$`: D.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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class 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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt
+8
View File
@@ -4,4 +4,12 @@ class C {
}
val <!REDECLARATION!>Default<!> = C
}
class D {
<!CONFLICTING_JVM_DECLARATIONS!>class object<!> {
<!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = this
}
val `OBJECT$` = D
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt
+16
View File
@@ -15,3 +15,19 @@ internal final class C {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
internal final class D {
public constructor D()
internal final val `OBJECT$`: D.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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default {
private constructor Default()
internal final val `OBJECT$`: D.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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}