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

drop deprecated @platformName and @platformStatic annotations

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-10-29 14:29:53 +01:00
parent 15370244dc
commit 736b496f6a
74 changed files with 139 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxWithStdlib/jvmStatic/closure.kt
Vendored
+5 -7
View File
@@ -1,16 +1,14 @@
import kotlin.platform.platformStatic
object A {
val b: String = "OK"
@platformStatic val c: String = "OK"
@JvmStatic val c: String = "OK"
@platformStatic fun test1() : String {
@JvmStatic fun test1() : String {
return {b}()
}
@platformStatic fun test2() : String {
@JvmStatic fun test2() : String {
return {test1()}()
}
@@ -18,11 +16,11 @@ object A {
return {"1".test5()}()
}
@platformStatic fun test4(): String {
@JvmStatic fun test4(): String {
return {"1".test5()}()
}
@platformStatic fun String.test5() : String {
@JvmStatic fun String.test5() : String {
return {this + b}()
}
compiler/testData/codegen/boxWithStdlib/jvmStatic/convention.kt
Vendored
+1 -3
View File
@@ -1,5 +1,3 @@
import kotlin.platform.platformStatic
class B(var s: Int = 0) {
}
@@ -10,7 +8,7 @@ object A {
v += B(1000)
}
@platformStatic fun B.plusAssign(b: B) {
@JvmStatic fun B.plusAssign(b: B) {
this.s += b.s
}
}
compiler/testData/codegen/boxWithStdlib/jvmStatic/default.kt
Vendored
+1 -3
View File
@@ -1,8 +1,6 @@
import kotlin.platform.platformStatic
object A {
@platformStatic fun test(b: String = "OK") : String {
@JvmStatic fun test(b: String = "OK") : String {
return b
}
}
compiler/testData/codegen/boxWithStdlib/jvmStatic/explicitObject.kt
Vendored
+3 -5
View File
@@ -1,10 +1,8 @@
import kotlin.platform.platformStatic
object AX {
@platformStatic val c: String = "OK"
@JvmStatic val c: String = "OK"
@platformStatic fun aStatic(): String {
@JvmStatic fun aStatic(): String {
return AX.b()
}
@@ -12,7 +10,7 @@ object AX {
return AX.b()
}
@platformStatic fun b(): String {
@JvmStatic fun b(): String {
return "OK"
}
compiler/testData/codegen/boxWithStdlib/jvmStatic/funAccess.kt
Vendored
+1 -3
View File
@@ -1,5 +1,3 @@
import kotlin.platform.platformStatic
var holder = ""
fun getA(): A {
@@ -8,7 +6,7 @@ fun getA(): A {
}
object A {
@platformStatic fun a(): String {
@JvmStatic fun a(): String {
return holder
}
}
compiler/testData/codegen/boxWithStdlib/jvmStatic/inline.kt
Vendored
+1 -3
View File
@@ -1,8 +1,6 @@
import kotlin.platform.platformStatic
object A {
@platformStatic inline fun test(b: String = "OK") : String {
@JvmStatic inline fun test(b: String = "OK") : String {
return b
}
}
compiler/testData/codegen/boxWithStdlib/jvmStatic/postfixInc.kt
Vendored
+3 -5
View File
@@ -1,14 +1,12 @@
import kotlin.platform.platformStatic
object A {
@platformStatic var a: Int = 1
@JvmStatic var a: Int = 1
var b: Int = 1
@platformStatic get
@JvmStatic get
var c: Int = 1
@platformStatic set
@JvmStatic set
}
compiler/testData/codegen/boxWithStdlib/jvmStatic/prefixInc.kt
Vendored
+3 -5
View File
@@ -1,14 +1,12 @@
import kotlin.platform.platformStatic
object A {
@platformStatic var a: Int = 1
@JvmStatic var a: Int = 1
var b: Int = 1
@platformStatic get
@JvmStatic get
var c: Int = 1
@platformStatic set
@JvmStatic set
}
compiler/testData/codegen/boxWithStdlib/jvmStatic/privateMethod.kt
Vendored
+1 -3
View File
@@ -1,8 +1,6 @@
import kotlin.platform.platformStatic
object A {
private @platformStatic fun a(): String {
private @JvmStatic fun a(): String {
return "OK"
}
compiler/testData/codegen/boxWithStdlib/jvmStatic/propertyAccess.kt
Vendored
+3 -5
View File
@@ -1,5 +1,3 @@
import kotlin.platform.platformStatic
var holder = ""
fun getA(): A {
@@ -9,13 +7,13 @@ fun getA(): A {
object A {
@platformStatic var a: Int = 1
@JvmStatic var a: Int = 1
var b: Int = 1
@platformStatic get
@JvmStatic get
var c: Int = 1
@platformStatic set
@JvmStatic set
}
compiler/testData/codegen/boxWithStdlib/jvmStatic/propertyAsDefault.kt
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
import kotlin.platform.platformStatic
object X {
@platformStatic val x = "OK"
@JvmStatic val x = "OK"
fun fn(value : String = x): String = value
}
compiler/testData/codegen/boxWithStdlib/jvmStatic/simple.kt
Vendored
+5 -7
View File
@@ -1,16 +1,14 @@
import kotlin.platform.platformStatic
object A {
val b: String = "OK"
@platformStatic val c: String = "OK"
@JvmStatic val c: String = "OK"
@platformStatic fun test1() : String {
@JvmStatic fun test1() : String {
return b
}
@platformStatic fun test2() : String {
@JvmStatic fun test2() : String {
return test1()
}
@@ -18,11 +16,11 @@ object A {
return "1".test5()
}
@platformStatic fun test4(): String {
@JvmStatic fun test4(): String {
return "1".test5()
}
@platformStatic fun String.test5() : String {
@JvmStatic fun String.test5() : String {
return this + b
}
}
compiler/testData/codegen/boxWithStdlib/jvmStatic/syntheticAccessor.kt
Vendored
+1 -3
View File
@@ -1,8 +1,6 @@
import kotlin.platform.*
class C {
companion object {
private @platformStatic fun foo(): String {
private @JvmStatic fun foo(): String {
return "OK"
}
}