From 3d26296d06c4122c14408eb4e418903c1faec687 Mon Sep 17 00:00:00 2001
From: Liz3 <accs@liz3.net>
Date: Thu, 14 Nov 2024 00:51:02 +0100
Subject: [PATCH 01/13] feat: call dictu from native code

This uses a stack loaded piece of code to interrupt the current
vm execution in order to invoke a function called by native code.

It creates a new callframe for that and then makes sure the vm loop
breaks after that frame was reached again, this way the result is
returned tp the caller. It then resets the vm state and continues
normally.
---
 src/vm/datatypes/strings.c |  8 ++++++++
 src/vm/vm.c                | 32 +++++++++++++++++++++++++++++++-
 src/vm/vm.h                |  2 ++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/vm/datatypes/strings.c b/src/vm/datatypes/strings.c
index d4244068..0f983fcf 100644
--- a/src/vm/datatypes/strings.c
+++ b/src/vm/datatypes/strings.c
@@ -884,6 +884,13 @@ static Value isValidUtf8(DictuVM *vm, int argCount, Value *args) {
     return BOOL_VAL(string->character_len != -1);
 }
 
+static Value testThing(DictuVM *vm, int argCount, Value *args) {
+    int argC = argCount-1;
+    Value func = args[1];
+    Value* func_args = args +2;
+    return executeDirect(vm, func, argC, func_args);
+}
+
 void declareStringMethods(DictuVM *vm) {
     // Note(Liz3): We need functions from the c stdlib for iswalpha, iswlower,
     // iswupper(the utf8.c library functions do not work)
@@ -916,4 +923,5 @@ void declareStringMethods(DictuVM *vm) {
     defineNative(vm, &vm->stringMethods, "collapseSpaces",
                  collapseSpacesString);
     defineNative(vm, &vm->stringMethods, "wrap", wrapString);
+    defineNative(vm, &vm->stringMethods, "testThing", testThing);
 }
diff --git a/src/vm/vm.c b/src/vm/vm.c
index 3caef3d8..5ab16200 100644
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -27,6 +27,7 @@
 #include "datatypes/enums.h"
 #include "natives.h"
 #include "../optionals/optionals.h"
+#include "value.h"
 
 static void resetStack(DictuVM *vm) {
     vm->stackTop = vm->stack;
@@ -866,7 +867,9 @@ static void copyAnnotations(DictuVM *vm, ObjDict *superAnnotations, ObjDict *kla
     }
 }
 
-static DictuInterpretResult run(DictuVM *vm) {
+
+
+static DictuInterpretResult runWithBreakFrame(DictuVM *vm, int breakFrame) {
     CallFrame *frame = &vm->frames[vm->frameCount - 1];
     register uint8_t* ip = frame->ip;
 
@@ -877,6 +880,7 @@ static DictuInterpretResult run(DictuVM *vm) {
     #define READ_CONSTANT() \
                 (frame->closure->function->chunk.constants.values[READ_BYTE()])
 
+ 
     #define READ_STRING() AS_STRING(READ_CONSTANT())
 
     #define UNSUPPORTED_OPERAND_TYPE_ERROR(op)                                                      \
@@ -2253,6 +2257,7 @@ static DictuInterpretResult run(DictuVM *vm) {
         }
 
         CASE_CODE(RETURN): {
+
             Value result = pop(vm);
 
             // Close any upvalues still in scope.
@@ -2270,6 +2275,10 @@ static DictuInterpretResult run(DictuVM *vm) {
 
             frame = &vm->frames[vm->frameCount - 1];
             ip = frame->ip;
+            if (breakFrame != -1 && vm->frameCount == breakFrame) {
+                return INTERPRET_OK;
+            }
+
             DISPATCH();
         }
 
@@ -2435,6 +2444,9 @@ static DictuInterpretResult run(DictuVM *vm) {
 
     return INTERPRET_RUNTIME_ERROR;
 }
+static DictuInterpretResult run(DictuVM *vm) {
+    return runWithBreakFrame(vm, -1);
+}
 
 DictuInterpretResult dictuInterpret(DictuVM *vm, char *moduleName, char *source) {
     ObjString *name = copyString(vm, moduleName, strlen(moduleName));
@@ -2457,3 +2469,21 @@ DictuInterpretResult dictuInterpret(DictuVM *vm, char *moduleName, char *source)
 
     return result;
 }
+Value executeDirect(DictuVM* vm, Value function, int argCount, Value* args) {
+    if(!IS_FUNCTION(function) && !IS_CLOSURE(function))
+        return NIL_VAL;
+    int currentFrameCount = vm->frameCount;
+    Value* currentStack = vm->stackTop;
+    CallFrame *frame = &vm->frames[vm->frameCount++];
+    uint8_t code[4] = {OP_CALL, argCount, 0, OP_RETURN};
+    frame->ip = code;
+    push(vm, function);
+    for(int i = argCount -1; i >= 0; i--) {
+        push(vm, args[i]);
+    }
+    runWithBreakFrame(vm, currentFrameCount+1);
+    Value v = pop(vm);
+    vm->stackTop = currentStack;
+    vm->frameCount--;
+    return v;
+}
\ No newline at end of file
diff --git a/src/vm/vm.h b/src/vm/vm.h
index 9bc63e2f..0468873b 100644
--- a/src/vm/vm.h
+++ b/src/vm/vm.h
@@ -69,4 +69,6 @@ bool isFalsey(Value value);
 
 ObjClosure *compileModuleToClosure(DictuVM *vm, char *name, char *source);
 
+Value executeDirect(DictuVM* vm, Value function, int argCount, Value* args);
+
 #endif

From 70d10835b04e5cb909e4ae17e4d7badca1842289 Mon Sep 17 00:00:00 2001
From: Liz3 <accs@liz3.net>
Date: Thu, 14 Nov 2024 01:51:59 +0100
Subject: [PATCH 02/13] fix: rename and add entry for ffi

---
 src/include/dictu_ffi_include.h | 11 +++++++++--
 src/optionals/ffi/ffi.c         |  3 ++-
 src/optionals/ffi/ffi.h         |  2 +-
 src/vm/datatypes/strings.c      |  2 +-
 src/vm/vm.c                     |  2 +-
 src/vm/vm.h                     |  2 +-
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/include/dictu_ffi_include.h b/src/include/dictu_ffi_include.h
index abefa144..7763834b 100644
--- a/src/include/dictu_ffi_include.h
+++ b/src/include/dictu_ffi_include.h
@@ -11,7 +11,7 @@ extern "C" {
 
 // This is used ti determine if we can safely load the function pointers without
 // UB.
-#define FFI_MOD_API_VERSION 2
+#define FFI_MOD_API_VERSION 3
 
 #define UNUSED(__x__) (void)__x__
 
@@ -343,7 +343,7 @@ struct _vm {
 };
 
 #define DICTU_MAJOR_VERSION "0"
-#define DICTU_MINOR_VERSION "29"
+#define DICTU_MINOR_VERSION "30"
 #define DICTU_PATCH_VERSION "0"
 
 #define DICTU_STRING_VERSION                                                   \
@@ -364,6 +364,7 @@ struct sObjString {
     int length;
     char *chars;
     uint32_t hash;
+    int character_len;
 };
 
 struct sObjList {
@@ -550,6 +551,9 @@ typedef void defineNative_t(DictuVM *vm, Table *table, const char *name,
 
 typedef void defineNativeProperty_t(DictuVM *vm, Table *table, const char *name,
                                     Value value);
+
+typedef Value callFunction_t(DictuVM* vm, Value function, int argCount, Value* args);
+
 reallocate_t * reallocate = NULL;
 
 copyString_t *copyString = NULL;
@@ -616,6 +620,8 @@ defineNative_t *defineNative = NULL;
 
 defineNativeProperty_t *defineNativeProperty = NULL;
 
+callFunction_t *callFunction = NULL;
+
 // This needs to be implemented by the user and register all functions
 int dictu_ffi_init(DictuVM *vm, Table *method_table);
 
@@ -665,6 +671,7 @@ int dictu_internal_ffi_init(void **function_ptrs, DictuVM *vm,
     defineNative = (defineNative_t *)function_ptrs[count++];
     defineNativeProperty = (defineNativeProperty_t *)function_ptrs[count++];
     reallocate = (reallocate_t *)function_ptrs[count++];
+    callFunction = (callFunction_t *)function_ptrs[count++];
     int initResult = dictu_ffi_init(vm, methodTable);
     if (initResult > 0)
         return 3 + initResult;
diff --git a/src/optionals/ffi/ffi.c b/src/optionals/ffi/ffi.c
index 90adec19..d9d00113 100644
--- a/src/optionals/ffi/ffi.c
+++ b/src/optionals/ffi/ffi.c
@@ -53,7 +53,8 @@ void *ffi_function_pointers[] = {&copyString,
                                  &compareStringGreater,
                                  &defineNative,
                                  &defineNativeProperty,
-                                 &reallocate};
+                                 &reallocate,
+                                 &callFunction};
 
 void freeFFI(DictuVM *vm, ObjAbstract *abstract) {
     FFIInstance *instance = (FFIInstance *)abstract->data;
diff --git a/src/optionals/ffi/ffi.h b/src/optionals/ffi/ffi.h
index 245ebcb6..7b1de964 100644
--- a/src/optionals/ffi/ffi.h
+++ b/src/optionals/ffi/ffi.h
@@ -19,7 +19,7 @@
 
 // This is used to determine if we can safely load the function pointers without UB,
 // if this is greater then the version from the mod we error in the internal mod load function.
-#define DICTU_FFI_API_VERSION 2
+#define DICTU_FFI_API_VERSION 3
 
 
 Value createFFIModule(DictuVM *vm);
diff --git a/src/vm/datatypes/strings.c b/src/vm/datatypes/strings.c
index 0f983fcf..3d724594 100644
--- a/src/vm/datatypes/strings.c
+++ b/src/vm/datatypes/strings.c
@@ -888,7 +888,7 @@ static Value testThing(DictuVM *vm, int argCount, Value *args) {
     int argC = argCount-1;
     Value func = args[1];
     Value* func_args = args +2;
-    return executeDirect(vm, func, argC, func_args);
+    return callFunction(vm, func, argC, func_args);
 }
 
 void declareStringMethods(DictuVM *vm) {
diff --git a/src/vm/vm.c b/src/vm/vm.c
index 5ab16200..59919d5e 100644
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -2469,7 +2469,7 @@ DictuInterpretResult dictuInterpret(DictuVM *vm, char *moduleName, char *source)
 
     return result;
 }
-Value executeDirect(DictuVM* vm, Value function, int argCount, Value* args) {
+Value callFunction(DictuVM* vm, Value function, int argCount, Value* args) {
     if(!IS_FUNCTION(function) && !IS_CLOSURE(function))
         return NIL_VAL;
     int currentFrameCount = vm->frameCount;
diff --git a/src/vm/vm.h b/src/vm/vm.h
index 0468873b..74e7cb36 100644
--- a/src/vm/vm.h
+++ b/src/vm/vm.h
@@ -69,6 +69,6 @@ bool isFalsey(Value value);
 
 ObjClosure *compileModuleToClosure(DictuVM *vm, char *name, char *source);
 
-Value executeDirect(DictuVM* vm, Value function, int argCount, Value* args);
+Value callFunction(DictuVM* vm, Value function, int argCount, Value* args);
 
 #endif

From 5415b63b7c5f71952752fed0f7c92f57256ff930 Mon Sep 17 00:00:00 2001
From: Liz3 <accs@liz3.net>
Date: Thu, 14 Nov 2024 02:35:19 +0100
Subject: [PATCH 03/13] fix: address comments

---
 src/vm/vm.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/vm/vm.c b/src/vm/vm.c
index 59919d5e..9b93c371 100644
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -2470,10 +2470,19 @@ DictuInterpretResult dictuInterpret(DictuVM *vm, char *moduleName, char *source)
     return result;
 }
 Value callFunction(DictuVM* vm, Value function, int argCount, Value* args) {
-    if(!IS_FUNCTION(function) && !IS_CLOSURE(function))
-        return NIL_VAL;
+
+    if(!IS_FUNCTION(function) && !IS_CLOSURE(function)){
+        runtimeError(vm, "Value passed to callFunction is not callable");
+        return EMPTY_VAL;
+    }
     int currentFrameCount = vm->frameCount;
     Value* currentStack = vm->stackTop;
+    if (vm->frameCount == vm->frameCapacity) {
+        int oldCapacity = vm->frameCapacity;
+        vm->frameCapacity = GROW_CAPACITY(vm->frameCapacity);
+        vm->frames = GROW_ARRAY(vm, vm->frames, CallFrame,
+                                   oldCapacity, vm->frameCapacity);
+    }
     CallFrame *frame = &vm->frames[vm->frameCount++];
     uint8_t code[4] = {OP_CALL, argCount, 0, OP_RETURN};
     frame->ip = code;
@@ -2481,7 +2490,10 @@ Value callFunction(DictuVM* vm, Value function, int argCount, Value* args) {
     for(int i = argCount -1; i >= 0; i--) {
         push(vm, args[i]);
     }
-    runWithBreakFrame(vm, currentFrameCount+1);
+    DictuInterpretResult result = runWithBreakFrame(vm, currentFrameCount+1);
+    if(result != INTERPRET_OK) {
+        exit(70);
+    }
     Value v = pop(vm);
     vm->stackTop = currentStack;
     vm->frameCount--;

From 9d7354074e25cee6a378644c054dea5883ee0b58 Mon Sep 17 00:00:00 2001
From: Liz3 <accs@liz3.net>
Date: Thu, 14 Nov 2024 02:40:09 +0100
Subject: [PATCH 04/13] add native handler

---
 src/vm/vm.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vm/vm.c b/src/vm/vm.c
index 9b93c371..2383e925 100644
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -2472,6 +2472,10 @@ DictuInterpretResult dictuInterpret(DictuVM *vm, char *moduleName, char *source)
 Value callFunction(DictuVM* vm, Value function, int argCount, Value* args) {
 
     if(!IS_FUNCTION(function) && !IS_CLOSURE(function)){
+        if(IS_NATIVE(function)) {
+            NativeFn native = AS_NATIVE(function);
+            return native(vm, argCount, args);
+        }
         runtimeError(vm, "Value passed to callFunction is not callable");
         return EMPTY_VAL;
     }

From 285e4d0a73d970cc36265bd166657274cee0109b Mon Sep 17 00:00:00 2001
From: Liz3 <accs@liz3.net>
Date: Thu, 14 Nov 2024 02:54:59 +0100
Subject: [PATCH 05/13] this is not reversed

---
 src/vm/vm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vm/vm.c b/src/vm/vm.c
index 2383e925..9685a599 100644
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -2491,7 +2491,7 @@ Value callFunction(DictuVM* vm, Value function, int argCount, Value* args) {
     uint8_t code[4] = {OP_CALL, argCount, 0, OP_RETURN};
     frame->ip = code;
     push(vm, function);
-    for(int i = argCount -1; i >= 0; i--) {
+    for(int i = 0; i < argCount; i++) {
         push(vm, args[i]);
     }
     DictuInterpretResult result = runWithBreakFrame(vm, currentFrameCount+1);

From 7f3c8399a3af4500f99d1d713966768340cdf939 Mon Sep 17 00:00:00 2001
From: Liz3 <accs@liz3.net>
Date: Thu, 14 Nov 2024 05:13:30 +0100
Subject: [PATCH 06/13] add tests for callback based ffi entries

---
 .github/workflows/main.yml                    |  12 +++++
 .../clangd/index/lib.c.E0B4FF22A3F07B5C.idx   | Bin 0 -> 1438 bytes
 examples/ffi-example/src/lib.c                |   8 ++++
 tests/ffi/ffi.du                              |  43 ++++++++++++++++--
 tests/ffi/libs/test-lib.dll                   | Bin 10240 -> 0 bytes
 tests/ffi/libs/test-lib.so                    | Bin 16352 -> 0 bytes
 tests/ffi/libs/test-lib_64.dylib              | Bin 18240 -> 0 bytes
 tests/ffi/libs/test-lib_arm.dylib             | Bin 18512 -> 0 bytes
 8 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 examples/ffi-example/.cache/clangd/index/lib.c.E0B4FF22A3F07B5C.idx
 delete mode 100644 tests/ffi/libs/test-lib.dll
 delete mode 100755 tests/ffi/libs/test-lib.so
 delete mode 100755 tests/ffi/libs/test-lib_64.dylib
 delete mode 100755 tests/ffi/libs/test-lib_arm.dylib

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9bdf2d00..f2231647 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,6 +30,10 @@ jobs:
       - uses: actions/checkout@v3
       - name: Make dictu and run tests (No HTTP)
         run: |
+          cd examples/ffi-example
+          cmake -DCMAKE_BUILD_TYPE=Debug -B ./build
+          cmake --build ./build
+          cd ../..
           cmake -DCMAKE_BUILD_TYPE=Debug -DDISABLE_HTTP=1 -B ./build
           cmake --build ./build
           ./dictu tests/runTests.du ci | tee /dev/stderr | grep -q 'Total bytes lost: 0'
@@ -54,6 +58,10 @@ jobs:
       - uses: actions/checkout@v3
       - name: Make dictu and run tests (No HTTP)
         run: |
+          cd examples/ffi-example
+          cmake -DCMAKE_BUILD_TYPE=Debug -B ./build
+          cmake --build ./build
+          cd ../..
           cmake -DCMAKE_BUILD_TYPE=Debug -DDISABLE_HTTP=1 -B ./build
           cmake --build ./build
           ./dictu tests/runTests.du ci | tee /dev/stderr | grep -q 'Total bytes lost: 0'
@@ -76,6 +84,10 @@ jobs:
       - uses: actions/checkout@v3
       - name: Make dictu and run tests (No HTTP)
         run: |
+          cd examples\ffi-example
+          cmake -DCMAKE_BUILD_TYPE=Debug -B .\build
+          cmake --build ./build --config Debug
+          cd ..\..
           cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_SYSTEM_VERSION="10.0.18362.0" -DCICD=1 -DDISABLE_HTTP=1 -B build
           cmake --build build
           Debug\dictu.exe tests/runTests.du ci
diff --git a/examples/ffi-example/.cache/clangd/index/lib.c.E0B4FF22A3F07B5C.idx b/examples/ffi-example/.cache/clangd/index/lib.c.E0B4FF22A3F07B5C.idx
new file mode 100644
index 0000000000000000000000000000000000000000..8bc6e94e5c22fd968242909c57f98fe2308eab5b
GIT binary patch
literal 1438
zcmWIYbaR`=%D~{9;#rZKT9U}Zz`!63#Kk2=nGTE$46~US7%Jw>o#^k)Y$$N_`Qj%R
zoTF#)t`?7cu`=|<!iX&$+fyf>d3P*L_@sQG_x|0pSM3mS)Ozx%t@8cf83!u1obO&L
zq-eM1<d>z^XHI0)2j*z6o9JWBvvz8#$18)zj|qitbvI`+EOnS(y7p9q-IVM7vv2Qy
zYkNU7JGb3u^>^=Wh2J<`KfIZ7?8DYq^GvI*?S3&mA#&Qh@+M8?k|`V^3~S9-vtD3Z
z!TRdL?H4RTEAPy4egCWAT+2G2!=JPl*qx|MPMUXk=2aUl-SeiZm-g8U7q~n;RkP?o
zQtaCgZnf{1uTHW3*sr*GL+(^{w!kVOorfMFr`}v(nbNX<;svEnIoXvxDtyvUorR(%
zTS*B{F_m-K$TaiEsgj!15Q!64s+7Dh{;pIlTV5<LbHz6Q;EnzHAC}jD*qGx{J10d~
zL-+x+N$gAg;>z5l24Hyhgw2?==Jhjn9tKec1~D!+E(tIJlmUa<(8*_}@3<nu0}6aG
zCN?G!FaeXkaK%yg(*s`#9tI(xv?z<HkoZRymX9n#44h1i0uq9Z;;e^QU(Bv;XLsXa
z5CJOTW8;$r6EG8sQqzhHm=W$^;zF^XM@-yA+zn>Ul?zP@?;~{hnOMZQxw(a4Zf6mb
z=8)!xDS|l}XcEZ1FpGG^#7xATV2WTgBNy1!FhyH$|5<j8RZo_YM@&>fR28P`$j5@>
z%eE4V+&p4T3{0#r8-P3mCQ}%XMT~`?MGVH{5#wUuVuiU7$TQ)xgz->a&m+diz=sGX
zF+NK^J6NExhzaluh{1R~VuCD!oG>1$uN#-2JDGlIqX{r**!bBbV9sC>W9Mgw^I%$m
zK?8~in6G)nBrGKYV4gi=m~I!+Ho=P-7-CFfd@x~POfZQf@g$fe;JiXj*EzQuG<{is
zAtK5o1G60HYe_Bzn6H8Ul;cx{IRO~J!lF_z!|#RaUwM8rD1nIw?0SU5K(2@JdRIOW
zm%9741gHoU`!Hc1aO}f)-4VL8kJ&722F9Qew~#o@x)1UEm*;)>-T@Tm;N}1(bqLTq
zsx7tb*}F+>EMm-(%t|na19=9_mIxkl#G*zXY6PK1Nk`fI+bZ)KrUUJiWRetv`L!zT
zk<xJ=iM=3i2y@FKf=60F8Xh28ci&9nx_0{>P!Y&sF!us^K!?G2yUwk0KDq1u3!oy9
z3t_@M;6wxC{fJErcfYsiHzNz!=P*wdrRF4ploS^w7mEXFMlqIUf4y=N7qT&mGk^r3
aAUQWBhY!f+;o)Op<=|%L<Y(hz<^=$#=+nUf

literal 0
HcmV?d00001

diff --git a/examples/ffi-example/src/lib.c b/examples/ffi-example/src/lib.c
index 7144927a..17cac396 100644
--- a/examples/ffi-example/src/lib.c
+++ b/examples/ffi-example/src/lib.c
@@ -12,9 +12,17 @@ Value dictu_ffi_test_str(DictuVM *vm, int argCount, Value *args) {
     return OBJ_VAL(copyString(vm, "Hello From Dictu FFI module!", 28));
 }
 
+Value dictu_ffi_test_callback(DictuVM *vm, int argCount, Value *args) {
+    if(argCount < 1)
+        return NIL_VAL;
+    Value* funcs = args+1;
+    return callFunction(vm, args[0], argCount-1, funcs);
+}
+
 int dictu_ffi_init(DictuVM *vm, Table *method_table) {
   defineNative(vm, method_table, "dictuFFITestAdd", dictu_ffi_test);
   defineNative(vm, method_table, "dictuFFITestStr", dictu_ffi_test_str);
+  defineNative(vm, method_table, "dictuFFITestCallback", dictu_ffi_test_callback);
   defineNativeProperty(
     vm, method_table, "test",
         OBJ_VAL(copyString(vm, "Dictu!", 6)));
diff --git a/tests/ffi/ffi.du b/tests/ffi/ffi.du
index a072f0d4..de8b4799 100644
--- a/tests/ffi/ffi.du
+++ b/tests/ffi/ffi.du
@@ -38,18 +38,51 @@ import FFI;
 import Path;
 
 class TestFFIModule < UnitTest {
+    var mod = nil;
+    doSetup() {
+        if(this.mod != nil)
+            return;
+        const parts = ["examples", "ffi-example", "build"];
+        if(System.platform == "windows"){
+            parts.push("Debug");
+            parts.push("ffi-test.dll");
+        } else {
+            parts.push("libffi-test{}".format(FFI.suffix));
+        }
+
+        const path = Path.join(parts);
+        this.mod = FFI.load(path);
+    }
     testFFIModule() {
-        const path = Path.join(Path.dirname(__file__), "libs", "test-lib{}{}".format(
-            System.platform == "darwin" ? System.arch == "x86_64" ? "_64" : "_arm" : "",
-            FFI.suffix
-        ));
-        const mod = FFI.load(path);
+        this.doSetup();
+        const mod = this.mod;
         this.assertEquals(mod.test, "Dictu!");
         for(var i = 0; i < 40; i+=2) {
             this.assertEquals(mod.dictuFFITestAdd(i, i), i+i);
         }
         this.assertEquals(mod.dictuFFITestStr(), "Hello From Dictu FFI module!");
     }
+    testFFIModuleCallback() {
+        this.doSetup();
+        const mod = this.mod;
+        var count = 0;
+        const list = [];
+        def callback(value){
+            count += value;
+            list.push(value);
+            return value * value;
+        }
+        def greet(name) {
+            return "Hello, {}!".format(name);
+        }
+        for(var i = 0; i < 5; i+=1){
+            this.assertEquals(mod.dictuFFITestCallback(callback, i * i), i * i * i * i);
+        }
+        // 1, 4, 9, 16
+        this.assertEquals(list, [0,1,4,9,16]);
+        this.assertEquals(count,  1 + 4 + 9 + 16);
+        this.assertEquals(mod.dictuFFITestCallback(greet, "World"), "Hello, World!");
+    }
 }
 
 TestFFIModule().run();
diff --git a/tests/ffi/libs/test-lib.dll b/tests/ffi/libs/test-lib.dll
deleted file mode 100644
index e1f14b941919635185c0d354631cc415fc5b4335..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10240
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

diff --git a/tests/ffi/libs/test-lib.so b/tests/ffi/libs/test-lib.so
deleted file mode 100755
index cce02b91b9d78cf94dc80395fd148111624e3b29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16352
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
I7#L0QAI0W%<NyEw

diff --git a/tests/ffi/libs/test-lib_64.dylib b/tests/ffi/libs/test-lib_64.dylib
deleted file mode 100755
index 84887d6be51b7e867e098ba80eed35f78f17d9d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18240
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
a6?93mve)OA(0{*QB)jAn2g^zwqW=INR)%5#

diff --git a/tests/ffi/libs/test-lib_arm.dylib b/tests/ffi/libs/test-lib_arm.dylib
deleted file mode 100755
index 082eceff59ea38fcb832acc7a6d93fedcfc37e4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18512
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
PYYr^i`O3sy(*XYfmQ|Rj


From 9b16ab0c0503ad288bde4a3d7a80e34d15057e97 Mon Sep 17 00:00:00 2001
From: Liz3 <accs@liz3.net>
Date: Thu, 14 Nov 2024 05:14:38 +0100
Subject: [PATCH 07/13] fix: remove dummy function

---
 src/vm/datatypes/strings.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/vm/datatypes/strings.c b/src/vm/datatypes/strings.c
index 3d724594..622f57be 100644
--- a/src/vm/datatypes/strings.c
+++ b/src/vm/datatypes/strings.c
@@ -884,12 +884,6 @@ static Value isValidUtf8(DictuVM *vm, int argCount, Value *args) {
     return BOOL_VAL(string->character_len != -1);
 }
 
-static Value testThing(DictuVM *vm, int argCount, Value *args) {
-    int argC = argCount-1;
-    Value func = args[1];
-    Value* func_args = args +2;
-    return callFunction(vm, func, argC, func_args);
-}
 
 void declareStringMethods(DictuVM *vm) {
     // Note(Liz3): We need functions from the c stdlib for iswalpha, iswlower,
@@ -923,5 +917,4 @@ void declareStringMethods(DictuVM *vm) {
     defineNative(vm, &vm->stringMethods, "collapseSpaces",
                  collapseSpacesString);
     defineNative(vm, &vm->stringMethods, "wrap", wrapString);
-    defineNative(vm, &vm->stringMethods, "testThing", testThing);
 }

From b07a8236625530e7658fdf9ffc481b3369612998 Mon Sep 17 00:00:00 2001
From: Liz3 <accs@liz3.net>
Date: Thu, 14 Nov 2024 05:17:32 +0100
Subject: [PATCH 08/13] remove clangd file

---
 .gitignore                                       |   1 +
 .../clangd/index/lib.c.E0B4FF22A3F07B5C.idx      | Bin 1438 -> 0 bytes
 2 files changed, 1 insertion(+)
 delete mode 100644 examples/ffi-example/.cache/clangd/index/lib.c.E0B4FF22A3F07B5C.idx

diff --git a/.gitignore b/.gitignore
index 67cd9090..9c22668e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 \.idea/
+.cache
 build/
 \.DS_Store
 dictu
diff --git a/examples/ffi-example/.cache/clangd/index/lib.c.E0B4FF22A3F07B5C.idx b/examples/ffi-example/.cache/clangd/index/lib.c.E0B4FF22A3F07B5C.idx
deleted file mode 100644
index 8bc6e94e5c22fd968242909c57f98fe2308eab5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1438
zcmWIYbaR`=%D~{9;#rZKT9U}Zz`!63#Kk2=nGTE$46~US7%Jw>o#^k)Y$$N_`Qj%R
zoTF#)t`?7cu`=|<!iX&$+fyf>d3P*L_@sQG_x|0pSM3mS)Ozx%t@8cf83!u1obO&L
zq-eM1<d>z^XHI0)2j*z6o9JWBvvz8#$18)zj|qitbvI`+EOnS(y7p9q-IVM7vv2Qy
zYkNU7JGb3u^>^=Wh2J<`KfIZ7?8DYq^GvI*?S3&mA#&Qh@+M8?k|`V^3~S9-vtD3Z
z!TRdL?H4RTEAPy4egCWAT+2G2!=JPl*qx|MPMUXk=2aUl-SeiZm-g8U7q~n;RkP?o
zQtaCgZnf{1uTHW3*sr*GL+(^{w!kVOorfMFr`}v(nbNX<;svEnIoXvxDtyvUorR(%
zTS*B{F_m-K$TaiEsgj!15Q!64s+7Dh{;pIlTV5<LbHz6Q;EnzHAC}jD*qGx{J10d~
zL-+x+N$gAg;>z5l24Hyhgw2?==Jhjn9tKec1~D!+E(tIJlmUa<(8*_}@3<nu0}6aG
zCN?G!FaeXkaK%yg(*s`#9tI(xv?z<HkoZRymX9n#44h1i0uq9Z;;e^QU(Bv;XLsXa
z5CJOTW8;$r6EG8sQqzhHm=W$^;zF^XM@-yA+zn>Ul?zP@?;~{hnOMZQxw(a4Zf6mb
z=8)!xDS|l}XcEZ1FpGG^#7xATV2WTgBNy1!FhyH$|5<j8RZo_YM@&>fR28P`$j5@>
z%eE4V+&p4T3{0#r8-P3mCQ}%XMT~`?MGVH{5#wUuVuiU7$TQ)xgz->a&m+diz=sGX
zF+NK^J6NExhzaluh{1R~VuCD!oG>1$uN#-2JDGlIqX{r**!bBbV9sC>W9Mgw^I%$m
zK?8~in6G)nBrGKYV4gi=m~I!+Ho=P-7-CFfd@x~POfZQf@g$fe;JiXj*EzQuG<{is
zAtK5o1G60HYe_Bzn6H8Ul;cx{IRO~J!lF_z!|#RaUwM8rD1nIw?0SU5K(2@JdRIOW
zm%9741gHoU`!Hc1aO}f)-4VL8kJ&722F9Qew~#o@x)1UEm*;)>-T@Tm;N}1(bqLTq
zsx7tb*}F+>EMm-(%t|na19=9_mIxkl#G*zXY6PK1Nk`fI+bZ)KrUUJiWRetv`L!zT
zk<xJ=iM=3i2y@FKf=60F8Xh28ci&9nx_0{>P!Y&sF!us^K!?G2yUwk0KDq1u3!oy9
z3t_@M;6wxC{fJErcfYsiHzNz!=P*wdrRF4ploS^w7mEXFMlqIUf4y=N7qT&mGk^r3
aAUQWBhY!f+;o)Op<=|%L<Y(hz<^=$#=+nUf


From da8129f793d748f2c1876a719e6afef6ab3298aa Mon Sep 17 00:00:00 2001
From: Liz3 <accs@liz3.net>
Date: Fri, 15 Nov 2024 00:55:41 +0100
Subject: [PATCH 09/13] fix: add error handling for sythentic call frame

---
 src/vm/vm.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/vm/vm.c b/src/vm/vm.c
index 9685a599..782f1f42 100644
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -59,21 +59,25 @@ void runtimeError(DictuVM *vm, const char *format, ...) {
     for (int i = vm->frameCount - 1; i >= 0; i--) {
         CallFrame *frame = &vm->frames[i];
 
-        ObjFunction *function = frame->closure->function;
+        if(frame->closure == NULL) {
+            // synthetic frame created by callFunction
+            log_error("Function <native> {reset}");
+        } else {
+             ObjFunction *function = frame->closure->function;
 
-        // -1 because the IP is sitting on the next instruction to be
-        // executed.
-        size_t instruction = frame->ip - function->chunk.code - 1;
+            // -1 because the IP is sitting on the next instruction to be
+            // executed.
+            size_t instruction = frame->ip - function->chunk.code - 1;
 
-        if (function->name == NULL) {
-            log_error("File '%s', {bold}line %d{reset}", function->module->name->chars, function->chunk.lines[instruction]);
-            i = -1;
-        } else {
-            log_error("Function '%s' in '%s', {bold}line %d{reset}", function->name->chars, function->module->name->chars, function->chunk.lines[instruction]);
-        }
+            if (function->name == NULL) {
+                log_error("File '%s', {bold}line %d{reset}", function->module->name->chars, function->chunk.lines[instruction]);
+                i = -1;
+            } else {
+                log_error("Function '%s' in '%s', {bold}line %d{reset}", function->name->chars, function->module->name->chars, function->chunk.lines[instruction]);
+            }
 
+        }
         log_pad("");
-
         va_list args;
         va_start(args, format);
         vfprintf(stderr, format, args);
@@ -2490,6 +2494,7 @@ Value callFunction(DictuVM* vm, Value function, int argCount, Value* args) {
     CallFrame *frame = &vm->frames[vm->frameCount++];
     uint8_t code[4] = {OP_CALL, argCount, 0, OP_RETURN};
     frame->ip = code;
+    frame->closure = NULL;
     push(vm, function);
     for(int i = 0; i < argCount; i++) {
         push(vm, args[i]);

From a6f331a450fbfad8f0e15614dae7a9aed8ecb612 Mon Sep 17 00:00:00 2001
From: Liz3 <accs@liz3.net>
Date: Fri, 15 Nov 2024 02:05:10 +0100
Subject: [PATCH 10/13] fix: continue on synthetic frame

---
 src/vm/vm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vm/vm.c b/src/vm/vm.c
index 782f1f42..0a3eb2ca 100644
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -61,7 +61,7 @@ void runtimeError(DictuVM *vm, const char *format, ...) {
 
         if(frame->closure == NULL) {
             // synthetic frame created by callFunction
-            log_error("Function <native> {reset}");
+            continue;
         } else {
              ObjFunction *function = frame->closure->function;
 

From 69e10a4a7ec662326813c02a703fb05cdf99010a Mon Sep 17 00:00:00 2001
From: Liz3 <accs@liz3.net>
Date: Fri, 15 Nov 2024 02:22:26 +0100
Subject: [PATCH 11/13] fix: remove unneeded changes

---
 src/vm/datatypes/strings.c |  1 -
 src/vm/vm.c                | 28 ++++++++++++----------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/vm/datatypes/strings.c b/src/vm/datatypes/strings.c
index 622f57be..d4244068 100644
--- a/src/vm/datatypes/strings.c
+++ b/src/vm/datatypes/strings.c
@@ -884,7 +884,6 @@ static Value isValidUtf8(DictuVM *vm, int argCount, Value *args) {
     return BOOL_VAL(string->character_len != -1);
 }
 
-
 void declareStringMethods(DictuVM *vm) {
     // Note(Liz3): We need functions from the c stdlib for iswalpha, iswlower,
     // iswupper(the utf8.c library functions do not work)
diff --git a/src/vm/vm.c b/src/vm/vm.c
index 0a3eb2ca..2e57dc4d 100644
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -62,21 +62,20 @@ void runtimeError(DictuVM *vm, const char *format, ...) {
         if(frame->closure == NULL) {
             // synthetic frame created by callFunction
             continue;
-        } else {
-             ObjFunction *function = frame->closure->function;
+        } 
+        ObjFunction *function = frame->closure->function;
 
-            // -1 because the IP is sitting on the next instruction to be
-            // executed.
-            size_t instruction = frame->ip - function->chunk.code - 1;
-
-            if (function->name == NULL) {
-                log_error("File '%s', {bold}line %d{reset}", function->module->name->chars, function->chunk.lines[instruction]);
-                i = -1;
-            } else {
-                log_error("Function '%s' in '%s', {bold}line %d{reset}", function->name->chars, function->module->name->chars, function->chunk.lines[instruction]);
-            }
+        // -1 because the IP is sitting on the next instruction to be
+        // executed.
+        size_t instruction = frame->ip - function->chunk.code - 1;
 
+        if (function->name == NULL) {
+            log_error("File '%s', {bold}line %d{reset}", function->module->name->chars, function->chunk.lines[instruction]);
+            i = -1;
+        } else {
+            log_error("Function '%s' in '%s', {bold}line %d{reset}", function->name->chars, function->module->name->chars, function->chunk.lines[instruction]);
         }
+
         log_pad("");
         va_list args;
         va_start(args, format);
@@ -884,7 +883,6 @@ static DictuInterpretResult runWithBreakFrame(DictuVM *vm, int breakFrame) {
     #define READ_CONSTANT() \
                 (frame->closure->function->chunk.constants.values[READ_BYTE()])
 
- 
     #define READ_STRING() AS_STRING(READ_CONSTANT())
 
     #define UNSUPPORTED_OPERAND_TYPE_ERROR(op)                                                      \
@@ -2261,7 +2259,6 @@ static DictuInterpretResult runWithBreakFrame(DictuVM *vm, int breakFrame) {
         }
 
         CASE_CODE(RETURN): {
-
             Value result = pop(vm);
 
             // Close any upvalues still in scope.
@@ -2474,7 +2471,6 @@ DictuInterpretResult dictuInterpret(DictuVM *vm, char *moduleName, char *source)
     return result;
 }
 Value callFunction(DictuVM* vm, Value function, int argCount, Value* args) {
-
     if(!IS_FUNCTION(function) && !IS_CLOSURE(function)){
         if(IS_NATIVE(function)) {
             NativeFn native = AS_NATIVE(function);
@@ -2507,4 +2503,4 @@ Value callFunction(DictuVM* vm, Value function, int argCount, Value* args) {
     vm->stackTop = currentStack;
     vm->frameCount--;
     return v;
-}
\ No newline at end of file
+}

From 4391dd47a9472b439afb3e8b73d0c8ae2e751814 Mon Sep 17 00:00:00 2001
From: Liz3 <accs@liz3.net>
Date: Fri, 15 Nov 2024 02:24:31 +0100
Subject: [PATCH 12/13] fix: remove useless change

---
 src/vm/vm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vm/vm.c b/src/vm/vm.c
index 2e57dc4d..d11ae39c 100644
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -77,6 +77,7 @@ void runtimeError(DictuVM *vm, const char *format, ...) {
         }
 
         log_pad("");
+
         va_list args;
         va_start(args, format);
         vfprintf(stderr, format, args);

From 1a6764ac4631f9e0307ac4cba10efb4543da138c Mon Sep 17 00:00:00 2001
From: Liz3 <accs@liz3.net>
Date: Fri, 15 Nov 2024 21:16:32 +0100
Subject: [PATCH 13/13] use unit tests: setUp

---
 tests/ffi/ffi.du | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/ffi/ffi.du b/tests/ffi/ffi.du
index de8b4799..a59de0db 100644
--- a/tests/ffi/ffi.du
+++ b/tests/ffi/ffi.du
@@ -39,7 +39,7 @@ import Path;
 
 class TestFFIModule < UnitTest {
     var mod = nil;
-    doSetup() {
+    setUp() {
         if(this.mod != nil)
             return;
         const parts = ["examples", "ffi-example", "build"];
@@ -54,7 +54,6 @@ class TestFFIModule < UnitTest {
         this.mod = FFI.load(path);
     }
     testFFIModule() {
-        this.doSetup();
         const mod = this.mod;
         this.assertEquals(mod.test, "Dictu!");
         for(var i = 0; i < 40; i+=2) {
@@ -63,7 +62,6 @@ class TestFFIModule < UnitTest {
         this.assertEquals(mod.dictuFFITestStr(), "Hello From Dictu FFI module!");
     }
     testFFIModuleCallback() {
-        this.doSetup();
         const mod = this.mod;
         var count = 0;
         const list = [];