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

Fix tests in DiagnosticsTestWithStdLibGenerated with NI

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-01-30 13:08:22 +03:00
parent 98810ba750
commit 0501a108c0
73 changed files with 507 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/deeplyNested.kt
Vendored
+1 -1
View File
@@ -99,6 +99,6 @@ fun branchedAndNestedWithNativeOperators(x: Any?, y: Any?) {
)
<!DEBUG_INFO_SMARTCAST!>x<!>.length
y.<!UNRESOLVED_REFERENCE!>length<!>
y.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
y.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectingInfo.kt
Vendored
+6 -6
View File
@@ -31,12 +31,12 @@ fun intersectingInfo(x: Any?, y: Any?) {
if ((isString(x) && y is String) || (!notIsString(x) && !notIsInt(y))) {
<!DEBUG_INFO_SMARTCAST!>x<!>.length
y.<!UNRESOLVED_REFERENCE!>length<!>
y.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
y.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
else {
x.<!UNRESOLVED_REFERENCE!>length<!>
y.<!UNRESOLVED_REFERENCE!>length<!>
y.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
y.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
}
@@ -49,13 +49,13 @@ fun intersectingInfo2(x: Any?, y: Any?) {
(!notIsString(x) && isString(y) && y is Int) ||
(x is String && !notIsInt(y) && x is Int)) {
<!DEBUG_INFO_SMARTCAST!>x<!>.length
x.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
y.<!UNRESOLVED_REFERENCE!>length<!>
y.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
y.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
y.<!UNRESOLVED_REFERENCE!>length<!>
y.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
y.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectionTypes.kt
Vendored
+2 -2
View File
@@ -28,7 +28,7 @@ fun testDeMorgan(x: Any?) {
}
else {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
}
@@ -36,7 +36,7 @@ fun testDeMorgan2(x: Any?) {
// x !is String || x !is Int
if (notIsString(x) || notIsInt(x)) {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
else {
<!DEBUG_INFO_SMARTCAST!>x<!>.length
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/andOperator.kt
Vendored
+6 -6
View File
@@ -42,17 +42,17 @@ fun truetrue(x: Any?) {
<!DEBUG_INFO_SMARTCAST!>x<!>.inc()
}
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
fun truefalse(x: Any?) {
if (trueWhenString(x) && falseWhenInt(x)) {
<!DEBUG_INFO_SMARTCAST!>x<!>.length
x.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
else {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
}
@@ -63,19 +63,19 @@ fun falsetrue(x: Any?) {
}
else {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
}
fun falsefalse(x: Any?) {
if (falseWhenString(x) && falseWhenInt(x)) {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
else {
// Note that we can't argue that we have any of smartcasts here,
// because we don't know which one of both arguments was 'false' to bring us here
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
}
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/orOperator.kt
Vendored
+6 -6
View File
@@ -36,18 +36,18 @@ fun falseWhenInt(x: Any?): Boolean {
fun truetrue(x: Any?) {
if (trueWhenString(x) || trueWhenInt(x)) {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
else {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
}
fun truefalse(x: Any?) {
if (trueWhenString(x) || falseWhenInt(x)) {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
else {
x.<!UNRESOLVED_REFERENCE!>length<!>
@@ -58,18 +58,18 @@ fun truefalse(x: Any?) {
fun falsetrue(x: Any?) {
if (falseWhenString(x) || trueWhenInt(x)) {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
else {
<!DEBUG_INFO_SMARTCAST!>x<!>.length
x.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
}
fun falsefalse(x: Any?) {
if (falseWhenString(x) || falseWhenInt(x)) {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!NI;NONE_APPLICABLE, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
}
else {
<!DEBUG_INFO_SMARTCAST!>x<!>.length