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

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
@@ -1,13 +1,13 @@
// ERROR: No value passed for parameter i
package a
fun f(p: A, t: T) {
private fun f(p: A, t: T) {
g(A(c).ext())
O1.f()
O2
E.ENTRY
}
fun f2(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedTrait, a: Outer.NestedAnnotation) {
private fun f2(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedTrait, a: Outer.NestedAnnotation) {
ClassObject
}
+2 -2
View File
@@ -44,13 +44,13 @@ class ClassObject {
}
}
<selection>fun f(p: A, t: T) {
<selection>private fun f(p: A, t: T) {
g(A(c).ext())
O1.f()
O2
ENTRY
}
fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, a: NestedAnnotation) {
private fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, a: NestedAnnotation) {
ClassObject
}</selection>