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

rename platformStatic to jvmStatic

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-08-21 12:57:54 +02:00
parent 4053c19260
commit 341f09afd3
51 changed files with 145 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt
Vendored
+9 -9
View File
@@ -1,54 +1,54 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE
import kotlin.platform.platformStatic
import kotlin.jvm.jvmStatic
class A {
companion object {
platformStatic fun a1() {
jvmStatic fun a1() {
}
}
object A {
platformStatic fun a2() {
jvmStatic fun a2() {
}
}
fun test() {
val s = object {
<!PLATFORM_STATIC_NOT_IN_OBJECT!>platformStatic fun a3()<!> {
<!JVM_STATIC_NOT_IN_OBJECT!>jvmStatic fun a3()<!> {
}
}
}
<!PLATFORM_STATIC_NOT_IN_OBJECT!>platformStatic fun a4()<!> {
<!JVM_STATIC_NOT_IN_OBJECT!>jvmStatic fun a4()<!> {
}
}
interface B {
companion object {
<!PLATFORM_STATIC_NOT_IN_OBJECT!>platformStatic fun a1()<!> {
<!JVM_STATIC_NOT_IN_OBJECT!>jvmStatic fun a1()<!> {
}
}
object A {
platformStatic fun a2() {
jvmStatic fun a2() {
}
}
fun test() {
val s = object {
<!PLATFORM_STATIC_NOT_IN_OBJECT!>platformStatic fun a3()<!> {
<!JVM_STATIC_NOT_IN_OBJECT!>jvmStatic fun a3()<!> {
}
}
}
<!PLATFORM_STATIC_NOT_IN_OBJECT!>platformStatic fun a4()<!> {
<!JVM_STATIC_NOT_IN_OBJECT!>jvmStatic fun a4()<!> {
}
}