hanez/fun
1
0
Fork 0
forked from fun/fun
Code Pull requests Activity

Added fun_version and env_all as opcodes and some fixes in httpserver. (0.37.30)

Browse source
This commit is contained in:
Johannes Findeisen 2025-12-28 23:36:37 +01:00
commit a27ff12b08
12 changed files with 126 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.10)
project(fun VERSION 0.37.29 LANGUAGES C) project(fun VERSION 0.37.30 LANGUAGES C)
set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD 99)
set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_C_STANDARD_REQUIRED ON)
@ -378,10 +378,12 @@ target_include_directories(fun_core PUBLIC
# Apply options to core # Apply options to core
if(FUN_DEBUG) if(FUN_DEBUG)
message(STATUS "FUN_DEBUG enabled: building with verbose debug logging") message(STATUS "FUN_DEBUG enabled: building with verbose debug logging")
target_compile_definitions(fun_core PUBLIC FUN_VERSION="${PROJECT_VERSION}")
target_compile_definitions(fun_core PUBLIC FUN_DEBUG=1) target_compile_definitions(fun_core PUBLIC FUN_DEBUG=1)
endif() endif()
# Provide default stdlib directory to the runtime # Provide default stdlib directory to the runtime
target_compile_definitions(fun_core PUBLIC FUN_VERSION="${PROJECT_VERSION}")
target_compile_definitions(fun_core PUBLIC DEFAULT_LIB_DIR="${DEFAULT_LIB_DIR}") target_compile_definitions(fun_core PUBLIC DEFAULT_LIB_DIR="${DEFAULT_LIB_DIR}")
# PCSC include and link (if enabled) # PCSC include and link (if enabled)
@ -472,7 +474,6 @@ add_executable(fun
src/fun.c src/fun.c
) )
# Provide version string to the CLI # Provide version string to the CLI
target_compile_definitions(fun PRIVATE FUN_VERSION=\"${PROJECT_VERSION}\")
if(FUN_WITH_REPL) if(FUN_WITH_REPL)
# Enable REPL compilation path and add the REPL source # Enable REPL compilation path and add the REPL source
target_compile_definitions(fun PRIVATE FUN_WITH_REPL=1) target_compile_definitions(fun PRIVATE FUN_WITH_REPL=1)

13
examples/data/htdocs/info.fun
View file

@ -11,8 +11,7 @@
* Added: 2025-12-28 * Added: 2025-12-28
*/ */
result = proc_run("fun -V") content = fun_version()
content = result["out"]
print("<html><body>") print("<html><body>")
print("<h1>Fun Environment Information</h1>") print("<h1>Fun Environment Information</h1>")
@ -20,4 +19,14 @@ print("<p><strong>Current Path:</strong> " + env("PATH") + "</p>")
print("<p><strong>Current User:</strong> " + env("USER") + "</p>") print("<p><strong>Current User:</strong> " + env("USER") + "</p>")
print("<p><strong>Time:</strong> " + date_format(time_now_ms(), "%Y-%m-%d %H:%M:%S") + "</p>") print("<p><strong>Time:</strong> " + date_format(time_now_ms(), "%Y-%m-%d %H:%M:%S") + "</p>")
print("<p><strong>Version:</strong> " + to_string(content) + "</p>") print("<p><strong>Version:</strong> " + to_string(content) + "</p>")
print("<h2>Full Environment:</h2>")
print("<ul>")
all_env = env_all()
all_keys = keys(all_env)
i = 0
while i < len(all_keys)
key = all_keys[i]
print("<li>" + key + "=" + all_env[key] + "</li>")
i = i + 1
print("</ul>")
print("</body></html>") print("</body></html>")

28
examples/env_all.fun Normal file
View file

@ -0,0 +1,28 @@
#!/usr/bin/env fun
/*
* This file is part of the Fun programming language.
* https://fun-lang.xyz/
*
* Copyright 2025 Johannes Findeisen <you@hanez.org>
* Licensed under the terms of the Apache-2.0 license.
* https://opensource.org/license/apache-2-0
*
* Added: 2025-12-28
*/
all_env = env_all()
keys = keys(all_env)
print("Number of environment variables: " + to_string(len(keys)))
print("--------------------------------------------------")
i = 0
while i < len(keys)
key = keys[i]
print(key + "=" + all_env[key])
i = i + 1
/* Possible output:
Depends on your environment.
*/

4
examples/version.fun Executable file
View file

@ -0,0 +1,4 @@
#!/usr/bin/env fun
print(to_string(fun_version()))

3
lib/net/http_server.fun
View file

@ -61,9 +61,8 @@ class HTTPServer(number port)
content = "" content = ""
if (str_ends_with(path, ".fun")) if (str_ends_with(path, ".fun"))
res = proc_run("fun " + full_path) res = proc_run("fun" + " " + full_path)
content = res["out"] content = res["out"]
//#include <\"full_path\">
else else
content = read_file(full_path) content = read_file(full_path)

2
src/bytecode.c
View file

@ -131,6 +131,8 @@ static const char *opcode_name(OpCode op) {
case OP_TIME_NOW_MS: return "TIME_NOW_MS"; case OP_TIME_NOW_MS: return "TIME_NOW_MS";
case OP_CLOCK_MONO_MS: return "CLOCK_MONO_MS"; case OP_CLOCK_MONO_MS: return "CLOCK_MONO_MS";
case OP_DATE_FORMAT: return "DATE_FORMAT"; case OP_DATE_FORMAT: return "DATE_FORMAT";
case OP_ENV_ALL: return "ENV_ALL";
case OP_FUN_VERSION: return "FUN_VERSION";
case OP_THREAD_SPAWN: return "THREAD_SPAWN"; case OP_THREAD_SPAWN: return "THREAD_SPAWN";
case OP_THREAD_JOIN: return "THREAD_JOIN"; case OP_THREAD_JOIN: return "THREAD_JOIN";
case OP_SLEEP_MS: return "SLEEP_MS"; case OP_SLEEP_MS: return "SLEEP_MS";

2
src/bytecode.h
View file

@ -126,6 +126,8 @@ typedef enum {
OP_TIME_NOW_MS, // pushes current wall-clock time in milliseconds since Unix epoch OP_TIME_NOW_MS, // pushes current wall-clock time in milliseconds since Unix epoch
OP_CLOCK_MONO_MS, // pushes monotonic clock in milliseconds (not wall time) OP_CLOCK_MONO_MS, // pushes monotonic clock in milliseconds (not wall time)
OP_DATE_FORMAT, // pops fmt string, ms epoch (int); pushes formatted date string using strftime OP_DATE_FORMAT, // pops fmt string, ms epoch (int); pushes formatted date string using strftime
OP_ENV_ALL, // pushes map of all environment variables
OP_FUN_VERSION, // pushes version string
// Threads // Threads
OP_THREAD_SPAWN, // operand: 0=no args, 1=has args; pops [args?], fn; pushes thread id (int>0) OP_THREAD_SPAWN, // operand: 0=no args, 1=has args; pops [args?], fn; pushes thread id (int>0)

4
src/fun.c
View file

@ -9,6 +9,7 @@
#include "parser.h" #include "parser.h"
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef FUN_WITH_REPL #ifdef FUN_WITH_REPL
@ -42,6 +43,9 @@ static void print_usage(const char *prog) {
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
/* Set FUN_EXECUTABLE environment variable to the path of this binary */
setenv("FUN_EXECUTABLE", argv[0], 1);
VM vm; VM vm;
vm_init(&vm); vm_init(&vm);

14
src/parser.c
View file

@ -757,6 +757,20 @@ static int emit_primary(Bytecode *bc, const char *src, size_t len, size_t *pos)
free(name); free(name);
return 1; return 1;
} }
if (strcmp(name, "env_all") == 0) {
(*pos)++; /* '(' */
if (!consume_char(src, len, pos, ')')) { parser_fail(*pos, "env_all expects ()"); free(name); return 0; }
bytecode_add_instruction(bc, OP_ENV_ALL, 0);
free(name);
return 1;
}
if (strcmp(name, "fun_version") == 0) {
(*pos)++; /* '(' */
if (!consume_char(src, len, pos, ')')) { parser_fail(*pos, "fun_version expects ()"); free(name); return 0; }
bytecode_add_instruction(bc, OP_FUN_VERSION, 0);
free(name);
return 1;
}
if (strcmp(name, "os_list_dir") == 0) { if (strcmp(name, "os_list_dir") == 0) {
(*pos)++; /* '(' */ (*pos)++; /* '(' */
if (!emit_expression(bc, src, len, pos)) { parser_fail(*pos, "os_list_dir expects (path)"); free(name); return 0; } if (!emit_expression(bc, src, len, pos)) { parser_fail(*pos, "os_list_dir expects (path)"); free(name); return 0; }

2
src/vm.c
View file

@ -667,6 +667,8 @@ void vm_run(VM *vm, Bytecode *entry) {
#include "vm/math/random_seed.c" #include "vm/math/random_seed.c"
#include "vm/os/env.c" #include "vm/os/env.c"
#include "vm/os/env_all.c"
#include "vm/os/fun_version.c"
#include "vm/os/sleep_ms.c" #include "vm/os/sleep_ms.c"
#include "vm/os/thread_join.c" #include "vm/os/thread_join.c"
#include "vm/os/thread_spawn.c" #include "vm/os/thread_spawn.c"

35
src/vm/os/env_all.c Normal file
View file

@ -0,0 +1,35 @@
/**
* This file is part of the Fun programming language.
* https://fun-lang.xyz/
*
* Copyright 2025 Johannes Findeisen <you@hanez.org>
* Licensed under the terms of the Apache-2.0 license.
* https://opensource.org/license/apache-2-0
*
* Added: 2025-12-28
*/
// Get all environment variables of the operation system and push them as a map.
case OP_ENV_ALL: {
extern char **environ;
Value m = make_map_empty();
if (environ) {
for (char **env = environ; *env; ++env) {
char *entry = *env;
char *equals = strchr(entry, '=');
if (equals) {
size_t key_len = equals - entry;
char *key = malloc(key_len + 1);
if (key) {
memcpy(key, entry, key_len);
key[key_len] = '\0';
map_set(&m, key, make_string(equals + 1));
free(key);
}
}
}
}
push_value(vm, m);
break;
}

20
src/vm/os/fun_version.c Normal file
View file

@ -0,0 +1,20 @@
/**
* This file is part of the Fun programming language.
* https://fun-lang.xyz/
*
* Copyright 2025 Johannes Findeisen <you@hanez.org>
* Licensed under the terms of the Apache-2.0 license.
* https://opensource.org/license/apache-2-0
*
* Added: 2025-12-28
*/
// Pushes the current Fun version string onto the stack.
case OP_FUN_VERSION: {
#ifndef FUN_VERSION
#define FUN_VERSION "0.0.0-dev"
#endif
push_value(vm, make_string(FUN_VERSION));
break;
}