Merge branch 'v0.0.5-pre' of https://github.com/fastvm/minivm into v0…

….0.5-pre

.gitignore

@@ -32,3 +32,4 @@ package-lock.json
 web/minivm.js
 web-raw/minivm.js
 web-raw/minivm.wasm
+.DS_Store

main/minivm.c

@@ -43,7 +43,7 @@ __attribute__((no_instrument_function)) int main(int argc, char **argv) {
         } else if (!strcmp(arg, "--no-dump-ir")) {
             vm->dump_ir = false;
         } else if (!strcmp(arg, "--repl")) {
-            vm_repl(vm);
+            vm_lang_lua_repl(vm);
             isrepl = false;
         } else {
             isrepl = false;
@@ -70,7 +70,7 @@ __attribute__((no_instrument_function)) int main(int argc, char **argv) {
                 exit(1);
             }
 
-            vm_block_t *entry = vm_compile(vm, src, name ? name : "__expr__");
+            vm_ir_block_t *entry = vm_lang_lua_compile(vm, src, name ? name : "__expr__");
 
             vm_obj_t value = vm_run_main(vm, entry);
             if (vm_obj_is_error(value)) {
@@ -91,7 +91,7 @@ __attribute__((no_instrument_function)) int main(int argc, char **argv) {
     }
 
     if (isrepl) {
-        vm_repl(vm);
+        vm_lang_lua_repl(vm);
     }
 
 #if VM_USE_SPALL

makefile

@@ -25,7 +25,9 @@ MAKE_INCLUDE ?=
 # setup targets
 default: all
 
-all: build/bin/minivm${EXE}
+all: minivm
+
+minivm: build/bin/minivm${EXE}
 
 # specific builds
 clean: .dummy

test/closure/funcret.lua

@@ -5,8 +5,10 @@ local add = function(x)
     end
 end
 
+local max = tonumber(arg and arg[1]) or 1000000
+
 local i = 0
-while i < 1000 * 1000 * 10 do
+while i < max do
     i = add(i)(1)
 end
 

test/test.lua

@@ -0,0 +1,20 @@
+local function run(x, y)
+    print('-- ' .. tostring(x) .. ' and ' .. tostring(y))
+    print(x and y)
+    print(
+        do
+            local tmp = x
+            if x then
+                y
+            else
+                x
+            end
+        end
+    )
+end
+
+run(true, true)
+run(true, false)
+run(false, true)
+run(false, false)
+