Got non-lambda method body tests passing

Author: danielperano

Lang/src/main/java/chipmunk/vm/BytecodeInterpreter.java

@@ -97,6 +97,12 @@ public static void dispatch(Fiber fiber, CMethod method, int ip){
                             fiber.push(method.module.constants[fetchInt(code, ip + 1)]);
                             ip += 5;
                         }
+                        case EQ -> {
+                            var t = (Boolean) fiber.invokeValue(method, ip, "equals", 1, true);
+                            fiber.push(t);
+                            ip++;
+                            //ip = testJump(v.intValue() < 0, fiber, ip, fetchInt(code, ip + 1), 5);
+                        }
                         case LT -> {
                             var v = (Number) fiber.invokeValue(method, ip, "compare", 1, true);
                             fiber.push(v.intValue() < 0);
@@ -121,6 +127,11 @@ public static void dispatch(Fiber fiber, CMethod method, int ip){
                             ip += 6;
                             fiber.invoke(method, ip - 6, name, pCount, false);
                         }
+                        case RANGE -> {
+                            fiber.push(fetchByte(code, ip + 1) != 0);
+                            fiber.push(fiber.invokeValue(method, ip, "range", 2, true));
+                            ip += 2;
+                        }
                         case LIST -> {
                             fiber.push(new CList(fetchInt(code, ip + 1)));
                             ip += 5;
@@ -129,6 +140,10 @@ public static void dispatch(Fiber fiber, CMethod method, int ip){
                             fiber.push(new CMap(fetchInt(code, ip + 1)));
                             ip += 5;
                         }
+                        case ITER -> {
+                            fiber.invoke(method, ip, "iterator", 0, false);
+                            ip++;
+                        }
                         case GETAT -> {
                             fiber.invoke(method, ip, "getAt", 1, false);
                             ip++;

Lang/src/main/java/chipmunk/vm/ChipmunkScript.java

@@ -30,7 +30,6 @@
 import chipmunk.vm.invoke.ChipmunkLibraries;
 import chipmunk.vm.invoke.security.LinkingPolicy;
 import chipmunk.vm.invoke.security.SecurityMode;
-import chipmunk.vm.jvm.JvmCompiler;
 
 import java.io.IOException;
 import java.util.*;
@@ -190,15 +189,16 @@ public CModule getCModule(String name) throws ModuleLoadException {
         return module;
     }
 
-    public void createEntryFiber(Object... args){
+    public void initEntryFiber(Object... args){
         var module = getCModule(entryPoint.getModule());
         var fiber = newFiber();
         fiber.initialize(module.cls.getInstanceMethod(entryPoint.getMethod()), args);
+        setCurrentFiber(fiber);
     }
 
     // TODO - run from suspended state
 
-    public Object run(Object[] args){
+    public Object run(Object... args){
 
         try {
             getCModule(entryPoint.getModule());
@@ -225,10 +225,6 @@ public void setCurrentFiber(Fiber f){
         currentFiber.set(f);
     }
 
-    public Object run(){
-        return run(new Object[]{});
-    }
-
     public void interrupt(){
         currentFiber.getAndUpdate(f -> {
             if(f != null){

Lang/src/main/java/chipmunk/vm/ChipmunkVM.java

@@ -121,6 +121,7 @@ public ChipmunkScript compileScript(CompilationUnit unit) {
 
 		ChipmunkScript script = new ChipmunkScript(this);
 		script.getModuleLoader().setDelegate(unit.getModuleLoader());
+		script.setEntryPoint(new EntryPoint(unit.getEntryModule(), unit.getEntryMethodName()));
 		script.setId(scriptIds.incrementAndGet());
 		script.setLinkPolicy(defaultLinkPolicy);
 		script.setLibs(defaultLibraries);
@@ -207,7 +208,7 @@ public CLinker createLinker(){
 	}
 
 	public CompletableFuture<Object> runAsync(ChipmunkScript script) {
-		return invokeAsync(script, script, "main");
+		return runInScriptPool(script, () -> script.run());
 	}
 
 	public CompletableFuture<Object> runAsync(ChipmunkScript script, Object[] params) {

Lang/src/main/java/chipmunk/vm/Fiber.java

@@ -146,6 +146,7 @@ public void invoke(CMethod method, int ip, String name, int count, boolean opera
                     args[i] = pop();
                 }
 
+                // TODO - throw a Chipmunk-specific NPE with a Chipmunk stack trace
                 var targetType = target.getClass();
                 var argTypes = CallUtil.types(args);
 

Lang/src/main/java/chipmunk/vm/invoke/ChipmunkLibraries.java

@@ -54,6 +54,10 @@ private List<LibraryMethod> getLibraryMethodsForType(Class<?> receiverType){
     }
 
     public Method getMethod(Class<?> returnType, String name, Class<?>[] argTypes){
+        // TODO - ideally we'd be able to link against zero-argument library overrides
+        if(argTypes.length == 0){
+            return null;
+        }
         Class<?> receiverType = argTypes[0];
         if(receiverType == null){
             receiverType = Object.class;