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

Dropping package facades:

Browse Source 
- clashing JVM signature diagnostics should be reported in stable order
- drop tests for clashes vs package facades
- introduce box test for class named as old package facade
- fix some testData
This commit is contained in:
Dmitry Petrov
2015-10-16 15:28:04 +03:00
parent 014bcfeb15
commit 8ab55813fe
14 changed files with 39 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/jvm/syntheticAccessorSignatureClash.out
Vendored
+10 -10
View File
@@ -3,29 +3,29 @@ compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:15:5: error: accide
fun foo(): kotlin.Unit
private fun foo() {}
^
compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:18:9: error: accidental override: The following declarations have the same JVM signature (access$getBar$p(LDerived;)I):
fun `access$getBar$p`(d: Derived): kotlin.Int
compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:18:9: error: accidental override: The following declarations have the same JVM signature (access$getBar$1(LDerived;)I):
fun <get-bar>(): kotlin.Int
fun `access$getBar$1`(d: Derived): kotlin.Int
get
^
compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:19:9: error: accidental override: The following declarations have the same JVM signature (access$setBar$p(LDerived;I)V):
fun `access$setBar$p`(d: Derived, i: kotlin.Int): kotlin.Unit
compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:19:9: error: accidental override: The following declarations have the same JVM signature (access$setBar$1(LDerived;I)V):
fun <set-bar>(<set-?>: kotlin.Int): kotlin.Unit
fun `access$setBar$1`(d: Derived, i: kotlin.Int): kotlin.Unit
set
^
compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:21:5: error: accidental override: The following declarations have the same JVM signature (access$getBaz$p(LDerived;)I):
fun `access$getBaz$p`(d: Derived): kotlin.Int
compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:21:5: error: accidental override: The following declarations have the same JVM signature (access$getBaz$2(LDerived;)I):
fun <get-baz>(): kotlin.Int
fun `access$getBaz$2`(d: Derived): kotlin.Int
private var baz = 1
^
compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:23:5: error: accidental override: The following declarations have the same JVM signature (access$getBoo$p(LDerived;)I):
fun `access$getBoo$p`(d: Derived): kotlin.Int
compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:23:5: error: accidental override: The following declarations have the same JVM signature (access$getBoo$3(LDerived;)I):
fun <get-boo>(): kotlin.Int
fun `access$getBoo$3`(d: Derived): kotlin.Int
private val boo = 1
^
compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:27:9: error: accidental override: The following declarations have the same JVM signature (access$setBar1$p(LDerived;I)V):
fun `access$setBar1$p`(d: Derived, i: kotlin.Int): kotlin.Unit
compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:27:9: error: accidental override: The following declarations have the same JVM signature (access$setBar1$4(LDerived;I)V):
fun <set-bar1>(<set-?>: kotlin.Int): kotlin.Unit
fun `access$setBar1$4`(d: Derived, i: kotlin.Int): kotlin.Unit
set
^
COMPILATION_ERROR