Various fixes for HelloWorld. (#27)

This commit is contained in:
Nikolay Igotti
2016-11-01 15:33:41 +03:00
committed by GitHub
parent b142d39dbc
commit 7eeb2d3046
10 changed files with 70 additions and 18 deletions
+12 -5
View File
@@ -30,8 +30,8 @@ public class KonanTest extends DefaultTask {
classpath = project.configurations.cli_bc
args "-output", "${sourceBc.absolutePath}",
"-runtime", "${runtimeBc.absolutePath}",
"${sourceKt.absolutePath}",
project.project(':runtime').file('src/main/kotlin')
"-headers", project.project(':runtime').file('src/main/kotlin'),
"${sourceKt.absolutePath}"
jvmArgs "-Djava.library.path=${backendNative.buildDir.canonicalPath}/nativelibs"
}
@@ -75,11 +75,9 @@ task sum (type:KonanTest) {
source = "codegen/function/sum.kt"
}
/* Investigate
task objectInitialization(type: KonanTest) {
source = "codegen/object/initialization.kt"
}
*/
/* task objectBasic(type: KonanTest) {
source = "$codegen/klass/basic.kt"
@@ -101,7 +99,16 @@ 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) {
// source = "codegen/function/boolean.kt"
//}
//}
@@ -0,0 +1,4 @@
// TODO: remove kotlin_native.io once overrides are in place.
fun main(args : Array<String>) {
kotlin_native.io.print("Hello, world!")
}
@@ -0,0 +1,11 @@
extern void *resolve_symbol(const char*);
int
run_test() {
void (*main)(void*) = resolve_symbol("kfun:main");
main((void*)0);
return 0;
}
@@ -0,0 +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())
}