diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/NameUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/NameUtils.kt index 8e527a6b3df..b53992a3ed8 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/NameUtils.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/NameUtils.kt @@ -7,7 +7,7 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.constants.StringValue import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe -private val symbolNameAnnotation = FqName("kotlin_native.SymbolName") +private val symbolNameAnnotation = FqName("kotlin.SymbolName") internal val FunctionDescriptor.symbolName: String get() { diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/RTTIGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/RTTIGenerator.kt index a4886ea32a6..2d9c53fb199 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/RTTIGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/RTTIGenerator.kt @@ -118,7 +118,7 @@ internal class RTTIGenerator(override val context: Context) : ContextUtils { } private fun exportTypeInfoIfRequired(classDesc: ClassDescriptor, typeInfoGlobal: LLVMOpaqueValue?) { - val annot = classDesc.annotations.findAnnotation(FqName("kotlin_native.ExportTypeInfo")) + val annot = classDesc.annotations.findAnnotation(FqName("kotlin.ExportTypeInfo")) if (annot != null) { val nameValue = annot.allValueArguments.values.single() as StringValue // TODO: use LLVMAddAlias? @@ -128,10 +128,10 @@ internal class RTTIGenerator(override val context: Context) : ContextUtils { } private val arrayClasses = mapOf( - Pair("kotlin_native.ByteArray", -1), - Pair("kotlin_native.CharArray", -2), - Pair("kotlin_native.IntArray", -4), - Pair("kotlin_native.String", -1) + Pair("kotlin.ByteArray", -1), + Pair("kotlin.CharArray", -2), + Pair("kotlin.IntArray", -4), + Pair("kotlin.String", -1) ); private fun getInstanceSize(classType: LLVMOpaqueType?, className: FqName) : Int { diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle index 9a0cfcc524b..7641e7824ec 100644 --- a/backend.native/tests/build.gradle +++ b/backend.native/tests/build.gradle @@ -99,14 +99,13 @@ task sum_3const(type: KonanTest) { source = "codegen/function/sum_3const.kt" } -/* TODO: enable, once kotlin.String -> kotlin_native.String is mapped. task hello0(type: KonanTest) { source = "runtime/basic/hello0.kt" } task hello1(type: KonanTest) { source = "runtime/basic/hello1.kt" - } */ +} // TODO: waiting for boolean to be implemented //task bool_yes(type: KonanTest) { diff --git a/backend.native/tests/runtime/basic/hello0.kt b/backend.native/tests/runtime/basic/hello0.kt index 7cfbd894802..2b35e95c323 100644 --- a/backend.native/tests/runtime/basic/hello0.kt +++ b/backend.native/tests/runtime/basic/hello0.kt @@ -1,4 +1,4 @@ // TODO: remove kotlin_native.io once overrides are in place. fun main(args : Array) { - kotlin_native.io.print("Hello, world!") + kotlin.io.print("Hello, world!") } diff --git a/backend.native/tests/runtime/basic/hello1.kt b/backend.native/tests/runtime/basic/hello1.kt index 2e0ff78386b..389e2a8d72b 100644 --- a/backend.native/tests/runtime/basic/hello1.kt +++ b/backend.native/tests/runtime/basic/hello1.kt @@ -1,4 +1,4 @@ // TODO: remove kotlin_native.io once overrides are in place. fun main(args : Array) { - kotlin_native.io.print(kotlin_native.io.readLine()) + kotlin.io.print(kotlin.io.readLine()) } diff --git a/runtime/src/main/kotlin/kotlin_native/Any.kt b/runtime/src/main/kotlin/kotlin/Any.kt similarity index 65% rename from runtime/src/main/kotlin/kotlin_native/Any.kt rename to runtime/src/main/kotlin/kotlin/Any.kt index 16858afb2f3..a4c8f2b3688 100644 --- a/runtime/src/main/kotlin/kotlin_native/Any.kt +++ b/runtime/src/main/kotlin/kotlin/Any.kt @@ -1,14 +1,14 @@ -package kotlin_native +package kotlin @ExportTypeInfo("theAnyTypeInfo") -public open class Any0 { +public open class Any { // @SymbolName("Kotlin_Any_equals") // external public open operator fun equals0(other: Any0?): Boolean // TODO: do we need that in Any? @SymbolName("Kotlin_Any_hashCode") - external public open fun hashCode0(): Int + external public open fun hashCode(): Int @SymbolName("Kotlin_Any_toString") - external public open fun toString0(): String + external public open fun toString(): String } diff --git a/runtime/src/main/kotlin/kotlin_native/Arrays.kt b/runtime/src/main/kotlin/kotlin/Arrays.kt similarity index 98% rename from runtime/src/main/kotlin/kotlin_native/Arrays.kt rename to runtime/src/main/kotlin/kotlin/Arrays.kt index 800767e1dcf..9eb10f14d60 100644 --- a/runtime/src/main/kotlin/kotlin_native/Arrays.kt +++ b/runtime/src/main/kotlin/kotlin/Arrays.kt @@ -1,4 +1,4 @@ -package kotlin_native +package kotlin @ExportTypeInfo("theByteArrayTypeInfo") class ByteArray : Cloneable { diff --git a/runtime/src/main/kotlin/kotlin_native/Cloneable.kt b/runtime/src/main/kotlin/kotlin/Cloneable.kt similarity index 81% rename from runtime/src/main/kotlin/kotlin_native/Cloneable.kt rename to runtime/src/main/kotlin/kotlin/Cloneable.kt index e7d88968420..8ee1142e21d 100644 --- a/runtime/src/main/kotlin/kotlin_native/Cloneable.kt +++ b/runtime/src/main/kotlin/kotlin/Cloneable.kt @@ -1,4 +1,4 @@ -package kotlin_native +package kotlin @ExportTypeInfo("theCloneableTypeInfo") public interface Cloneable { diff --git a/runtime/src/main/kotlin/kotlin_native/String.kt b/runtime/src/main/kotlin/kotlin/String.kt similarity index 98% rename from runtime/src/main/kotlin/kotlin_native/String.kt rename to runtime/src/main/kotlin/kotlin/String.kt index 0133cacdc9d..88b27fb3b3e 100644 --- a/runtime/src/main/kotlin/kotlin_native/String.kt +++ b/runtime/src/main/kotlin/kotlin/String.kt @@ -1,4 +1,4 @@ -package kotlin_native +package kotlin @SymbolName("Kotlin_String_fromUtf8Array") external fun fromUtf8Array(array: ByteArray) : String diff --git a/runtime/src/main/kotlin/kotlin_native/annotations.kt b/runtime/src/main/kotlin/kotlin/annotations.kt similarity index 96% rename from runtime/src/main/kotlin/kotlin_native/annotations.kt rename to runtime/src/main/kotlin/kotlin/annotations.kt index 49424e6d40f..cdbad65024b 100644 --- a/runtime/src/main/kotlin/kotlin_native/annotations.kt +++ b/runtime/src/main/kotlin/kotlin/annotations.kt @@ -1,4 +1,4 @@ -package kotlin_native +package kotlin // TODO: shouldn't these annotation be located in 'kotlin_native.internal' package? diff --git a/runtime/src/main/kotlin/kotlin/io/Console.kt b/runtime/src/main/kotlin/kotlin/io/Console.kt new file mode 100644 index 00000000000..21ea74e1cf1 --- /dev/null +++ b/runtime/src/main/kotlin/kotlin/io/Console.kt @@ -0,0 +1,7 @@ +package kotlin.io + +@kotlin.SymbolName("Kotlin_io_Console_print") +external public fun print(message: kotlin.String) + +@kotlin.SymbolName("Kotlin_io_Console_readLine") +external public fun readLine(): kotlin.String diff --git a/runtime/src/main/kotlin/kotlin_native/io/Console.kt b/runtime/src/main/kotlin/kotlin_native/io/Console.kt deleted file mode 100644 index cc14038fa35..00000000000 --- a/runtime/src/main/kotlin/kotlin_native/io/Console.kt +++ /dev/null @@ -1,7 +0,0 @@ -package kotlin_native.io - -@kotlin_native.SymbolName("Kotlin_io_Console_print") -external public fun print(message: kotlin_native.String) - -@kotlin_native.SymbolName("Kotlin_io_Console_readLine") -external public fun readLine(): kotlin_native.String