From 80c50c24e62ac3080e5d17e43debb553890087e2 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Thu, 1 Dec 2016 17:42:54 +0300 Subject: [PATCH] Renamed Kotlin_start to Konan_start. --- backend.native/tests/build.gradle | 2 +- runtime/src/launcher/cpp/launcher.cpp | 4 ++-- runtime/src/launcher/kotlin/konan/start.kt | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle index 2bd253bcb25..0f1a5388b1f 100644 --- a/backend.native/tests/build.gradle +++ b/backend.native/tests/build.gradle @@ -615,7 +615,7 @@ task args0(type: RunKonanTest) { } task main_exception(type: RunKonanTest) { - goldValue = "Uncaught exception from kotlin main: Throwable\n" + goldValue = "Uncaught exception from Kotlin's main: Throwable\n" source = "runtime/basic/main_exception.kt" } diff --git a/runtime/src/launcher/cpp/launcher.cpp b/runtime/src/launcher/cpp/launcher.cpp index 7c03f21448a..f94039f1084 100644 --- a/runtime/src/launcher/cpp/launcher.cpp +++ b/runtime/src/launcher/cpp/launcher.cpp @@ -15,14 +15,14 @@ ArrayHeader* setupArgs(int argc, char** argv) { return args; } -extern "C" void Kotlin_start(ArrayHeader* ); +extern "C" void Konan_start(ArrayHeader* ); int main(int argc, char** argv) { InitMemory(); ArrayHeader* args = setupArgs(argc, argv); - Kotlin_start(args); + Konan_start(args); // Yes, we have to follow Java convention and return zero. return 0; diff --git a/runtime/src/launcher/kotlin/konan/start.kt b/runtime/src/launcher/kotlin/konan/start.kt index b4d81df93eb..e5132fcb708 100644 --- a/runtime/src/launcher/kotlin/konan/start.kt +++ b/runtime/src/launcher/kotlin/konan/start.kt @@ -3,16 +3,16 @@ import konan.internal.ExportForCppRuntime external fun main(args: Array) @ExportForCppRuntime -private fun Kotlin_start(args: Array) { +private fun Konan_start(args: Array) { try { // This is kotlin program main entry point main(args) } catch (e: Throwable) { - // TODO: Remove .toString() when println is more capabe, + // TODO: Remove .toString() when println is more capable, // and may be add some more info. - print("Uncaught exception from kotlin main: ") + print("Uncaught exception from Kotlin's main: ") println(e.toString()) } }