kuroko: sync, necessary adjustments

klange · Dec 14, 2023 · 2005732 · 2005732
1 parent 6112ca0
commit 2005732
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/apps/bim.c b/apps/bim.c
@@ -285,7 +285,7 @@ static uint32_t state = 0;
 #define UTF8_ACCEPT 0
 #define UTF8_REJECT 1
 
-static inline uint32_t decode(uint32_t* state, uint32_t* codep, uint32_t byte) {
+static inline uint32_t decode(uint32_t* state, uint32_t* codep, unsigned char byte) {
 	static int state_table[32] = {
 		0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xxxxxxx */
 		1,1,1,1,1,1,1,1,                 /* 10xxxxxx */
@@ -11128,7 +11128,7 @@ void import_directory(char * dirName) {
 static void findBim(char * argv[]) {
 	/* Try asking /proc */
 	char * binpath = realpath("/proc/self/exe", NULL);
-	if (!binpath) {
+	if (!binpath || (access(binpath, X_OK) != 0)) {
 		if (strchr(argv[0], '/')) {
 			binpath = realpath(argv[0], NULL);
 		} else {
@@ -11466,6 +11466,23 @@ void initialize(void) {
 	krk_resetStack();
 
 	krk_startModule("<bim-syntax>");
+
+#ifdef __toaru__
+# define KUROKO_SEARCH_PATH "/lib/kuroko/"
+#else
+# define KUROKO_SEARCH_PATH "/usr/lib/kuroko/"
+#endif
+
+	/* Try to import the shared object 'os' module. If we can't,
+	 * try adjusting the module_paths to find it. */
+	krk_interpret(
+		"try:\n"
+		"   import os\n"
+		"except:\n"
+		"   import kuroko\n"
+		"   if '" KUROKO_SEARCH_PATH "' not in kuroko.module_paths:\n"
+		"       kuroko.module_paths.append('" KUROKO_SEARCH_PATH "')", "<bim-syntax>");
+
 	import_directory("syntax");
 	krk_startModule("<bim-themes>");
 	import_directory("themes");

diff --git a/build/aarch64.mk b/build/aarch64.mk
@@ -67,5 +67,5 @@ debug: system
 BUILD_KRK=$(TOOLCHAIN)/local/bin/kuroko
 $(TOOLCHAIN)/local/bin/kuroko: kuroko/src/*.c
 	mkdir -p $(TOOLCHAIN)/local/bin
-	cc -Ikuroko/src -DNO_RLINE -DKRK_STATIC_ONLY -DKRK_DISABLE_THREADS -o "${TOOLCHAIN}/local/bin/kuroko" kuroko/src/*.c
+	cc -Ikuroko/src -DKRK_BUNDLE_LIBS="BUNDLED(os);BUNDLED(fileio);" -DNO_RLINE -DKRK_STATIC_ONLY -DKRK_DISABLE_THREADS -o "${TOOLCHAIN}/local/bin/kuroko" kuroko/src/*.c kuroko/src/modules/module_os.c kuroko/src/modules/module_fileio.c
 
diff --git a/build/x86_64.mk b/build/x86_64.mk
@@ -105,7 +105,7 @@ fatbase/efi/boot/bootx64.efi: boot/efi64.so
 BUILD_KRK=$(TOOLCHAIN)/local/bin/kuroko
 $(TOOLCHAIN)/local/bin/kuroko: kuroko/src/*.c
 	mkdir -p $(TOOLCHAIN)/local/bin
-	cc -Ikuroko/src -DNO_RLINE -DKRK_STATIC_ONLY -DKRK_DISABLE_THREADS -o "${TOOLCHAIN}/local/bin/kuroko" kuroko/src/*.c
+	cc -Ikuroko/src -DKRK_BUNDLE_LIBS="BUNDLED(os);BUNDLED(fileio);" -DNO_RLINE -DKRK_STATIC_ONLY -DKRK_DISABLE_THREADS -o "${TOOLCHAIN}/local/bin/kuroko" kuroko/src/*.c kuroko/src/modules/module_os.c kuroko/src/modules/module_fileio.c
 
 image.iso: cdrom/fat.img cdrom/boot.sys boot/mbr.S util/update-extents.krk | $(BUILD_KRK)
 	xorriso -as mkisofs -R -J -c bootcat \

diff --git a/kuroko b/kuroko
+8 −1		Makefile
+0 −28		modules/dis.krk
+70 −31		src/builtins.c
+18 −4		src/compiler.c
+1 −317		src/debug.c
+11 −15		src/kuroko.c
+5 −0		src/kuroko/debug.h
+1 −0		src/kuroko/value.h
+3 −8		src/kuroko/vm.h
+0 −39		src/memory.c
+349 −0		src/modules/module_dis.c
+19 −13		src/modules/module_fileio.c
+41 −0		src/modules/module_gc.c
+1 −1		src/modules/module_math.c
+12 −63		src/modules/module_os.c
+1 −1		src/modules/module_random.c
+1 −1		src/modules/module_socket.c
+62 −0		src/modules/module_stat.c
+3 −4		src/modules/module_time.c
+1 −1		src/modules/module_timeit.c
+1 −1		src/modules/module_wcwidth.c
+38 −8		src/obj_str.c
+1 −0		src/opcodes.h
+25 −0		src/private.h
+5 −7		src/vm.c
+18 −0		test/testDecoratedRecursiveFunction.krk
+6 −0		test/testDecoratedRecursiveFunction.krk.expect
+0 −46		tools/args.c
+1 −1		tools/gendoc.krk