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

declared in the same file. Cleanup OverloadUtil stuff. Update testData.
2015-10-21 15:04:10 +03:00
parent 5170341624
commit 829fc6938a
12 changed files with 167 additions and 84 deletions
@@ -0,0 +1,40 @@
+// FILE: a.kt
+package a
+
+interface A
+interface B : A
+
+private fun validFun() {}
+
+private val validProp = 1
+
+<!CONFLICTING_OVERLOADS!>private fun invalidFun1()<!> {}
+<!CONFLICTING_OVERLOADS!>private fun invalidFun1()<!> {}
+
+<!CONFLICTING_OVERLOADS!>private fun invalidFun2()<!> {}
+<!CONFLICTING_OVERLOADS!>public fun invalidFun2()<!> {}
+
+<!CONFLICTING_OVERLOADS!>public fun invalidFun3()<!> {}
+
+<!CONFLICTING_OVERLOADS!>private fun invalidFun4()<!> {}
+<!CONFLICTING_OVERLOADS, CONFLICTING_OVERLOADS!>public fun invalidFun4()<!> {}
+
+public fun validFun2(a: A) = a
+public fun validFun2(b: B) = b
+
+// FILE: b.kt
+package a
+
+private fun validFun() {}
+
+private val validProp = 1
+
+<!CONFLICTING_OVERLOADS!>internal fun invalidFun3()<!> {}
+<!CONFLICTING_OVERLOADS!>internal fun invalidFun4()<!> {}
+
+// FILE: c.kt
+package a
+
+public fun validFun() {}
+
+public val validProp = 1