Rename kotlin_native -> kotlin.

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() {

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 {

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) {

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<String>) {
-  kotlin_native.io.print("Hello, world!")
+  kotlin.io.print("Hello, world!")
 }

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<String>) {
-  kotlin_native.io.print(kotlin_native.io.readLine())
+  kotlin.io.print(kotlin.io.readLine())
 }

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
 }

runtime/src/main/kotlin/kotlin/Arrays.kt

@@ -1,4 +1,4 @@
-package kotlin_native
+package kotlin
 
 @ExportTypeInfo("theByteArrayTypeInfo")
 class ByteArray : Cloneable {

runtime/src/main/kotlin/kotlin/Cloneable.kt

@@ -1,4 +1,4 @@
-package kotlin_native
+package kotlin
 
 @ExportTypeInfo("theCloneableTypeInfo")
 public interface Cloneable {

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

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?
 

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

runtime/src/main/kotlin/kotlin_native/io/Console.kt

@@ -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