1
0
Fork 0
forked from fun/fun

Added proc_run() and system() for processes and added to stdlib as class. (0.16.6)

This commit is contained in:
Johannes Findeisen 2025-10-02 01:50:53 +02:00
commit 1ac163a01e
11 changed files with 253 additions and 17 deletions

View file

@ -115,6 +115,8 @@ typedef enum {
// OS
OP_ENV, // pops name string; pushes value string (or "")
OP_INPUT_LINE, // operand: 0=no prompt; 1=has prompt. Pops [prompt?]; pushes input string (no trailing newline)
OP_PROC_RUN, // pops command string; pushes map {"out": string, "code": int}
OP_PROC_SYSTEM, // pops command string; pushes exit code number
// Threads
OP_THREAD_SPAWN, // operand: 0=no args, 1=has args; pops [args?], fn; pushes thread id (int>0)

View file

@ -654,6 +654,22 @@ static int emit_primary(Bytecode *bc, const char *src, size_t len, size_t *pos)
free(name);
return 1;
}
if (strcmp(name, "proc_run") == 0) {
(*pos)++; /* '(' */
if (!emit_expression(bc, src, len, pos)) { parser_fail(*pos, "proc_run expects 1 argument (command string)"); free(name); return 0; }
if (!consume_char(src, len, pos, ')')) { parser_fail(*pos, "Expected ')' after proc_run arg"); free(name); return 0; }
bytecode_add_instruction(bc, OP_PROC_RUN, 0);
free(name);
return 1;
}
if (strcmp(name, "system") == 0) {
(*pos)++; /* '(' */
if (!emit_expression(bc, src, len, pos)) { parser_fail(*pos, "system expects 1 argument (command string)"); free(name); return 0; }
if (!consume_char(src, len, pos, ')')) { parser_fail(*pos, "Expected ')' after system arg"); free(name); return 0; }
bytecode_add_instruction(bc, OP_PROC_SYSTEM, 0);
free(name);
return 1;
}
if (strcmp(name, "env") == 0) {
(*pos)++; /* '(' */
if (!emit_expression(bc, src, len, pos)) { parser_fail(*pos, "env expects 1 argument"); free(name); return 0; }

View file

@ -319,6 +319,8 @@ void vm_run(VM *vm, Bytecode *entry) {
#include "vm/os/sleep_ms.c"
#include "vm/os/thread_join.c"
#include "vm/os/thread_spawn.c"
#include "vm/os/proc_run.c"
#include "vm/os/proc_system.c"
#include "vm/strings/find.c"
#include "vm/strings/split.c"

View file

@ -33,7 +33,7 @@ static const char *opcode_names[] = {
"ENUMERATE","ZIP",
"MIN","MAX","CLAMP","ABS","POW","RANDOM_SEED","RANDOM_INT",
"MAKE_MAP","KEYS","VALUES","HAS_KEY",
"READ_FILE","WRITE_FILE","ENV","INPUT_LINE",
"READ_FILE","WRITE_FILE","ENV","INPUT_LINE","PROC_RUN","PROC_SYSTEM",
"THREAD_SPAWN","THREAD_JOIN","SLEEP_MS",
"BAND","BOR","BXOR","BNOT","SHL","SHR","ROTL","ROTR"
};

87
src/vm/os/proc_run.c Normal file
View file

@ -0,0 +1,87 @@
/**
* This file is part of the Fun programming language.
* https://hanez.org/project/fun/
*
* Copyright 2025 Johannes Findeisen
* Licensed under the terms of the Apache-2.0 license.
* https://opensource.org/license/apache-2-0
*
* Added: 2025-10-02
*/
#ifdef __unix__
#include <sys/wait.h>
#endif
case OP_PROC_RUN: {
/* Pops command string; pushes map {"out": string, "code": int} */
Value cmdv = pop_value(vm);
char *cmd = value_to_string_alloc(&cmdv);
free_value(cmdv);
if (!cmd) {
Value m = make_map_empty();
map_set(&m, "out", make_string(""));
map_set(&m, "code", make_int(-1));
push_value(vm, m);
break;
}
/* Use popen to run via shell and capture stdout */
FILE *fp = popen(cmd, "r");
int exit_code = -1;
char *out = NULL;
size_t cap = 0, len = 0;
if (fp) {
cap = 4096;
out = (char*)malloc(cap);
if (!out) {
pclose(fp);
free(cmd);
Value m = make_map_empty();
map_set(&m, "out", make_string(""));
map_set(&m, "code", make_int(-1));
push_value(vm, m);
break;
}
int c;
while ((c = fgetc(fp)) != EOF) {
if (len + 1 >= cap) {
cap *= 2;
char *nb = (char*)realloc(out, cap);
if (!nb) {
free(out);
pclose(fp);
free(cmd);
Value m = make_map_empty();
map_set(&m, "out", make_string(""));
map_set(&m, "code", make_int(-1));
push_value(vm, m);
goto done_push;
}
out = nb;
}
out[len++] = (char)c;
}
out[len] = '\0';
int status = pclose(fp);
#ifdef __unix__
if (WIFEXITED(status)) exit_code = WEXITSTATUS(status);
else exit_code = -1;
#else
exit_code = status;
#endif
} else {
out = strdup("");
exit_code = -1;
}
Value m = make_map_empty();
map_set(&m, "out", make_string(out ? out : ""));
map_set(&m, "code", make_int(exit_code));
push_value(vm, m);
done_push:
if (out) free(out);
free(cmd);
break;
}

37
src/vm/os/proc_system.c Normal file
View file

@ -0,0 +1,37 @@
/**
* This file is part of the Fun programming language.
* https://hanez.org/project/fun/
*
* Copyright 2025 Johannes Findeisen
* Licensed under the terms of the Apache-2.0 license.
* https://opensource.org/license/apache-2-0
*
* Added: 2025-10-02
*/
#ifdef __unix__
#include <sys/wait.h>
#endif
case OP_PROC_SYSTEM: {
/* Pops command string; pushes exit code number */
Value cmdv = pop_value(vm);
char *cmd = value_to_string_alloc(&cmdv);
free_value(cmdv);
if (!cmd) {
push_value(vm, make_int(-1));
break;
}
int status = system(cmd);
int code = -1;
#ifdef __unix__
if (status == -1) code = -1;
else if (WIFEXITED(status)) code = WEXITSTATUS(status);
else code = -1;
#else
code = status;
#endif
push_value(vm, make_int(code));
free(cmd);
break;
}