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

Remove OI/NI attributes from test data

Browse Source
This commit is contained in:
Denis.Zharkov
2021-05-24 12:42:39 +03:00
committed by teamcityserver
parent 2ecba6ac39
commit ddbdfafa79
441 changed files with 1005 additions and 1037 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.kt
Vendored
+1 -1
View File
@@ -7,5 +7,5 @@ fun test() {
foo(<!TYPE_MISMATCH!>c<!>)
val d: Char? = 'd'
foo(<!TYPE_MISMATCH{NI}!><!TYPE_MISMATCH{OI}!>d<!>!!<!>)
foo(<!TYPE_MISMATCH!>d!!<!>)
}
compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.kt
Vendored
+1 -1
View File
@@ -20,5 +20,5 @@ fun test() {
val d = either(11, 2.3)
checkSubtype<Any>(d)
val e: Float = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>id(1)<!>
val e: Float = <!TYPE_MISMATCH, TYPE_MISMATCH!>id(1)<!>
}
compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.kt
Vendored
+1 -1
View File
@@ -12,5 +12,5 @@ fun main() {
//not 'An integer literal does not conform to the expected type Int/Long'
val l: Long = <!INT_LITERAL_OUT_OF_RANGE!>1111111111111117777777777777777<!>
foo(<!INT_LITERAL_OUT_OF_RANGE!>11111111111111177777777777777<!>)
bar(<!INT_LITERAL_OUT_OF_RANGE, TYPE_MISMATCH{NI}!>11111111111111177777777777777<!>)
bar(<!INT_LITERAL_OUT_OF_RANGE, TYPE_MISMATCH!>11111111111111177777777777777<!>)
}
compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt
Vendored
+8 -8
View File
@@ -16,9 +16,9 @@ fun <T> otherGeneric(l: List<T>) {}
fun test() {
val a: Byte = id(1)
val b: Byte = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>id(300)<!>
val b: Byte = <!TYPE_MISMATCH, TYPE_MISMATCH!>id(300)<!>
val c: Int = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>id(9223372036854775807)<!>
val c: Int = <!TYPE_MISMATCH, TYPE_MISMATCH!>id(9223372036854775807)<!>
val d = id(22)
checkSubtype<Int>(d)
@@ -28,14 +28,14 @@ fun test() {
val f: Byte = either(1, 2)
val g: Byte = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>either(1, 300)<!>
val g: Byte = <!TYPE_MISMATCH, TYPE_MISMATCH!>either(1, 300)<!>
other(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>11<!>)
<!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>otherGeneric<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>)
otherGeneric(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>)
val r = either(1, "")
r checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Any>() }
r checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Any>() }
use(a, b, c, d, e, f, g, r)
}
@@ -47,7 +47,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>) {
<!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>exactBound<!>(1, <!TYPE_MISMATCH{NI}!>invS<!>)
exactBound(1, <!TYPE_MISMATCH!>invS<!>)
exactBound(1, invI)
val b = exactBound(1, invB)
@@ -60,7 +60,7 @@ fun <T> lowerBound(t: T, l : Cov<T>): T = throw Exception("$t $l")
fun testLowerBound(cov: Cov<String>, covN: Cov<Number>) {
val r = lowerBound(1, cov)
r checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Any>() }
r checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Any>() }
val n = lowerBound(1, covN)
n checkType { _<Number>() }
@@ -71,7 +71,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>) {
<!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>upperBound<!>(1, <!TYPE_MISMATCH{NI}!>contrS<!>)
upperBound(1, <!TYPE_MISMATCH!>contrS<!>)
val n = upperBound(1, contrN)
n checkType { _<Int>() }