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

deprecating types after colon

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-04-21 18:32:31 +02:00
parent b7a4b3c17d
commit f374eec8f1
268 changed files with 1055 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCallsWithLambdas.kt
+3 -1
View File
@@ -1,3 +1,5 @@
// !CHECK_TYPE
fun test(d: dynamic) {
d.foo {}
@@ -21,7 +23,7 @@ fun test(d: dynamic) {
d.foo({ x -> })
d.foo({ x -> } : (Int) -> Unit)
d.foo(checkSubtype<(Int) -> Unit>({ x -> }))
d.foo(label@ { x -> })
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVals.kt
+9 -8
View File
@@ -1,3 +1,4 @@
// !DIAGNOSTICS:-USELESS_CAST
// !MARK_DYNAMIC_CALLS
fun test(d: dynamic) {
@@ -20,10 +21,10 @@ fun test(d: dynamic) {
<!VAL_REASSIGNMENT!>d.onDynamicVal<!> = 1
(d: String).onStringVal
(d: Any).onAnyVal
(d: Any?).onNullableAnyVal
(d: Any).onDynamicVal
(d as String).onStringVal
(d as Any).onAnyVal
(d as Any?).onNullableAnyVal
(d as Any).onDynamicVal
}
fun testReassignmentWithSafeCall(d: dynamic) {
@@ -31,10 +32,10 @@ fun testReassignmentWithSafeCall(d: dynamic) {
}
fun testReassignmentWithStaticCalls(d: dynamic) {
<!VAL_REASSIGNMENT!>(d: String).onStringVal<!> = 1
<!VAL_REASSIGNMENT!>(d: Any).onAnyVal<!> = 1
<!VAL_REASSIGNMENT!>(d: Any?).onNullableAnyVal<!> = 1
<!VAL_REASSIGNMENT!>(d: Any).onDynamicVal<!> = 1
<!VAL_REASSIGNMENT!>(d as String).onStringVal<!> = 1
<!VAL_REASSIGNMENT!>(d as Any).onAnyVal<!> = 1
<!VAL_REASSIGNMENT!>(d as Any?).onNullableAnyVal<!> = 1
<!VAL_REASSIGNMENT!>(d as Any).onDynamicVal<!> = 1
}
val Any.onAnyVal: Int get() = 1
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVars.kt
+9 -8
View File
@@ -1,4 +1,5 @@
// !MARK_DYNAMIC_CALLS
// !DIAGNOSTICS:-USELESS_CAST
fun test(d: dynamic) {
d.<!DEBUG_INFO_DYNAMIC!>onAnyVar<!>
@@ -23,15 +24,15 @@ fun test(d: dynamic) {
d?.onDynamicVar = 1
(d: String).onStringVar
(d: Any).onAnyVar
(d: Any?).onNullableAnyVar
(d: Any).onDynamicVar
(d as String).onStringVar
(d as Any).onAnyVar
(d as Any?).onNullableAnyVar
(d as Any).onDynamicVar
(d: String).onStringVar = 1
(d: Any).onAnyVar = 1
(d: Any?).onNullableAnyVar = 1
(d: Any).onDynamicVar = 1
(d as String).onStringVar = 1
(d as Any).onAnyVar = 1
(d as Any?).onNullableAnyVar = 1
(d as Any).onDynamicVar = 1
}
var Any.onAnyVar: Int
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensions.kt
+5 -4
View File
@@ -1,3 +1,4 @@
// !DIAGNOSTICS:-USELESS_CAST
// !MARK_DYNAMIC_CALLS
fun test(d: dynamic) {
@@ -15,10 +16,10 @@ fun test(d: dynamic) {
d.onDynamic()
d?.onDynamic()
(d: String).onString()
(d: Any).onAny()
(d: Any?).onNullableAny()
(d: Any).onDynamic()
(d as String).onString()
(d as Any).onAny()
(d as Any?).onNullableAny()
(d as Any).onDynamic()
}
fun Any.onAny() {}
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloading.kt
+5 -5
View File
@@ -13,11 +13,11 @@ fun test(d: dynamic) {
dyn(1)
dyn("")
foo(1).checkType { it : _<Int> }
foo("").checkType { it : _<String> }
foo(1).checkType { _<Int>() }
foo("").checkType { _<String>() }
// Checking specificity of `dynamic` vs `Nothing`
nothing(d).checkType { it : _<String> }
nothing("").checkType { it : _<Int> }
[suppress("UNREACHABLE_CODE")] nothing(null!!).checkType { it : _<String> }
nothing(d).checkType { _<String>() }
nothing("").checkType { _<Int>() }
[suppress("UNREACHABLE_CODE")] nothing(null!!).checkType { _<String>() }
}