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

Rename: auto cast -> smart cast

Browse Source
This commit is contained in:
Svetlana Isakova
2014-09-29 23:09:05 +04:00
parent 20f3403c80
commit ce01c61811
294 changed files with 840 additions and 842 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/infos/Autocasts.kt → compiler/testData/diagnostics/tests/infos/SmartCasts.kt
+43 -43
View File
@@ -11,8 +11,8 @@ fun f9(init : A?) {
a?.foo()
a?.<!UNRESOLVED_REFERENCE!>bar<!>()
if (a is B) {
<!DEBUG_INFO_AUTOCAST!>a<!>.bar()
<!DEBUG_INFO_AUTOCAST!>a<!>.foo()
<!DEBUG_INFO_SMARTCAST!>a<!>.bar()
<!DEBUG_INFO_SMARTCAST!>a<!>.foo()
}
a?.foo()
a?.<!UNRESOLVED_REFERENCE!>bar<!>()
@@ -20,14 +20,14 @@ fun f9(init : A?) {
a?.<!UNRESOLVED_REFERENCE!>bar<!>()
a?.foo()
}
if (!(a is B) || <!DEBUG_INFO_AUTOCAST!>a<!>.bar() == Unit) {
if (!(a is B) || <!DEBUG_INFO_SMARTCAST!>a<!>.bar() == Unit) {
a?.<!UNRESOLVED_REFERENCE!>bar<!>()
}
if (!(a is B)) {
return;
}
<!DEBUG_INFO_AUTOCAST!>a<!>.bar()
<!DEBUG_INFO_AUTOCAST!>a<!>.foo()
<!DEBUG_INFO_SMARTCAST!>a<!>.bar()
<!DEBUG_INFO_SMARTCAST!>a<!>.foo()
}
fun f10(init : A?) {
@@ -48,15 +48,15 @@ class C() : A() {
fun f101(a : A?) {
if (a is C) {
<!DEBUG_INFO_AUTOCAST!>a<!>.bar();
<!DEBUG_INFO_SMARTCAST!>a<!>.bar();
}
}
fun f11(a : A?) {
when (a) {
is B -> <!DEBUG_INFO_AUTOCAST!>a<!>.bar()
is A -> <!DEBUG_INFO_AUTOCAST!>a<!>.foo()
is Any -> <!DEBUG_INFO_AUTOCAST!>a<!>.foo()
is B -> <!DEBUG_INFO_SMARTCAST!>a<!>.bar()
is A -> <!DEBUG_INFO_SMARTCAST!>a<!>.foo()
is Any -> <!DEBUG_INFO_SMARTCAST!>a<!>.foo()
is Any? -> a.<!UNRESOLVED_REFERENCE!>bar<!>()
else -> a?.foo()
}
@@ -64,11 +64,11 @@ fun f11(a : A?) {
fun f12(a : A?) {
when (a) {
is B -> <!DEBUG_INFO_AUTOCAST!>a<!>.bar()
is A -> <!DEBUG_INFO_AUTOCAST!>a<!>.foo()
is Any -> <!DEBUG_INFO_AUTOCAST!>a<!>.foo();
is B -> <!DEBUG_INFO_SMARTCAST!>a<!>.bar()
is A -> <!DEBUG_INFO_SMARTCAST!>a<!>.foo()
is Any -> <!DEBUG_INFO_SMARTCAST!>a<!>.foo();
is Any? -> a.<!UNRESOLVED_REFERENCE!>bar<!>()
is C -> <!DEBUG_INFO_AUTOCAST!>a<!>.bar()
is C -> <!DEBUG_INFO_SMARTCAST!>a<!>.bar()
else -> a?.foo()
}
@@ -76,15 +76,15 @@ fun f12(a : A?) {
a?.<!UNRESOLVED_REFERENCE!>bar<!>()
}
if (a is B) {
<!DEBUG_INFO_AUTOCAST!>a<!>.foo()
<!DEBUG_INFO_AUTOCAST!>a<!>.bar()
<!DEBUG_INFO_SMARTCAST!>a<!>.foo()
<!DEBUG_INFO_SMARTCAST!>a<!>.bar()
}
}
fun f13(a : A?) {
if (a is B) {
<!DEBUG_INFO_AUTOCAST!>a<!>.foo()
<!DEBUG_INFO_AUTOCAST!>a<!>.bar()
<!DEBUG_INFO_SMARTCAST!>a<!>.foo()
<!DEBUG_INFO_SMARTCAST!>a<!>.bar()
}
else {
a?.foo()
@@ -97,14 +97,14 @@ fun f13(a : A?) {
<!UNRESOLVED_REFERENCE!>c<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>bar<!>()
}
else {
<!DEBUG_INFO_AUTOCAST!>a<!>.foo()
<!DEBUG_INFO_SMARTCAST!>a<!>.foo()
<!UNRESOLVED_REFERENCE!>c<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>bar<!>()
}
a?.foo()
if (a is B && <!DEBUG_INFO_AUTOCAST!>a<!>.foo() == Unit) {
<!DEBUG_INFO_AUTOCAST!>a<!>.foo()
<!DEBUG_INFO_AUTOCAST!>a<!>.bar()
if (a is B && <!DEBUG_INFO_SMARTCAST!>a<!>.foo() == Unit) {
<!DEBUG_INFO_SMARTCAST!>a<!>.foo()
<!DEBUG_INFO_SMARTCAST!>a<!>.bar()
}
else {
a?.foo()
@@ -120,70 +120,70 @@ fun f13(a : A?) {
}
if (!(a is B)) return
<!DEBUG_INFO_AUTOCAST!>a<!>.bar()
<!DEBUG_INFO_SMARTCAST!>a<!>.bar()
}
fun f14(a : A?) {
while (!(a is B)) {
}
<!DEBUG_INFO_AUTOCAST!>a<!>.bar()
<!DEBUG_INFO_SMARTCAST!>a<!>.bar()
}
fun f15(a : A?) {
do {
} while (!(a is B))
<!DEBUG_INFO_AUTOCAST!>a<!>.bar()
<!DEBUG_INFO_SMARTCAST!>a<!>.bar()
}
fun getStringLength(obj : Any) : Char? {
if (obj !is String)
return null
return <!DEBUG_INFO_AUTOCAST!>obj<!>.get(0) // no cast to String is needed
return <!DEBUG_INFO_SMARTCAST!>obj<!>.get(0) // no cast to String is needed
}
fun toInt(i: Int?): Int = if (i != null) <!DEBUG_INFO_AUTOCAST!>i<!> else 0
fun toInt(i: Int?): Int = if (i != null) <!DEBUG_INFO_SMARTCAST!>i<!> else 0
fun illegalWhenBody(a: Any): Int = <!NO_ELSE_IN_WHEN!>when<!>(a) {
is Int -> <!DEBUG_INFO_AUTOCAST!>a<!>
is Int -> <!DEBUG_INFO_SMARTCAST!>a<!>
is String -> <!TYPE_MISMATCH!>a<!>
}
fun illegalWhenBlock(a: Any): Int {
when(a) {
is Int -> return <!DEBUG_INFO_AUTOCAST!>a<!>
is Int -> return <!DEBUG_INFO_SMARTCAST!>a<!>
is String -> return <!TYPE_MISMATCH!>a<!>
}
<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
fun declarations(a: Any?) {
if (a is String) {
val <!UNUSED_VARIABLE!>p4<!>: String = <!DEBUG_INFO_AUTOCAST!>a<!>
val <!UNUSED_VARIABLE!>p4<!>: String = <!DEBUG_INFO_SMARTCAST!>a<!>
}
if (a is String?) {
if (a != null) {
val <!UNUSED_VARIABLE!>s<!>: String = <!DEBUG_INFO_AUTOCAST!>a<!>
val <!UNUSED_VARIABLE!>s<!>: String = <!DEBUG_INFO_SMARTCAST!>a<!>
}
}
if (a != null) {
if (a is String?) {
val <!UNUSED_VARIABLE!>s<!>: String = <!DEBUG_INFO_AUTOCAST!>a<!>
val <!UNUSED_VARIABLE!>s<!>: String = <!DEBUG_INFO_SMARTCAST!>a<!>
}
}
}
fun vars(a: Any?) {
var <!ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE!>b<!>: Int = 0
if (a is Int) {
b = <!UNUSED_VALUE, DEBUG_INFO_AUTOCAST!>a<!>
b = <!UNUSED_VALUE, DEBUG_INFO_SMARTCAST!>a<!>
}
}
fun returnFunctionLiteralBlock(a: Any?): Function0<Int> {
if (a is Int) return { <!DEBUG_INFO_AUTOCAST!>a<!> }
if (a is Int) return { <!DEBUG_INFO_SMARTCAST!>a<!> }
else return { 1 }
}
fun returnFunctionLiteral(a: Any?): Function0<Int> =
if (a is Int) { (): Int -> <!DEBUG_INFO_AUTOCAST!>a<!> }
if (a is Int) { (): Int -> <!DEBUG_INFO_SMARTCAST!>a<!> }
else { () -> 1 }
fun mergeAutocasts(a: Any?) {
fun mergeSmartCasts(a: Any?) {
if (a is String || a is Int) {
a.<!UNRESOLVED_REFERENCE!>compareTo<!>("")
<!DEBUG_INFO_AUTOCAST!>a<!>.toString()
<!DEBUG_INFO_SMARTCAST!>a<!>.toString()
}
if (a is Int || a is String) {
a.<!UNRESOLVED_REFERENCE!>compareTo<!>("")
@@ -192,9 +192,9 @@ fun mergeAutocasts(a: Any?) {
is String, is Any -> a.<!UNRESOLVED_REFERENCE!>compareTo<!>("")
}
if (a is String && a is Any) {
val <!UNUSED_VARIABLE!>i<!>: Int = <!DEBUG_INFO_AUTOCAST!>a<!>.compareTo("")
val <!UNUSED_VARIABLE!>i<!>: Int = <!DEBUG_INFO_SMARTCAST!>a<!>.compareTo("")
}
if (a is String && <!DEBUG_INFO_AUTOCAST!>a<!>.compareTo("") == 0) {}
if (a is String && <!DEBUG_INFO_SMARTCAST!>a<!>.compareTo("") == 0) {}
if (a is String || a.<!UNRESOLVED_REFERENCE!>compareTo<!>("") <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>==<!> 0) {}
}
@@ -202,10 +202,10 @@ fun mergeAutocasts(a: Any?) {
fun f(): String {
var a: Any = 11
if (a is String) {
val <!UNUSED_VARIABLE!>i<!>: String = <!AUTOCAST_IMPOSSIBLE!>a<!>
<!AUTOCAST_IMPOSSIBLE!>a<!>.compareTo("f")
val <!UNUSED_VARIABLE!>f<!>: Function0<String> = { <!AUTOCAST_IMPOSSIBLE!>a<!> }
return <!AUTOCAST_IMPOSSIBLE!>a<!>
val <!UNUSED_VARIABLE!>i<!>: String = <!SMARTCAST_IMPOSSIBLE!>a<!>
<!SMARTCAST_IMPOSSIBLE!>a<!>.compareTo("f")
val <!UNUSED_VARIABLE!>f<!>: Function0<String> = { <!SMARTCAST_IMPOSSIBLE!>a<!> }
return <!SMARTCAST_IMPOSSIBLE!>a<!>
}
return ""
}
@@ -213,7 +213,7 @@ fun f(): String {
fun foo(aa: Any): Int {
var a = aa
if (a is Int) {
return <!AUTOCAST_IMPOSSIBLE!>a<!>
return <!SMARTCAST_IMPOSSIBLE!>a<!>
}
return 1
}
compiler/testData/diagnostics/tests/infos/Autocasts.txt → compiler/testData/diagnostics/tests/infos/SmartCasts.txt
+2 -2
View File
@@ -14,7 +14,7 @@ internal fun foo(/*0*/ aa: kotlin.Any): kotlin.Int
internal fun getStringLength(/*0*/ obj: kotlin.Any): kotlin.Char?
internal fun illegalWhenBlock(/*0*/ a: kotlin.Any): kotlin.Int
internal fun illegalWhenBody(/*0*/ a: kotlin.Any): kotlin.Int
internal fun mergeAutocasts(/*0*/ a: kotlin.Any?): kotlin.Unit
internal fun mergeSmartCasts(/*0*/ a: kotlin.Any?): kotlin.Unit
internal fun returnFunctionLiteral(/*0*/ a: kotlin.Any?): () -> kotlin.Int
internal fun returnFunctionLiteralBlock(/*0*/ a: kotlin.Any?): () -> kotlin.Int
internal fun toInt(/*0*/ i: kotlin.Int?): kotlin.Int
@@ -44,4 +44,4 @@ internal final class C : A {
internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}