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

KT-9547: private package member can conflict only with the members

Browse Source 
declared in the same file.
Cleanup OverloadUtil stuff.
Update testData.
This commit is contained in:
Dmitry Petrov
2015-10-21 15:04:10 +03:00
parent 5170341624
commit 829fc6938a
12 changed files with 167 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/redeclarations/RedeclaringPrivateToFile.txt
Vendored
+33
View File
@@ -0,0 +1,33 @@
package
package a {
private val validProp: kotlin.Int = 1
private val validProp: kotlin.Int = 1
public val validProp: kotlin.Int = 1
private fun invalidFun1(): kotlin.Unit
private fun invalidFun1(): kotlin.Unit
private fun invalidFun2(): kotlin.Unit
public fun invalidFun2(): kotlin.Unit
internal fun invalidFun3(): kotlin.Unit
public fun invalidFun3(): kotlin.Unit
internal fun invalidFun4(): kotlin.Unit
private fun invalidFun4(): kotlin.Unit
public fun invalidFun4(): kotlin.Unit
private fun validFun(): kotlin.Unit
private fun validFun(): kotlin.Unit
public fun validFun(): kotlin.Unit
public fun validFun2(/*0*/ a: a.A): a.A
public fun validFun2(/*0*/ b: a.B): a.B
public interface A {
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
}
public interface B : a.A {
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
}
}