Renamed Kotlin_start to Konan_start.
This commit is contained in:
committed by
alexander-gorshenev
parent
80e39cb7c9
commit
80c50c24e6
@@ -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"
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -3,16 +3,16 @@ import konan.internal.ExportForCppRuntime
|
||||
external fun main(args: Array<String>)
|
||||
|
||||
@ExportForCppRuntime
|
||||
private fun Kotlin_start(args: Array<String>) {
|
||||
private fun Konan_start(args: Array<String>) {
|
||||
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())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user