From 7fbdae255cbaf850d88488deb6e2f58defd65f41 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 15 Dec 2023 11:16:06 +0000 Subject: Add code gen for Patio blocks --- .../backends/llvm/codegen/LlvmPatioCodeGen.java | 2 +- .../compiler/backends/wasm/WasmPatioCodeGen.java | 2 +- .../shedlang/compiler/patio/PatioExampleTests.java | 24 ++++++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/codegen/LlvmPatioCodeGen.java b/src/main/java/org/shedlang/compiler/backends/llvm/codegen/LlvmPatioCodeGen.java index b388818b..730169e5 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/codegen/LlvmPatioCodeGen.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/codegen/LlvmPatioCodeGen.java @@ -270,7 +270,7 @@ public class LlvmPatioCodeGen { } case PatioBlock patioBlock -> - throw new UnsupportedOperationException("TODO"); + generateInstructions(patioBlock.body(), context); case PatioBoolToInt patioBoolToInt -> { var targetResult = context.addPatioLocalToLlvmLocal(patioBoolToInt.target()); diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/WasmPatioCodeGen.java b/src/main/java/org/shedlang/compiler/backends/wasm/WasmPatioCodeGen.java index 90e2261d..486e5866 100644 --- a/src/main/java/org/shedlang/compiler/backends/wasm/WasmPatioCodeGen.java +++ b/src/main/java/org/shedlang/compiler/backends/wasm/WasmPatioCodeGen.java @@ -154,7 +154,7 @@ public class WasmPatioCodeGen { } case PatioBlock patioBlock -> - throw new UnsupportedOperationException("TODO"); + generateInstructions(patioBlock.body(), context); case PatioBoolToInt patioBoolToInt -> generateOperandToPatioLocal( diff --git a/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java b/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java index 729b4b87..95354c51 100644 --- a/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java +++ b/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java @@ -68,6 +68,30 @@ public abstract class PatioExampleTests { assertThat(result, isSilentExit(47)); } + @Test + public void block() throws IOException, InterruptedException { + var patioFunction = PatioFunctionDefinition.builder() + .withName(FUNCTION_NAME) + .withReturnType(PatioTypes.INT) + .addLocal(Patio.val("x", PatioTypes.INT)) + .addBodyInstruction(Patio.block( + List.of( + Patio.localStore( + Patio.localRef("x"), + Patio.int_(42) + ) + ), + List.of(Patio.localRef("x")) + )) + .addBodyInstruction(Patio.return_(Patio.localRef("x"))) + .build(); + var patio = Patio.compilationUnit(List.of(patioFunction)); + + var result = run(patio); + + assertThat(result, isSilentExit(42)); + } + @Test public void intAdd() throws IOException, InterruptedException { var patioFunction = PatioFunctionDefinition.builder() -- cgit v1.2.3