objects or variables members import resolve functionality rollback

This commit is contained in:
svtk
2011-12-29 17:00:39 +04:00
parent 0e8dbbac2f
commit 533bab41ef
3 changed files with 46 additions and 21 deletions
@@ -5,22 +5,23 @@ import b.B //class
import b.foo //function
import b.ext //extension function
import b.value //property
import b.C.bar //function from class object
import b.C.cValue //property from class object
import b.constant.fff //function from val
import b.constant.dValue //property from val
import b.E.f //val from class object
import b.C.<!CANNOT_IMPORT_OBJECT_MEMBERS!>bar<!> //function from class object
import b.C.<!CANNOT_IMPORT_OBJECT_MEMBERS!>cValue<!> //property from class object
import b.constant.<!CANNOT_IMPORT_VARIABLE_MEMBERS!>fff<!> //function from val
import b.constant.<!CANNOT_IMPORT_VARIABLE_MEMBERS!>dValue<!> //property from val
import b.E.<!CANNOT_IMPORT_OBJECT_MEMBERS!>f<!> //val from class object
import <!UNRESOLVED_REFERENCE!>smth<!>.illegal
fun test(arg: B) {
foo(value)
arg.ext()
bar()
foo(cValue)
<!UNRESOLVED_REFERENCE!>bar<!>()
foo(<!UNRESOLVED_REFERENCE!>cValue<!>)
fff(dValue)
<!UNRESOLVED_REFERENCE!>fff<!>(<!UNRESOLVED_REFERENCE!>dValue<!>)
f.f()
<!UNRESOLVED_REFERENCE!>f<!>.f()
}
// FILE:b.kt
@@ -61,14 +62,14 @@ class F() {
//FILE:c.kt
package c
import C.*
import <!CANNOT_IMPORT_OBJECT_MEMBERS!>C<!>.*
object C {
fun a() {
fun f() {
}
val b = 3
val i = 3
}
fun foo() {
if (b == 3) a()
if (<!UNRESOLVED_REFERENCE!>i<!> == 3) <!UNRESOLVED_REFERENCE!>f<!>()
}