Fix bug with event return values

Blaze Core/Interpreter/Types/EventValue.cs

@@ -9,12 +9,12 @@ namespace VD.Blaze.Interpreter.Types
     public class EventValue : IValue, IValueCallable, IEvent
     {
         public List<IValueCallable> Callbacks;
-        public VM VM;
+        public VM ParentVM;
 
         public EventValue(VM vm)
         {
             Callbacks = new List<IValueCallable>();
-            VM = vm;
+            ParentVM = vm;
         }
 
         public bool AsBoolean()
@@ -36,12 +36,12 @@ public void Call(VM vm, List<IValue> args)
         {
             for(int i = Callbacks.Count - 1; i >= 0; i--)
             {
-                Callbacks[i].Call(VM, args);
+                Callbacks[i].Call(vm, args);
+
+                // Only leave the returned value from the callback
+                vm._inConstructor = i != Callbacks.Count - 1;
             }
 
-            // If the VM is not running, run it
-            if (VM.Done)
-                VM.Execute();
         }
 
         public IValue Copy()
@@ -61,7 +61,11 @@ public string GetName()
 
         public void Raise(List<IValue> args)
         {
-            Call(VM, args);
+            Call(ParentVM, args);
+
+            // If the VM is not running, run it
+            if (ParentVM.Done)
+                ParentVM.Execute();
         }
     }
 }

Blaze Core/Interpreter/VM.cs

@@ -44,7 +44,7 @@ public VM()
         public ModuleEnv LoadModule(Module.Module module, ModuleEnv parent = null)
         {
             ModuleEnv env = new ModuleEnv(module, parent);
-            FunctionValue staticFunc = new FunctionValue(env.Module.Functions[0], env, env);
+            FunctionValue staticFunc = new FunctionValue(env.Module.GetStaticFunction(), env, env);
 
             staticFunc.Call(this, null);
 
@@ -65,7 +65,7 @@ public static ModuleEnv StaticLoadModule(Module.Module module, ModuleEnv parent
             VM vm = new VM();
 
             ModuleEnv env = new ModuleEnv(module, parent);
-            FunctionValue staticFunc = new FunctionValue(env.Module.Functions[0], env, env);
+            FunctionValue staticFunc = new FunctionValue(env.Module.GetStaticFunction(), env, env);
 
             vm.RunFunction(staticFunc, null);
 
@@ -122,6 +122,11 @@ public void Step()
 
             _current++;
 
+/*            Console.WriteLine($"{opcode} {opargi} STACK: ");
+            foreach(var v in Stack.ToArray())
+                Console.WriteLine(v.AsString());
+            Console.Write("\n");*/
+
             switch (opcode)
             {
                 case Opcode.NOP: