From 7c1478a872495fab3333638c3a1960edc2b0ec03 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Wed, 5 Jul 2023 22:09:28 +0100
Subject: Compile return statements to stack IR

---
 src/main/java/org/shedlang/compiler/stackir/StackCompiler.java | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/main/java')

diff --git a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
index aa0a4795..9cd01151 100644
--- a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
+++ b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
@@ -98,6 +98,9 @@ public class StackCompiler {
             case TypedExpressionStatementNode expressionStatement ->
                 compileExpressionStatement(expressionStatement);
 
+            case TypedReturnNode return_ ->
+                compileReturn(return_);
+
             case TypedValNode val ->
                 compileVal(val);
         };
@@ -146,6 +149,11 @@ public class StackCompiler {
         return P.vector(new LocalLoadInstruction(node.name(), node.source()));
     }
 
+    private static PVector<Instruction> compileReturn(TypedReturnNode node) {
+        return compileExpression(node.expression())
+            .plus(new ReturnInstruction(node.source()));
+    }
+
     private static PVector<Instruction> compileStringLiteral(TypedStringLiteralNode node) {
         return P.vector(new PushStringInstruction(node.value(), node.source()));
     }
-- 
cgit v1.2.3