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

FIR: handle member scope for anonymous objects

Browse Source 
#KT-37120 fixed
This commit is contained in:
Ilya Kirillov
2020-04-22 11:58:32 +03:00
parent fdfb544730
commit 1a90866ce1
6 changed files with 89 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/objectInnerClass.kt
Vendored
+26 -26
View File
@@ -7,22 +7,22 @@
val case1 = object : A {
inner class Child(property: B) : Base(property) {
fun Base.zoo() {
val x = <!UNRESOLVED_REFERENCE!>property<!> //UNRESOLVED_REFERENCE
val x = property
}
fun foo() {
<!UNRESOLVED_REFERENCE!>baseFun<!>() //UNRESOLVED_REFERENCE
val x = <!UNRESOLVED_REFERENCE!>property<!> //UNRESOLVED_REFERENCE
<!UNRESOLVED_REFERENCE!>zoo<!>() //UNRESOLVED_REFERENCE
baseFun()
val x = property
zoo()
hoo()
}
}
fun Child.voo() {
val x = <!UNRESOLVED_REFERENCE!>property<!> //UNRESOLVED_REFERENCE
fun <!EXPOSED_RECEIVER_TYPE!>Child<!>.voo() {
val x = property
}
fun Base.hoo() {
val x = <!UNRESOLVED_REFERENCE!>property<!> //UNRESOLVED_REFERENCE
fun <!EXPOSED_RECEIVER_TYPE!>Base<!>.hoo() {
val x = property
}
open inner class Base(/*protected*/ val property: B) {
@@ -32,8 +32,8 @@ val case1 = object : A {
fun caseForBase() {
val base = Base(B())
/*member of Base*/
base.<!UNRESOLVED_REFERENCE!>baseFun<!>() //UNRESOLVED_REFERENCE
base.<!UNRESOLVED_REFERENCE!>property<!> //UNRESOLVED_REFERENCE
base.baseFun()
base.property
/*extensions*/
base.hoo()
}
@@ -41,10 +41,10 @@ val case1 = object : A {
fun caseForChild() {
val child = Child(B())
/*member of Base*/
child.<!UNRESOLVED_REFERENCE!>baseFun<!>() //UNRESOLVED_REFERENCE
child.<!UNRESOLVED_REFERENCE!>property<!> //UNRESOLVED_REFERENCE
child.baseFun()
child.property
/*member of Child*/
child.<!UNRESOLVED_REFERENCE!>foo<!>() //UNRESOLVED_REFERENCE
child.foo()
/*extensions*/
child.hoo()
child.voo()
@@ -100,22 +100,22 @@ class Case3() {
val x = object : A {
inner class Child(property: B) : Base(property) {
fun Base.zoo() {
val x = <!UNRESOLVED_REFERENCE!>property<!> //UNRESOLVED_REFERENCE
val x = property
}
fun foo() {
<!UNRESOLVED_REFERENCE!>baseFun<!>() //UNRESOLVED_REFERENCE
val x = <!UNRESOLVED_REFERENCE!>property<!> //UNRESOLVED_REFERENCE
<!UNRESOLVED_REFERENCE!>zoo<!>()
baseFun()
val x = property
zoo()
hoo()
}
}
fun Child.voo() {
val x = <!UNRESOLVED_REFERENCE!>property<!> //UNRESOLVED_REFERENCE
fun <!EXPOSED_RECEIVER_TYPE!>Child<!>.voo() {
val x = property
}
fun Base.hoo() {
val x = <!UNRESOLVED_REFERENCE!>property<!> //UNRESOLVED_REFERENCE
fun <!EXPOSED_RECEIVER_TYPE!>Base<!>.hoo() {
val x = property
}
open inner class Base(/*protected*/ val property: B) {
@@ -125,8 +125,8 @@ class Case3() {
fun caseForBase() {
val base = Base(B())
/*member of Base*/
base.<!UNRESOLVED_REFERENCE!>baseFun<!>() //UNRESOLVED_REFERENCE
base.<!UNRESOLVED_REFERENCE!>property<!> //UNRESOLVED_REFERENCE
base.baseFun()
base.property
/*extensions*/
base.hoo()
}
@@ -134,10 +134,10 @@ class Case3() {
fun caseForChild() {
val child = Child(B())
/*member of Base*/
child.<!UNRESOLVED_REFERENCE!>baseFun<!>() //UNRESOLVED_REFERENCE
child.<!UNRESOLVED_REFERENCE!>property<!> //UNRESOLVED_REFERENCE
child.baseFun()
child.property
/*member of Child*/
child.<!UNRESOLVED_REFERENCE!>foo<!>() //UNRESOLVED_REFERENCE
child.foo()
/*extensions*/
child.hoo()
child.voo()
compiler/fir/analysis-tests/testData/resolve/objectInnerClass.txt
Vendored
+32 -32
View File
@@ -4,30 +4,30 @@ FILE: objectInnerClass.kt
super<R|kotlin/Any|>()
}
local final inner class Child : R|ERROR CLASS: Symbol not found, for `Base`| {
local final inner class Child : R|<anonymous>.Base| {
public[local] constructor(property: R|B|): R|<anonymous>.Child| {
super<R|ERROR CLASS: Symbol not found, for `Base`|>(R|<local>/property|)
super<R|<anonymous>.Base|>(R|<local>/property|)
}
public[local] final fun R|ERROR CLASS: Symbol not found, for `Base`|.zoo(): R|kotlin/Unit| {
lval x: <ERROR TYPE REF: Unresolved name: property> = <Unresolved name: property>#
public[local] final fun R|<anonymous>.Base|.zoo(): R|kotlin/Unit| {
lval x: R|B| = this@R|/<anonymous>.Child.zoo|.R|/<anonymous>.Base.property|
}
public[local] final fun foo(): R|kotlin/Unit| {
<Unresolved name: baseFun>#()
lval x: <ERROR TYPE REF: Unresolved name: property> = <Unresolved name: property>#
<Unresolved name: zoo>#()
this@R|/<anonymous>.Child|.R|/<anonymous>.Base.baseFun|()
lval x: R|B| = this@R|/<anonymous>.Child|.R|/<anonymous>.Base.property|
(this@R|/<anonymous>.Child|, this@R|/<anonymous>.Child|).R|/<anonymous>.Child.zoo|()
(this@R|/anonymous|, this@R|/<anonymous>.Child|).R|/anonymous.hoo|()
}
}
public final fun R|ERROR CLASS: Symbol not found, for `Child`|.voo(): R|kotlin/Unit| {
lval x: <ERROR TYPE REF: Unresolved name: property> = <Unresolved name: property>#
public final fun R|<anonymous>.Child|.voo(): R|kotlin/Unit| {
lval x: R|B| = this@R|/anonymous.voo|.R|/<anonymous>.Base.property|
}
public final fun R|ERROR CLASS: Symbol not found, for `Base`|.hoo(): R|kotlin/Unit| {
lval x: <ERROR TYPE REF: Unresolved name: property> = <Unresolved name: property>#
public final fun R|<anonymous>.Base|.hoo(): R|kotlin/Unit| {
lval x: R|B| = this@R|/anonymous.hoo|.R|/<anonymous>.Base.property|
}
local open inner class Base : R|kotlin/Any| {
@@ -45,16 +45,16 @@ FILE: objectInnerClass.kt
public final fun caseForBase(): R|kotlin/Unit| {
lval base: R|<anonymous>.Base| = this@R|/anonymous|.R|/<anonymous>.Base.Base|(R|/B.B|())
R|<local>/base|.<Unresolved name: baseFun>#()
R|<local>/base|.<Unresolved name: property>#
R|<local>/base|.R|/<anonymous>.Base.baseFun|()
R|<local>/base|.R|/<anonymous>.Base.property|
(this@R|/anonymous|, R|<local>/base|).R|/anonymous.hoo|()
}
public final fun caseForChild(): R|kotlin/Unit| {
lval child: R|<anonymous>.Child| = this@R|/anonymous|.R|/<anonymous>.Child.Child|(R|/B.B|())
R|<local>/child|.<Unresolved name: baseFun>#()
R|<local>/child|.<Unresolved name: property>#
R|<local>/child|.<Unresolved name: foo>#()
R|<local>/child|.R|/<anonymous>.Base.baseFun|()
R|<local>/child|.R|/<anonymous>.Base.property|
R|<local>/child|.R|/<anonymous>.Child.foo|()
(this@R|/anonymous|, R|<local>/child|).R|/anonymous.hoo|()
(this@R|/anonymous|, R|<local>/child|).R|/anonymous.voo|()
}
@@ -129,30 +129,30 @@ FILE: objectInnerClass.kt
super<R|kotlin/Any|>()
}
local final inner class Child : R|ERROR CLASS: Symbol not found, for `Base`| {
local final inner class Child : R|Case3.<anonymous>.Base| {
public[local] constructor(property: R|B|): R|Case3.<anonymous>.Child| {
super<R|ERROR CLASS: Symbol not found, for `Base`|>(R|<local>/property|)
super<R|Case3.<anonymous>.Base|>(R|<local>/property|)
}
public[local] final fun R|ERROR CLASS: Symbol not found, for `Base`|.zoo(): R|kotlin/Unit| {
lval x: <ERROR TYPE REF: Unresolved name: property> = <Unresolved name: property>#
public[local] final fun R|Case3.<anonymous>.Base|.zoo(): R|kotlin/Unit| {
lval x: R|B| = this@R|/Case3.<anonymous>.Child.zoo|.R|/Case3.<anonymous>.Base.property|
}
public[local] final fun foo(): R|kotlin/Unit| {
<Unresolved name: baseFun>#()
lval x: <ERROR TYPE REF: Unresolved name: property> = <Unresolved name: property>#
<Unresolved name: zoo>#()
this@R|/Case3.<anonymous>.Child|.R|/Case3.<anonymous>.Base.baseFun|()
lval x: R|B| = this@R|/Case3.<anonymous>.Child|.R|/Case3.<anonymous>.Base.property|
(this@R|/Case3.<anonymous>.Child|, this@R|/Case3.<anonymous>.Child|).R|/Case3.<anonymous>.Child.zoo|()
(this@R|/anonymous|, this@R|/Case3.<anonymous>.Child|).R|/anonymous.hoo|()
}
}
public final fun R|ERROR CLASS: Symbol not found, for `Child`|.voo(): R|kotlin/Unit| {
lval x: <ERROR TYPE REF: Unresolved name: property> = <Unresolved name: property>#
public final fun R|Case3.<anonymous>.Child|.voo(): R|kotlin/Unit| {
lval x: R|B| = this@R|/anonymous.voo|.R|/Case3.<anonymous>.Base.property|
}
public final fun R|ERROR CLASS: Symbol not found, for `Base`|.hoo(): R|kotlin/Unit| {
lval x: <ERROR TYPE REF: Unresolved name: property> = <Unresolved name: property>#
public final fun R|Case3.<anonymous>.Base|.hoo(): R|kotlin/Unit| {
lval x: R|B| = this@R|/anonymous.hoo|.R|/Case3.<anonymous>.Base.property|
}
local open inner class Base : R|kotlin/Any| {
@@ -170,16 +170,16 @@ FILE: objectInnerClass.kt
public final fun caseForBase(): R|kotlin/Unit| {
lval base: R|Case3.<anonymous>.Base| = R|/Case3.<anonymous>.Base.Base|(R|/B.B|())
R|<local>/base|.<Unresolved name: baseFun>#()
R|<local>/base|.<Unresolved name: property>#
R|<local>/base|.R|/Case3.<anonymous>.Base.baseFun|()
R|<local>/base|.R|/Case3.<anonymous>.Base.property|
(this@R|/anonymous|, R|<local>/base|).R|/anonymous.hoo|()
}
public final fun caseForChild(): R|kotlin/Unit| {
lval child: R|Case3.<anonymous>.Child| = R|/Case3.<anonymous>.Child.Child|(R|/B.B|())
R|<local>/child|.<Unresolved name: baseFun>#()
R|<local>/child|.<Unresolved name: property>#
R|<local>/child|.<Unresolved name: foo>#()
R|<local>/child|.R|/Case3.<anonymous>.Base.baseFun|()
R|<local>/child|.R|/Case3.<anonymous>.Base.property|
R|<local>/child|.R|/Case3.<anonymous>.Child.foo|()
(this@R|/anonymous|, R|<local>/child|).R|/anonymous.hoo|()
(this@R|/anonymous|, R|<local>/child|).R|/anonymous.voo|()
}