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

[FIR] Update testdata of SAM conversions diagnostics tests after lambda resolution fix

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-11-05 10:57:45 +03:00
parent 010dae454e
commit 23d492646d
9 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/testData/resolve/samConstructors/genericSam.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ FILE: main.kt
R|<local>/x|.R|kotlin/Int.toInt|().R|kotlin/Any.toString|() R|<local>/x|.R|kotlin/Int.toInt|().R|kotlin/Any.toString|()
} }
) )
R|/MyFunction|<R|kotlin/Any?|, R|ft<kotlin/String, kotlin/String>|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/String| { R|/MyFunction|<R|kotlin/Int|, R|ft<kotlin/String, kotlin/String>|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/String| {
R|<local>/x|.R|kotlin/Any.toString|() R|<local>/x|.R|kotlin/Any.toString|()
} }
) )
compiler/fir/resolve/testData/resolve/samConstructors/genericSamInferenceFromExpectType.kt
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ fun main() {
x.toInt().toString() x.toInt().toString()
}) })
foo2(MyFunction { x: Int -> <!INAPPLICABLE_CANDIDATE!>foo2<!>(MyFunction { x: Int ->
x.toString() x.toString()
}) })
compiler/fir/resolve/testData/resolve/samConstructors/genericSamInferenceFromExpectType.txt
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ FILE: main.kt
R|<local>/x|.R|kotlin/Number.toInt|().R|kotlin/Any.toString|() R|<local>/x|.R|kotlin/Number.toInt|().R|kotlin/Any.toString|()
} }
)) ))
R|/foo2|(R|/MyFunction|<R|kotlin/Number|, R|ft<kotlin/String, kotlin/String>|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/String| { <Inapplicable(INAPPLICABLE): [/foo2]>#(R?C|/MyFunction|(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/String| {
R|<local>/x|.R|kotlin/Any.toString|() R|<local>/x|.R|kotlin/Any.toString|()
} }
)) ))
compiler/fir/resolve/testData/resolve/samConversions/genericSam.kt
Vendored
+1 -1
View File
@@ -21,7 +21,7 @@ fun main() {
x.toInt().toString() x.toInt().toString()
} }
JavaUsage.foo2 { x: Int -> JavaUsage.<!INAPPLICABLE_CANDIDATE!>foo2<!> { x: Int ->
x.toString() x.toString()
} }
compiler/fir/resolve/testData/resolve/samConversions/genericSam.txt
Vendored
+2 -2
View File
@@ -8,8 +8,8 @@ FILE: main.kt
R|<local>/x|.R|kotlin/Number.toInt|().R|kotlin/Any.toString|() R|<local>/x|.R|kotlin/Number.toInt|().R|kotlin/Any.toString|()
} }
) )
Q|JavaUsage|.R|/JavaUsage.foo2|(<L> = foo2@fun <anonymous>(x: R|kotlin/Int|): R|ft<kotlin/CharSequence, kotlin/CharSequence?>!| { Q|JavaUsage|.<Inapplicable(INAPPLICABLE): [/JavaUsage.foo2]>#(<L> = foo2@fun <implicit>.<anonymous>(x: R|kotlin/Int|): <implicit> {
R|<local>/x|.R|kotlin/Any.toString|() x#.toString#()
} }
) )
Q|JavaUsage|.R|/JavaUsage.foo3|<R|ft<kotlin/Int, kotlin/Int>|, R|ft<kotlin/String, kotlin/String>|>(foo3@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int>|): R|kotlin/Unit| { Q|JavaUsage|.R|/JavaUsage.foo3|<R|ft<kotlin/Int, kotlin/Int>|, R|ft<kotlin/String, kotlin/String>|>(foo3@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int>|): R|kotlin/Unit| {
compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.kt
Vendored
+6 -6
View File
@@ -22,7 +22,7 @@ interface Derived : Super {
fun foo1(m: MyRunnable) {} fun foo1(m: MyRunnable) {}
fun foo2(m: WithProperty) {} fun foo2(m: WithProperty) {}
fun foo3(m: TwoAbstract) {} fun foo3(m: TwoAbstract) {}
fun foo3(m: Derived) {} fun foo4(m: Derived) {}
fun main() { fun main() {
val f = { t: Int -> t > 1} val f = { t: Int -> t > 1}
@@ -30,13 +30,13 @@ fun main() {
foo1 { x -> x > 1 } foo1 { x -> x > 1 }
foo1(f) foo1(f)
foo2 { x -> x > 1 } <!INAPPLICABLE_CANDIDATE!>foo2<!> { x -> x > 1 }
<!INAPPLICABLE_CANDIDATE!>foo2<!>(f) <!INAPPLICABLE_CANDIDATE!>foo2<!>(f)
<!AMBIGUITY!>foo3<!> { x -> x > 1 } <!INAPPLICABLE_CANDIDATE!>foo3<!> { x -> x > 1 }
foo3(f) <!INAPPLICABLE_CANDIDATE!>foo3<!>(f)
<!UNRESOLVED_REFERENCE!>foo4<!> { x -> x > 1 } foo4 { x -> x > 1 }
<!UNRESOLVED_REFERENCE!>foo4<!>(f) foo4(f)
} }
compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.txt
Vendored
+8 -8
View File
@@ -26,7 +26,7 @@ FILE: kotlinSam.kt
} }
public final fun foo3(m: R|TwoAbstract|): R|kotlin/Unit| { public final fun foo3(m: R|TwoAbstract|): R|kotlin/Unit| {
} }
public final fun foo3(m: R|Derived|): R|kotlin/Unit| { public final fun foo4(m: R|Derived|): R|kotlin/Unit| {
} }
public final fun main(): R|kotlin/Unit| { public final fun main(): R|kotlin/Unit| {
lval f: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(t: R|kotlin/Int|): kotlin/Boolean { lval f: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(t: R|kotlin/Int|): kotlin/Boolean {
@@ -38,19 +38,19 @@ FILE: kotlinSam.kt
} }
) )
R|/foo1|(R|<local>/f|) R|/foo1|(R|<local>/f|)
R|/foo2|(<L> = foo2@fun <anonymous>(x: R|kotlin/Nothing|): kotlin/Boolean { <Inapplicable(INAPPLICABLE): [/foo2]>#(<L> = foo2@fun <implicit>.<anonymous>(x: <implicit>): <implicit> {
>(R|<local>/x|, Int(1)) >(x#, Int(1))
} }
) )
<Inapplicable(INAPPLICABLE): [/foo2]>#(R|<local>/f|) <Inapplicable(INAPPLICABLE): [/foo2]>#(R|<local>/f|)
<Ambiguity: foo3, [/foo3, /foo3]>#(<L> = foo3@fun <implicit>.<anonymous>(x: <implicit>): <implicit> { <Inapplicable(INAPPLICABLE): [/foo3]>#(<L> = foo3@fun <implicit>.<anonymous>(x: <implicit>): <implicit> {
>(x#, Int(1)) >(x#, Int(1))
} }
) )
R|/foo3|(R|<local>/f|) <Inapplicable(INAPPLICABLE): [/foo3]>#(R|<local>/f|)
<Unresolved name: foo4>#(<L> = foo4@fun <implicit>.<anonymous>(x: <implicit>): <implicit> { R|/foo4|(<L> = foo4@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/Boolean| {
>(x#, Int(1)) >(R|<local>/x|, Int(1))
} }
) )
<Unresolved name: foo4>#(R|<local>/f|) R|/foo4|(R|<local>/f|)
} }
compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.kt
Vendored
+2 -2
View File
@@ -18,12 +18,12 @@ public class JavaUsage {
fun foo(m: MyRunnable) {} fun foo(m: MyRunnable) {}
fun main() { fun main() {
JavaUsage.foo { JavaUsage.<!INAPPLICABLE_CANDIDATE!>foo<!> {
x -> x ->
x > 1 x > 1
} }
JavaUsage.foo({ <!UNRESOLVED_REFERENCE!>it<!> > 1 }) JavaUsage.<!INAPPLICABLE_CANDIDATE!>foo<!>({ it > 1 })
val x = { x: Int -> x > 1 } val x = { x: Int -> x > 1 }
compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.txt
Vendored
+4 -4
View File
@@ -2,12 +2,12 @@ FILE: main.kt
public final fun foo(m: R|MyRunnable|): R|kotlin/Unit| { public final fun foo(m: R|MyRunnable|): R|kotlin/Unit| {
} }
public final fun main(): R|kotlin/Unit| { public final fun main(): R|kotlin/Unit| {
Q|JavaUsage|.R|/JavaUsage.foo|(<L> = foo@fun <anonymous>(x: R|kotlin/Nothing|): kotlin/Boolean { Q|JavaUsage|.<Inapplicable(INAPPLICABLE): [/JavaUsage.foo]>#(<L> = foo@fun <implicit>.<anonymous>(x: <implicit>): <implicit> {
>(R|<local>/x|, Int(1)) >(x#, Int(1))
} }
) )
Q|JavaUsage|.R|/JavaUsage.foo|(foo@fun <anonymous>(): kotlin/Boolean { Q|JavaUsage|.<Inapplicable(INAPPLICABLE): [/JavaUsage.foo]>#(foo@fun <implicit>.<anonymous>(): <implicit> {
>(<Unresolved name: it>#, Int(1)) >(it#, Int(1))
} }
) )
lval x: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(x: R|kotlin/Int|): kotlin/Boolean { lval x: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(x: R|kotlin/Int|): kotlin/Boolean {