wren/vm: Allow wrenInterpret to call foreign function (complement 344…

…d343 at fixing wren-lang#730).
mhermier · Jun 28, 2020 · 3676a5b · 3676a5b
1 parent e539279
commit 3676a5b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/vm/wren_vm.c b/src/vm/wren_vm.c
@@ -1447,12 +1447,9 @@ WrenInterpretResult wrenInterpret(WrenVM* vm, const char* module,
   wrenPushRoot(vm, (Obj*)closure);
   ObjFiber* fiber = wrenNewFiber(vm, closure);
   wrenPopRoot(vm); // closure.
-
-  WrenInterpretResult result = runInterpreter(vm, fiber);
-
-  vm->fiber = NULL;
   vm->apiStack = NULL;
-  return result;
+
+  return runInterpreter(vm, fiber);
 }
 
 ObjClosure* wrenCompileSource(WrenVM* vm, const char* module, const char* source,

diff --git a/test/api/new_vm.c b/test/api/new_vm.c
@@ -23,12 +23,16 @@ static void multipleInterpretCalls(WrenVM* vm)
   // Handles should be valid across calls into Wren code.
   WrenHandle* absMethod = wrenMakeCallHandle(otherVM, "abs");
 
+  result = wrenInterpret(otherVM, "main", "import \"random\" for Random");
+  correct = correct && (result == WREN_RESULT_SUCCESS);
+
   for (int i = 0; i < 5; i++) {
     // Calling `wrenEnsureSlots()` before `wrenInterpret()` should not introduce
     // problems later.
     wrenEnsureSlots(otherVM, 2);
 
-    result = wrenInterpret(otherVM, "main", "1 + 2");
+    // Calling a foreign function should succeed.
+    result = wrenInterpret(otherVM, "main", "Random.new(12345)");
     correct = correct && (result == WREN_RESULT_SUCCESS);
 
     wrenEnsureSlots(otherVM, 2);