aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/shedlang/compiler/stackir
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-07-09 11:59:27 +0100
committerMichael Williamson <mike@zwobble.org>2023-07-09 11:59:27 +0100
commit85be56d890f100b72dde8e011d7421e597888363 (patch)
tree063057b5f430d5e392031863c95432f3b40af990 /src/main/java/org/shedlang/compiler/stackir
parent1259efb6a83148827445849232dc34e9342c1f96 (diff)
Add explicit function return statement
Diffstat (limited to 'src/main/java/org/shedlang/compiler/stackir')
-rw-r--r--src/main/java/org/shedlang/compiler/stackir/StackCompiler.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
index 449360e1..d3b8801c 100644
--- a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
+++ b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
@@ -112,14 +112,19 @@ public class StackCompiler {
return P.vector(defineFunctionInstruction, storeInstruction);
}
+
+ private static PVector<Instruction> compileFunctionReturn(TypedFunctionReturnNode node) {
+ return compileExpression(node.expression())
+ .plus(new ReturnInstruction(node.source()));
+ }
public static PVector<Instruction> compileFunctionStatement(TypedFunctionStatementNode node) {
return switch (node) {
case TypedExpressionStatementNode expressionStatement ->
compileExpressionStatement(expressionStatement);
- case TypedReturnNode return_ ->
- compileReturn(return_);
+ case TypedFunctionReturnNode functionReturn ->
+ compileFunctionReturn(functionReturn);
case TypedValNode val ->
compileVal(val);
@@ -169,11 +174,6 @@ 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()));
}