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

Update duplicate jvm signature test for class objects

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-01-28 15:36:09 +03:00
parent 1972c2f177
commit 0ea69dea95
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt
+2 -2
View File
@@ -1,5 +1,5 @@
class C { class C {
<!CONFLICTING_JVM_DECLARATIONS!>class object<!> {} <!REDECLARATION!>class object<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = C val <!REDECLARATION!>Default<!> = C
} }
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package
internal final class C { internal final class C {
public constructor C() public constructor C()
internal final val `OBJECT$`: C.Default internal final val Default: C.Default
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean 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 hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt
+3 -3
View File
@@ -1,7 +1,7 @@
class C { class C {
<!CONFLICTING_JVM_DECLARATIONS!>class object<!> { <!REDECLARATION!>class object<!> {
<!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = this val <!REDECLARATION!>Default<!> = this
} }
val `OBJECT$` = C val <!REDECLARATION!>Default<!> = C
} }
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt
+2 -2
View File
@@ -2,14 +2,14 @@ package
internal final class C { internal final class C {
public constructor C() public constructor C()
internal final val `OBJECT$`: C.Default internal final val Default: C.Default
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean 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 hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object Default { internal class object Default {
private constructor Default() private constructor Default()
internal final val `OBJECT$`: C.Default internal final val Default: C.Default
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean 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 hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String