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

[FIR] Fix tests (ARGUMENT_TYPE_MISMATCH instead of INCOMPATIBLE_CANDIDATE)

Browse Source
This commit is contained in:
Ivan Kochurkin
2021-04-06 01:35:30 +03:00
committed by TeamCityServer
parent 4ffab5fe5a
commit ad9b962536
461 changed files with 1239 additions and 1246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.fir.kt
Vendored
+4 -4
View File
@@ -2,11 +2,11 @@
fun foo(n: Number) = n
fun test() {
<!INAPPLICABLE_CANDIDATE!>foo<!>('a')
foo(<!ARGUMENT_TYPE_MISMATCH!>'a'<!>)
val c = 'c'
<!INAPPLICABLE_CANDIDATE!>foo<!>(c)
foo(<!ARGUMENT_TYPE_MISMATCH!>c<!>)
val d: Char? = 'd'
<!INAPPLICABLE_CANDIDATE!>foo<!>(d!!)
foo(<!ARGUMENT_TYPE_MISMATCH!>d!!<!>)
}
compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ fun foo(n: Number) = n
fun test() {
foo(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>'a'<!>)
val c = 'c'
foo(<!TYPE_MISMATCH!>c<!>)
compiler/testData/diagnostics/tests/numbers/literalReceiverWithIntegerValueType.fir.kt
Vendored
+41 -41
View File
@@ -6,62 +6,62 @@ abstract class C<L> {
}
fun testLongDotCall(c1: C<Long>) {
c1.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.plus(2))
c1.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.minus(2))
c1.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.times(2))
c1.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.div(2))
c1.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.rem(2))
c1.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.inc())
c1.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.dec())
c1.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.unaryPlus())
c1.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.unaryMinus())
c1.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.shl(2))
c1.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.shr(2))
c1.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.ushr(2))
c1.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.and(2))
c1.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.or(2))
c1.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.xor(2))
c1.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.inv())
c1.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.plus(2)<!>)
c1.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.minus(2)<!>)
c1.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.times(2)<!>)
c1.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.div(2)<!>)
c1.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.rem(2)<!>)
c1.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.inc()<!>)
c1.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.dec()<!>)
c1.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.unaryPlus()<!>)
c1.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.unaryMinus()<!>)
c1.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.shl(2)<!>)
c1.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.shr(2)<!>)
c1.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.ushr(2)<!>)
c1.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.and(2)<!>)
c1.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.or(2)<!>)
c1.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.xor(2)<!>)
c1.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.inv()<!>)
}
fun testShortDotCall(c2: C<Short>) {
c2.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.plus(2))
c2.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.inc())
c2.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.dec())
c2.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.shr(2))
c2.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.inv())
c2.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.plus(2)<!>)
c2.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.inc()<!>)
c2.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.dec()<!>)
c2.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.shr(2)<!>)
c2.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.inv()<!>)
}
fun testByteDotCall(c3: C<Byte>) {
c3.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.plus(2))
c3.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.inc())
c3.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.dec())
c3.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.shr(2))
c3.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1.inv())
c3.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.plus(2)<!>)
c3.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.inc()<!>)
c3.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.dec()<!>)
c3.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.shr(2)<!>)
c3.takeT(<!ARGUMENT_TYPE_MISMATCH!>1.inv()<!>)
}
fun testLongOperatorInfixCall(c4: C<Long>) {
c4.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1 + 2)
c4.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1 - 2)
c4.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1 * 2)
c4.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1 / 2)
c4.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1 % 2)
c4.takeT(<!ARGUMENT_TYPE_MISMATCH!>1 + 2<!>)
c4.takeT(<!ARGUMENT_TYPE_MISMATCH!>1 - 2<!>)
c4.takeT(<!ARGUMENT_TYPE_MISMATCH!>1 * 2<!>)
c4.takeT(<!ARGUMENT_TYPE_MISMATCH!>1 / 2<!>)
c4.takeT(<!ARGUMENT_TYPE_MISMATCH!>1 % 2<!>)
c4.takeT(+1)
c4.takeT(-1)
c4.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1 shl 2)
c4.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1 shr 2)
c4.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1 ushr 2)
c4.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1 and 2)
c4.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1 or 2)
c4.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1 xor 2)
c4.takeT(<!ARGUMENT_TYPE_MISMATCH!>1 shl 2<!>)
c4.takeT(<!ARGUMENT_TYPE_MISMATCH!>1 shr 2<!>)
c4.takeT(<!ARGUMENT_TYPE_MISMATCH!>1 ushr 2<!>)
c4.takeT(<!ARGUMENT_TYPE_MISMATCH!>1 and 2<!>)
c4.takeT(<!ARGUMENT_TYPE_MISMATCH!>1 or 2<!>)
c4.takeT(<!ARGUMENT_TYPE_MISMATCH!>1 xor 2<!>)
}
fun testShortOperatorInfixCall(c5: C<Short>) {
c5.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1 + 2)
c5.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1 shr 2)
c5.takeT(<!ARGUMENT_TYPE_MISMATCH!>1 + 2<!>)
c5.takeT(<!ARGUMENT_TYPE_MISMATCH!>1 shr 2<!>)
}
fun testByteOperatorInfixCall(c6: C<Byte>) {
c6.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1 + 2)
c6.<!INAPPLICABLE_CANDIDATE!>takeT<!>(1 shr 2)
c6.takeT(<!ARGUMENT_TYPE_MISMATCH!>1 + 2<!>)
c6.takeT(<!ARGUMENT_TYPE_MISMATCH!>1 shr 2<!>)
}
compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.fir.kt
Vendored
+4 -4
View File
@@ -31,9 +31,9 @@ fun test() {
val g: Byte = either(1, 300)
<!INAPPLICABLE_CANDIDATE!>other<!>(11)
other(<!ARGUMENT_TYPE_MISMATCH!>11<!>)
<!INAPPLICABLE_CANDIDATE!>otherGeneric<!>(1)
otherGeneric(<!ARGUMENT_TYPE_MISMATCH!>1<!>)
val r = either(1, "")
r checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any>() }
@@ -48,7 +48,7 @@ interface Inv<T>
fun <T> exactBound(t: T, l: Inv<T>): T = throw Exception("$t $l")
fun testExactBound(invS: Inv<String>, invI: Inv<Int>, invB: Inv<Byte>) {
<!INAPPLICABLE_CANDIDATE!>exactBound<!>(1, invS)
exactBound(1, <!ARGUMENT_TYPE_MISMATCH!>invS<!>)
exactBound(1, invI)
val b = exactBound(1, invB)
@@ -72,7 +72,7 @@ interface Contr<in T>
fun <T> upperBound(t: T, l: Contr<T>): T = throw Exception("$t $l")
fun testUpperBound(contrS: Contr<String>, contrB: Contr<Byte>, contrN: Contr<Number>) {
<!INAPPLICABLE_CANDIDATE!>upperBound<!>(1, contrS)
upperBound(1, <!ARGUMENT_TYPE_MISMATCH!>contrS<!>)
val n = upperBound(1, contrN)
n checkType { _<Int>() }