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

Introduce Unit-conversions for simple arguments

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2020-06-02 15:04:39 +03:00
parent f08a45f2d4
commit 71cbe97688
23 changed files with 484 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/unitConversion/chainedFunSuspendUnitConversion.fir.kt
Vendored
+18
View File
@@ -0,0 +1,18 @@
// !LANGUAGE: +UnitConversion +SuspendConversion
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun interface SuspendRunnable {
suspend fun run()
}
fun foo(r: SuspendRunnable) {}
fun bar(): String = ""
abstract class SubInt : () -> Int
fun test(f: () -> String, s: SubInt) {
<!INAPPLICABLE_CANDIDATE!>foo<!>(f)
<!INAPPLICABLE_CANDIDATE!>foo<!>(s)
<!INAPPLICABLE_CANDIDATE!>foo<!>(::bar)
}
compiler/testData/diagnostics/tests/unitConversion/chainedFunSuspendUnitConversion.kt
Vendored
+18
View File
@@ -0,0 +1,18 @@
// !LANGUAGE: +UnitConversion +SuspendConversion
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun interface SuspendRunnable {
suspend fun run()
}
fun foo(r: SuspendRunnable) {}
fun bar(): String = ""
abstract class SubInt : () -> Int
fun test(f: () -> String, s: SubInt) {
foo(f)
foo(s)
foo(::bar)
}
compiler/testData/diagnostics/tests/unitConversion/chainedFunSuspendUnitConversion.txt
Vendored
+20
View File
@@ -0,0 +1,20 @@
package
public fun bar(): kotlin.String
public fun foo(/*0*/ r: SuspendRunnable): kotlin.Unit
public fun test(/*0*/ f: () -> kotlin.String, /*1*/ s: SubInt): kotlin.Unit
public abstract class SubInt : () -> kotlin.Int {
public constructor SubInt()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public abstract override /*1*/ /*fake_override*/ fun invoke(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public fun interface SuspendRunnable {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public abstract suspend fun run(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/unitConversion/chainedFunUnitConversion.fir.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
// !LANGUAGE: +UnitConversion
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun interface KRunnable {
fun run()
}
fun foo(r: KRunnable) {}
abstract class SubInt : () -> Int
fun test(f: () -> Int, s: SubInt) {
<!INAPPLICABLE_CANDIDATE!>foo<!>(f)
<!INAPPLICABLE_CANDIDATE!>foo<!>(s)
}
compiler/testData/diagnostics/tests/unitConversion/chainedFunUnitConversion.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
// !LANGUAGE: +UnitConversion
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun interface KRunnable {
fun run()
}
fun foo(r: KRunnable) {}
abstract class SubInt : () -> Int
fun test(f: () -> Int, s: SubInt) {
foo(f)
foo(s)
}
compiler/testData/diagnostics/tests/unitConversion/chainedFunUnitConversion.txt
Vendored
+19
View File
@@ -0,0 +1,19 @@
package
public fun foo(/*0*/ r: KRunnable): kotlin.Unit
public fun test(/*0*/ f: () -> kotlin.Int, /*1*/ s: SubInt): kotlin.Unit
public fun interface KRunnable {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public abstract fun run(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public abstract class SubInt : () -> kotlin.Int {
public constructor SubInt()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public abstract override /*1*/ /*fake_override*/ fun invoke(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.fir.kt
Vendored
+14
View File
@@ -0,0 +1,14 @@
// !LANGUAGE: +UnitConversion +SuspendConversion
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun foo(f: suspend () -> Unit) {}
fun bar(): String = ""
abstract class SubInt : () -> Int
fun test(g: () -> Double, s: SubInt) {
<!INAPPLICABLE_CANDIDATE!>foo<!>(::bar)
<!INAPPLICABLE_CANDIDATE!>foo<!>(g)
<!INAPPLICABLE_CANDIDATE!>foo<!>(s)
}
compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.kt
Vendored
+14
View File
@@ -0,0 +1,14 @@
// !LANGUAGE: +UnitConversion +SuspendConversion
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun foo(f: suspend () -> Unit) {}
fun bar(): String = ""
abstract class SubInt : () -> Int
fun test(g: () -> Double, s: SubInt) {
foo(::bar)
foo(g)
foo(s)
}
compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.txt
Vendored
+13
View File
@@ -0,0 +1,13 @@
package
public fun bar(): kotlin.String
public fun foo(/*0*/ f: suspend () -> kotlin.Unit): kotlin.Unit
public fun test(/*0*/ g: () -> kotlin.Double, /*1*/ s: SubInt): kotlin.Unit
public abstract class SubInt : () -> kotlin.Int {
public constructor SubInt()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public abstract override /*1*/ /*fake_override*/ fun invoke(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/unitConversion/unitConversionCompatibility.kt
Vendored
View File
compiler/testData/diagnostics/tests/unitConversion/unitConversionForAllKinds.fir.kt
Vendored
+16
View File
@@ -0,0 +1,16 @@
// !LANGUAGE: +UnitConversion
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun foo(f: () -> Unit) {}
fun <T> fooGeneric(f: (T) -> Unit): T = TODO()
fun bar(): String = ""
fun createCall(): () -> Int = TODO()
fun test(g: () -> String, h: (Float) -> String) {
foo(::bar)
foo { "something" }
foo(g)
fooGeneric(h)
}
compiler/testData/diagnostics/tests/unitConversion/unitConversionForAllKinds.kt
Vendored
+16
View File
@@ -0,0 +1,16 @@
// !LANGUAGE: +UnitConversion
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun foo(f: () -> Unit) {}
fun <T> fooGeneric(f: (T) -> Unit): T = TODO()
fun bar(): String = ""
fun createCall(): () -> Int = TODO()
fun test(g: () -> String, h: (Float) -> String) {
foo(::bar)
foo { "something" }
foo(g)
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float")!>fooGeneric(h)<!>
}
compiler/testData/diagnostics/tests/unitConversion/unitConversionForAllKinds.txt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package
public fun bar(): kotlin.String
public fun createCall(): () -> kotlin.Int
public fun foo(/*0*/ f: () -> kotlin.Unit): kotlin.Unit
public fun </*0*/ T> fooGeneric(/*0*/ f: (T) -> kotlin.Unit): T
public fun test(/*0*/ g: () -> kotlin.String, /*1*/ h: (kotlin.Float) -> kotlin.String): kotlin.Unit
compiler/testData/diagnostics/tests/unitConversion/unitConversionForSubtypes.fir.kt
Vendored
+22
View File
@@ -0,0 +1,22 @@
// !LANGUAGE: +UnitConversion
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun foo(f: (Int, String) -> Unit) {}
abstract class SubInt : (Int, String) -> Int
abstract class SubIntWrong : (String, String) -> Int
fun test1(s: SubInt, sWrong: SubIntWrong) {
<!INAPPLICABLE_CANDIDATE!>foo<!>(s)
<!INAPPLICABLE_CANDIDATE!>foo<!>(sWrong)
val a = "foo"
<!INAPPLICABLE_CANDIDATE!>foo<!>(a)
a as (Int, String) -> String
<!INAPPLICABLE_CANDIDATE!>foo<!>(a)
}
fun <T> test2(x: T) where T : (Int, String) -> Int, T : (Double) -> Int {
<!INAPPLICABLE_CANDIDATE!>foo<!>(x)
}
compiler/testData/diagnostics/tests/unitConversion/unitConversionForSubtypes.kt
Vendored
+22
View File
@@ -0,0 +1,22 @@
// !LANGUAGE: +UnitConversion
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun foo(f: (Int, String) -> Unit) {}
abstract class SubInt : (Int, String) -> Int
abstract class SubIntWrong : (String, String) -> Int
fun test1(s: SubInt, sWrong: SubIntWrong) {
foo(s)
foo(<!TYPE_MISMATCH!>sWrong<!>)
val a = "foo"
foo(<!TYPE_MISMATCH!>a<!>)
a <!CAST_NEVER_SUCCEEDS!>as<!> (Int, String) -> String
foo(a)
}
fun <T> test2(x: T) where T : (Int, String) -> Int, T : (Double) -> Int {
foo(x)
}
compiler/testData/diagnostics/tests/unitConversion/unitConversionForSubtypes.txt
Vendored
+21
View File
@@ -0,0 +1,21 @@
package
public fun foo(/*0*/ f: (kotlin.Int, kotlin.String) -> kotlin.Unit): kotlin.Unit
public fun test1(/*0*/ s: SubInt, /*1*/ sWrong: SubIntWrong): kotlin.Unit
public fun </*0*/ T : (kotlin.Int, kotlin.String) -> kotlin.Int> test2(/*0*/ x: T): kotlin.Unit where T : (kotlin.Double) -> kotlin.Int
public abstract class SubInt : (kotlin.Int, kotlin.String) -> kotlin.Int {
public constructor SubInt()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: kotlin.Int, /*1*/ p2: kotlin.String): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public abstract class SubIntWrong : (kotlin.String, kotlin.String) -> kotlin.Int {
public constructor SubIntWrong()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: kotlin.String, /*1*/ p2: kotlin.String): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}