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
j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
import kotlin.platform.platformStatic
public object A {
platformStatic public fun main(args: Array<String>) {
jvmStatic public fun main(args: Array<String>) {
println(Void.TYPE)
println(Integer.TYPE)
println(java.lang.Double.TYPE)
j2k/testData/fileOrElement/for/withContinue1.kt
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
import kotlin.platform.platformStatic
public object TestClass {
platformStatic public fun main(args: Array<String>) {
jvmStatic public fun main(args: Array<String>) {
var i = 0
while (i < 10) {
if (i == 4 || i == 8) {
j2k/testData/fileOrElement/for/withContinue2.kt
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
import kotlin.platform.platformStatic
public object TestClass {
platformStatic public fun main(args: Array<String>) {
jvmStatic public fun main(args: Array<String>) {
var i = 0
var j = 1
while (i < 10) {
j2k/testData/fileOrElement/for/withContinue3.kt
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
import kotlin.platform.platformStatic
public object TestClass {
platformStatic public fun main(args: Array<String>) {
jvmStatic public fun main(args: Array<String>) {
var i = 1
while (i < 1000) {
if (i == 4 || i == 8) {
j2k/testData/fileOrElement/for/withContinueAndLabels.kt
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
import kotlin.platform.platformStatic
public object TestClass {
platformStatic public fun main(args: Array<String>) {
jvmStatic public fun main(args: Array<String>) {
var i = 1
OuterLoop1@ OuterLoop2@ while (i < 1000) {
var j = 1
j2k/testData/fileOrElement/function/main.kt
Vendored
+1 -4
View File
@@ -1,5 +1,2 @@
import kotlin.platform.platformStatic
platformStatic public fun main(args: Array<String>) {
jvmStatic public fun main(args: Array<String>) {
}
j2k/testData/fileOrElement/function/main2.kt
Vendored
+1 -3
View File
@@ -1,6 +1,4 @@
import kotlin.platform.platformStatic
public object A {
platformStatic public fun main(args: Array<String>) {
jvmStatic public fun main(args: Array<String>) {
}
}
j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
import kotlin.platform.platformStatic
// !forceNotNullTypes: false
public object A {
platformStatic public fun main(args: Array<String>) {
jvmStatic public fun main(args: Array<String>) {
}
}
j2k/testData/fileOrElement/issues/kt-638.kt
Vendored
+1 -3
View File
@@ -1,6 +1,4 @@
// ERROR: Property must be initialized or be abstract
import kotlin.platform.platformStatic
public class Identifier<T> {
public val name: T
private val myHasDollar: Boolean
@@ -23,7 +21,7 @@ public class Identifier<T> {
}
public object User {
platformStatic public fun main(args: Array<String>) {
jvmStatic public fun main(args: Array<String>) {
val i1 = Identifier("name", false, true)
val i2 = Identifier("name", false)
val i3 = Identifier("name")
j2k/testData/fileOrElement/issues/kt-807.kt
Vendored
+1 -2
View File
@@ -3,10 +3,9 @@
// ERROR: Assignments are not expressions, and only expressions are allowed in this context
// ERROR: Unresolved reference: close
import java.io.*
import kotlin.platform.platformStatic
object FileRead {
platformStatic public fun main(args: Array<String>) {
jvmStatic public fun main(args: Array<String>) {
try {
val fstream = FileInputStream()
val `in` = DataInputStream(fstream)
j2k/testData/fileOrElement/issues/kt-871.kt
Vendored
+1 -3
View File
@@ -1,9 +1,7 @@
package demo
import kotlin.platform.platformStatic
object Program {
platformStatic public fun main(args: Array<String>) {
jvmStatic public fun main(args: Array<String>) {
println("Halo!")
}
}
j2k/testData/fileOrElement/switch/comlicatedFallDown.kt
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
package demo
import kotlin.platform.platformStatic
public object SwitchDemo {
public fun print(o: Any) {
println(o)
@@ -78,7 +76,7 @@ public object SwitchDemo {
println(monthString)
}
platformStatic public fun main(args: Array<String>) {
jvmStatic public fun main(args: Array<String>) {
for (i in 1..12)
test(i)
}
j2k/testData/fileOrElement/switch/emptySwitch.kt
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
import kotlin.platform.platformStatic
public object NonDefault {
platformStatic public fun main(args: Array<String>) {
jvmStatic public fun main(args: Array<String>) {
val value = 3
val valueString = ""
j2k/testData/fileOrElement/switch/fallDown.kt
Vendored
+1 -3
View File
@@ -1,9 +1,7 @@
package switch_demo
import kotlin.platform.platformStatic
public object SwitchDemo {
platformStatic public fun main(args: Array<String>) {
jvmStatic public fun main(args: Array<String>) {
val month = 8
val monthString: String
when (month) {
j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
import kotlin.platform.platformStatic
public object C {
platformStatic public fun main(args: Array<String>) {
jvmStatic public fun main(args: Array<String>) {
when (args.size()) {
1 -> {
run {
j2k/testData/fileOrElement/switch/kt-539.kt
Vendored
+1 -3
View File
@@ -1,9 +1,7 @@
package switch_demo
import kotlin.platform.platformStatic
public object SwitchDemo {
platformStatic public fun main(args: Array<String>) {
jvmStatic public fun main(args: Array<String>) {
val month = 8
val monthString: String
j2k/testData/fileOrElement/switch/nondefault.kt
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
import kotlin.platform.platformStatic
public object NonDefault {
platformStatic public fun main(args: Array<String>) {
jvmStatic public fun main(args: Array<String>) {
val value = 3
var valueString = ""