deprecating types after colon

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
@@ -1,3 +1,4 @@
// !CHECK_TYPE
package kotlin1
@@ -10,13 +11,13 @@ fun main(args : Array<String>) {
//
// }
val <!UNUSED_VARIABLE!>al2<!> = ArrayList<Int>(ArrayList<Int>())
al : RandomAccess
al.clear() : Unit
al.add(1) : Boolean
al.add(0, 1) : Unit
al.addAll(al1) : Boolean
al.addAll(0, al1) : Boolean
al.get(0) : Int
checkSubtype<RandomAccess>(al)
checkSubtype<Unit>(al.clear())
checkSubtype<Boolean>(al.add(1))
checkSubtype<Unit>(al.add(0, 1))
checkSubtype<Boolean>(al.addAll(al1))
checkSubtype<Boolean>(al.addAll(0, al1))
checkSubtype<Int>(al.get(0))
val m = HashMap<String, Int>()
m.put("", 1)
test(al, m)
@@ -1,8 +1,10 @@
// !CHECK_TYPE
package kotlin1
import java.util.*
fun main(args : Array<String>) {
val al : ArrayList<Int> = ArrayList<Int>()
al.clone() : Any // A type mismatch on this line means that jdk-annotations were not loaded
checkSubtype<Any>(al.clone()) // A type mismatch on this line means that jdk-annotations were not loaded
}
@@ -1,3 +1,4 @@
// !CHECK_TYPE
// !DIAGNOSTICS: -UNUSED_PARAMETER
package kotlin1
import java.util.*
@@ -9,5 +10,5 @@ fun main(args : Array<String>) {
val al : ArrayList<Int> = ArrayList<Int>()
// A type mismatch on this line means that jdk-annotations were not loaded
al.toArray(Array<Int>(3, {1})) : Array<Int>
checkSubtype<Array<Int>>(al.toArray(Array<Int>(3, {1})))
}
@@ -1,25 +1,27 @@
// !CHECK_TYPE
import java.sql.DriverManager
fun getConnection(url: String?) {
DriverManager.getConnection(url)
DriverManager.getConnection(url!!) : java.sql.Connection
checkSubtype<java.sql.Connection>(DriverManager.getConnection(url!!))
}
fun getConnection(url: String?, props: java.util.Properties?) {
DriverManager.getConnection(url, props)
DriverManager.getConnection(url!!, props) : java.sql.Connection
checkSubtype<java.sql.Connection>(DriverManager.getConnection(url!!, props))
}
fun getConnection(url: String?, user: String?, password: String?) {
DriverManager.getConnection(url, user!!, password!!)
DriverManager.getConnection(url!!, user, password<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>)
DriverManager.getConnection(url<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>, user<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>, password)
DriverManager.getConnection(url<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>, user<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>, password<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>) : java.sql.Connection
checkSubtype<java.sql.Connection>(DriverManager.getConnection(url<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>, user<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>, password<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>))
}
fun getDriver(url: String?) {
DriverManager.getDriver(url)
DriverManager.getDriver(url!!) : java.sql.Driver
checkSubtype<java.sql.Driver>(DriverManager.getDriver(url!!))
}
fun registerDriver(driver: java.sql.Driver?) {
@@ -28,5 +30,5 @@ fun registerDriver(driver: java.sql.Driver?) {
}
fun getDrivers() {
DriverManager.getDrivers() : java.util.Enumeration<java.sql.Driver>
}
checkSubtype<java.util.Enumeration<java.sql.Driver>>(DriverManager.getDrivers())
}
@@ -1,3 +1,5 @@
// !CHECK_TYPE
fun getMetaData(rs: java.sql.ResultSet) {
rs.getMetaData() : java.sql.ResultSetMetaData
checkSubtype<java.sql.ResultSetMetaData>(rs.getMetaData())
}
@@ -1,10 +1,12 @@
// !CHECK_TYPE
fun executeQuery(statement: java.sql.Statement, cmd: String?) {
statement.executeQuery(cmd)
statement.executeQuery(cmd!!) : java.sql.ResultSet
checkSubtype<java.sql.ResultSet>(statement.executeQuery(cmd!!))
}
fun executeQuery(statement: java.sql.PreparedStatement) {
statement.executeQuery() : java.sql.ResultSet
checkSubtype<java.sql.ResultSet>(statement.executeQuery())
}
fun executeUpdate(statement: java.sql.Statement, cmd: String?) {