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

Deprecate JVM platform annotations in favor of capitilized themselves

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxWithJava/jvmOverloads/generics/generics.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
class C<T> {
@kotlin.jvm.jvmOverloads public fun foo(o: T, k: String = "K"): String = o.toString() + k
@kotlin.jvm.JvmOverloads public fun foo(o: T, k: String = "K"): String = o.toString() + k
}
fun box(): String {
compiler/testData/codegen/boxWithJava/jvmOverloads/simple/simple.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
class C {
@kotlin.jvm.jvmOverloads public fun foo(o: String = "O", k: String = "K"): String = o + k
@kotlin.jvm.JvmOverloads public fun foo(o: String = "O", k: String = "K"): String = o + k
}
fun box(): String {
compiler/testData/codegen/boxWithJava/platformName/FakePlatformName.java
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
import kotlin.jvm.jvmName;
import kotlin.jvm.JvmName;
public class FakePlatformName {
@jvmName(name = "fake")
@JvmName(name = "fake")
public String foo() {
return "foo";
}
compiler/testData/codegen/boxWithJava/platformStatic/annotations/simpleClassObject.kt
Vendored
+3 -3
View File
@@ -1,4 +1,4 @@
import kotlin.jvm.jvmStatic
import kotlin.jvm.JvmStatic
annotation(retention = AnnotationRetention.RUNTIME) class testAnnotation
@@ -7,14 +7,14 @@ class A {
companion object {
val b: String = "OK"
jvmStatic testAnnotation fun test1() = b
JvmStatic testAnnotation fun test1() = b
}
}
object B {
val b: String = "OK"
jvmStatic testAnnotation fun test1() = b
JvmStatic testAnnotation fun test1() = b
}
fun box(): String {
compiler/testData/codegen/boxWithJava/platformStatic/classObject/simpleClassObject.kt
Vendored
+5 -5
View File
@@ -1,17 +1,17 @@
import kotlin.jvm.jvmStatic
import kotlin.jvm.JvmStatic
class A {
companion object {
val b: String = "OK"
jvmStatic val c: String = "OK"
JvmStatic val c: String = "OK"
jvmStatic fun test1() = b
JvmStatic fun test1() = b
jvmStatic fun test2() = b
JvmStatic fun test2() = b
jvmStatic fun String.test3() = this + b
JvmStatic fun String.test3() = this + b
}
}
compiler/testData/codegen/boxWithJava/platformStatic/enumCompanion/enumCompanionObject.kt
Vendored
+3 -3
View File
@@ -1,13 +1,13 @@
import kotlin.jvm.jvmStatic
import kotlin.jvm.JvmStatic
enum class A {
;
companion object {
val foo: String = "OK"
jvmStatic val bar: String = "OK"
JvmStatic val bar: String = "OK"
jvmStatic fun baz() = foo
JvmStatic fun baz() = foo
}
}
compiler/testData/codegen/boxWithJava/platformStatic/object/simpleObject.kt
Vendored
+5 -5
View File
@@ -1,16 +1,16 @@
import kotlin.jvm.jvmStatic
import kotlin.jvm.JvmStatic
object A {
val b: String = "OK"
jvmStatic val c: String = "OK"
JvmStatic val c: String = "OK"
jvmStatic fun test1() = b
JvmStatic fun test1() = b
jvmStatic fun test2() = b
JvmStatic fun test2() = b
jvmStatic fun String.test3() = this + b
JvmStatic fun String.test3() = this + b
}
fun box(): String {
compiler/testData/codegen/boxWithStdlib/jvmOverloads/companionObject.kt
Vendored
+1 -1
View File
@@ -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
}
}
compiler/testData/codegen/boxWithStdlib/jvmOverloads/defaultsNotAtEnd.kt
Vendored
+1 -1
View File
@@ -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
}
}
compiler/testData/codegen/boxWithStdlib/jvmOverloads/doubleParameters.kt
Vendored
+1 -1
View File
@@ -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"
}
}
compiler/testData/codegen/boxWithStdlib/jvmOverloads/extensionMethod.kt
Vendored
+1 -1
View File
@@ -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
}
compiler/testData/codegen/boxWithStdlib/jvmOverloads/multipleDefaultParameters.kt
Vendored
+1 -1
View File
@@ -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
}
}
compiler/testData/codegen/boxWithStdlib/jvmOverloads/nonDefaultParameter.kt
Vendored
+1 -1
View File
@@ -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
}
}
compiler/testData/codegen/boxWithStdlib/jvmOverloads/primaryConstructor.kt
Vendored
+1 -1
View File
@@ -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
}
compiler/testData/codegen/boxWithStdlib/jvmOverloads/secondaryConstructor.kt
Vendored
+1 -1
View File
@@ -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
}
}
compiler/testData/codegen/boxWithStdlib/jvmOverloads/simple.kt
Vendored
+1 -1
View File
@@ -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
}
}
compiler/testData/codegen/boxWithStdlib/reflection/functions/platformName.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
@jvmName("Fail")
@JvmName("Fail")
fun OK() {}
fun box() = ::OK.name
compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/companionObjectFunction.kt
Vendored
+1 -1
View File
@@ -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, "")!! }