Miroirs/waforth
1
0
Fork 0
mirror of https://github.com/remko/waforth synced 2025-01-14 08:01:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

standalone: Support passing command-line argument

Browse source
This commit is contained in:
Remko Tronçon 2022-11-12 19:22:03 +01:00
parent 94c01dfdc7
commit 2e06201c81
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/standalone/Makefile
View file

@ -107,6 +107,10 @@ check:
echo ": MAIN 1 2 3 + .S ; MAIN" | ./waforth | tee test.out echo ": MAIN 1 2 3 + .S ; MAIN" | ./waforth | tee test.out
grep "1 5 ok" test.out grep "1 5 ok" test.out
rm test.out rm test.out
./waforth ../examples/hello.fs | tee test.out
grep "Hello, Forth" test.out
rm test.out
.PHONY: clean .PHONY: clean
clean: clean:

24
src/standalone/main.c
View file

@ -27,6 +27,8 @@ wasm_memory_t *memory;
wasm_table_t *table; wasm_table_t *table;
wasm_store_t *store; wasm_store_t *store;
FILE *input;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Utility // Utility
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -59,7 +61,7 @@ wasm_trap_t *read_cb(const wasm_val_vec_t *args, wasm_val_vec_t *results) {
char *addr = &wasm_memory_data(memory)[args->data[0].of.i32]; char *addr = &wasm_memory_data(memory)[args->data[0].of.i32];
size_t len = args->data[1].of.i32; size_t len = args->data[1].of.i32;
*addr = 0; *addr = 0;
fgets(addr, len, stdin); fgets(addr, len, input);
int n = strlen(addr); int n = strlen(addr);
results->data[0].kind = WASM_I32; results->data[0].kind = WASM_I32;
results->data[0].of.i32 = n; results->data[0].of.i32 = n;
@ -125,7 +127,13 @@ wasm_trap_t *call_cb(void *env, const wasm_val_vec_t *args, wasm_val_vec_t *resu
// Main // Main
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int main(int argc, char *argv_main[]) { int main(int argc, char *argv[]) {
if (argc >= 2) {
input = fopen(argv[1], "r");
} else {
input = stdin;
}
wasm_engine_t *engine = wasm_engine_new(); wasm_engine_t *engine = wasm_engine_new();
store = wasm_store_new(engine); store = wasm_store_new(engine);
wasm_byte_vec_t core = {.data = (wasm_byte_t *)waforth_core, .size = sizeof(waforth_core)}; wasm_byte_vec_t core = {.data = (wasm_byte_t *)waforth_core, .size = sizeof(waforth_core)};
@ -200,8 +208,11 @@ int main(int argc, char *argv_main[]) {
return -1; return -1;
} }
printf("WAForth (" VERSION ")\n"); if (input == stdin) {
wasm_val_t run_as[1] = {WASM_I32_VAL(0)}; printf("WAForth (" VERSION ")\n");
}
wasm_val_t run_as[1] = {WASM_I32_VAL(input != stdin)};
wasm_val_vec_t run_args = WASM_ARRAY_VEC(run_as); wasm_val_vec_t run_args = WASM_ARRAY_VEC(run_as);
wasm_val_vec_t run_results = WASM_EMPTY_VEC; wasm_val_vec_t run_results = WASM_EMPTY_VEC;
@ -250,5 +261,10 @@ int main(int argc, char *argv_main[]) {
wasm_module_delete(module); wasm_module_delete(module);
wasm_store_delete(store); wasm_store_delete(store);
wasm_engine_delete(engine); wasm_engine_delete(engine);
if (input != stdin) {
fclose(input);
}
return 0; return 0;
} }