feat: make RETURN opcode throw ReturnHook exception

heir-lang · Jan 13, 2025 · 82c3d52 · 82c3d52
1 parent 9ee3129
commit 82c3d52
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/Heir/Runtime/HookedExceptions.cs b/Heir/Runtime/HookedExceptions.cs
@@ -1,8 +1,8 @@
 namespace Heir.Runtime.HookedExceptions;
 
-public class Return<TValue>(TValue value) : HookedException
+public class ReturnHook(object? value) : HookedException
 {
-    public TValue Value { get; } = value;
+    public object? Value { get; } = value;
 }
 
 public abstract class HookedException() : Exception("BUG: Unhooked hooked exception");
diff --git a/Heir/VirtualMachine.cs b/Heir/VirtualMachine.cs
@@ -1,7 +1,7 @@
-using Heir.AST;
-using Heir.AST.Abstract;
+using Heir.AST.Abstract;
 using Heir.CodeGeneration;
 using Heir.Runtime;
+using Heir.Runtime.HookedExceptions;
 
 namespace Heir;
 
@@ -62,8 +62,12 @@ public VirtualMachine(Bytecode bytecode, Scope? scope = null)
             case OpCode.NOOP:
                 Advance();
                 break;
+
             case OpCode.RETURN:
-                return _stack.Pop();
+            {
+                var frame = _stack.Pop();
+                throw new ReturnHook(frame.Value);
+            }
 
             case OpCode.BEGINSCOPE:
                 _enclosingScope = Scope;
@@ -410,25 +414,25 @@ public VirtualMachine(Bytecode bytecode, Scope? scope = null)
             case OpCode.JZ:
             {
                 var frame = _stack.Pop();
-                if (frame.Value is int n && n == 0)
+                if (frame.Value is 0)
                 {
                     if (instruction.Operand is int index)
                         _pointer = index;
                     else
                         NonIntegerOperand(instruction);
                 }
                 else
-                {
                     Advance();
-                }
 
                 break;
             }
 
             default:
             {
-                Diagnostics.Error(DiagnosticCode.H001D, $"Unhandled opcode \"{instruction.OpCode}\"",
+                Diagnostics.Error(DiagnosticCode.H001D,
+                    $"Unhandled opcode \"{instruction.OpCode}\"",
                     instruction.Root.GetFirstToken());
+
                 return new StackFrame(instruction.Root, new ExitMarker());
             }
         }
@@ -447,8 +451,5 @@ private StackFrame CreateStackFrameFromInstruction(int offset = 0)
         return new StackFrame(instruction.Root, instruction.Operand);
     }
 
-    private void Advance(int amount = 1)
-    {
-        _pointer += amount;
-    }
+    private void Advance(int amount = 1) => _pointer += amount;
 }