Deprecate JVM platform annotations in favor of capitilized themselves

This commit is contained in:
Denis Zharkov
2015-09-04 14:46:46 +03:00
parent 5471a1d18a
commit 952d45dc8b
107 changed files with 290 additions and 266 deletions
@@ -1,6 +1,6 @@
class C {
companion object {
@kotlin.platform.platformStatic @kotlin.jvm.jvmOverloads public fun foo(o: String, k: String = "K"): String {
@kotlin.platform.platformStatic @kotlin.jvm.JvmOverloads public fun foo(o: String, k: String = "K"): String {
return o + k
}
}
@@ -1,5 +1,5 @@
class C {
@kotlin.jvm.jvmOverloads public fun foo(o: String = "O", i1: Int, k: String = "K", i2: Int): String {
@kotlin.jvm.JvmOverloads public fun foo(o: String = "O", i1: Int, k: String = "K", i2: Int): String {
return o + k
}
}
@@ -1,5 +1,5 @@
class C {
@kotlin.jvm.jvmOverloads public fun foo(d1: Double, d2: Double, status: String = "OK"): String {
@kotlin.jvm.JvmOverloads public fun foo(d1: Double, d2: Double, status: String = "OK"): String {
return if (d1 + d2 == 3.0) status else "fail"
}
}
@@ -1,7 +1,7 @@
class C {
}
@kotlin.jvm.jvmOverloads fun C.foo(o: String, k: String = "K"): String {
@kotlin.jvm.JvmOverloads fun C.foo(o: String, k: String = "K"): String {
return o + k
}
@@ -1,5 +1,5 @@
class C {
@kotlin.jvm.jvmOverloads public fun foo(o: String = "O", k: String = "K"): String {
@kotlin.jvm.JvmOverloads public fun foo(o: String = "O", k: String = "K"): String {
return o + k
}
}
@@ -1,5 +1,5 @@
class C {
@kotlin.jvm.jvmOverloads public fun foo(o: String, k: String = "K"): String {
@kotlin.jvm.JvmOverloads public fun foo(o: String, k: String = "K"): String {
return o + k
}
}
@@ -1,4 +1,4 @@
class C @kotlin.jvm.jvmOverloads constructor(s1: String, s2: String = "K") {
class C @kotlin.jvm.JvmOverloads constructor(s1: String, s2: String = "K") {
public val status: String = s1 + s2
}
@@ -1,7 +1,7 @@
class C(val i: Int) {
var status = "fail"
@kotlin.jvm.jvmOverloads constructor(o: String, k: String = "K"): this(-1) {
@kotlin.jvm.JvmOverloads constructor(o: String, k: String = "K"): this(-1) {
status = o + k
}
}
@@ -1,5 +1,5 @@
class C {
@kotlin.jvm.jvmOverloads public fun foo(s: String = "OK"): String {
@kotlin.jvm.JvmOverloads public fun foo(s: String = "OK"): String {
return s
}
}
@@ -1,4 +1,4 @@
@jvmName("Fail")
@JvmName("Fail")
fun OK() {}
fun box() = ::OK.name
@@ -21,7 +21,7 @@ fun box(): String {
val staticMethod = javaClass<C>().getDeclaredMethod("foo", javaClass<String>())
val k2 = staticMethod.kotlinFunction ?:
return "Fail: no Kotlin function found for static bridge for @jvmStatic method in companion object C::foo"
return "Fail: no Kotlin function found for static bridge for @JvmStatic method in companion object C::foo"
assertEquals(3, k2.call(C, "ghi"))
failsWith(javaClass<NullPointerException>()) { k2.call(null, "")!! }