Support Patio exceptions in Patio Wasm backend

3 files changed, 19 insertions, 6 deletions

diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmPatioCodeGenTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmPatioCodeGenTests.java
index a4c823df..56262676 100644
--- a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmPatioCodeGenTests.java
+++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmPatioCodeGenTests.java
@@ -1,5 +1,7 @@
 package org.shedlang.compiler.backends.llvm;
 
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.shedlang.compiler.backends.llvm.ir.ast.LlvmBasicBlock;
 import org.shedlang.compiler.backends.llvm.ir.ast.LlvmFunctionDefinition;
 import org.shedlang.compiler.backends.llvm.ir.ast.instructions.LlvmCall;
@@ -64,4 +66,10 @@ public class LlvmPatioCodeGenTests extends PatioExampleTests {
 
         return TestProcessRunner.runCaptureOutput(List.of(executablePath.toString()));
     }
+
+    @Disabled("WIP")
+    @Test
+    public void whenExceptionIsThrownThenFirstMatchingExceptionHandlerIsUsed() {
+
+    }
 }
diff --git a/src/test/java/org/shedlang/compiler/backends/wasm/WasmPatioCodeGenTests.java b/src/test/java/org/shedlang/compiler/backends/wasm/WasmPatioCodeGenTests.java
index b3c0960f..fe87bfc8 100644
--- a/src/test/java/org/shedlang/compiler/backends/wasm/WasmPatioCodeGenTests.java
+++ b/src/test/java/org/shedlang/compiler/backends/wasm/WasmPatioCodeGenTests.java
@@ -9,6 +9,7 @@ import org.shedlang.compiler.backends.wasm.structure.ast.modules.WasmImport;
 import org.shedlang.compiler.backends.wasm.structure.ast.modules.WasmImportDescriptor;
 import org.shedlang.compiler.backends.wasm.structure.ast.types.WasmFuncType;
 import org.shedlang.compiler.backends.wasm.structure.ast.types.WasmValueType;
+import org.shedlang.compiler.filesystem.ShedCompilerFiles;
 import org.shedlang.compiler.patio.PatioExampleTests;
 import org.shedlang.compiler.patio.ast.PatioCompilationUnit;
 import org.shedlang.compiler.testing.ExecutionResult;
@@ -61,6 +62,13 @@ public class WasmPatioCodeGenTests extends PatioExampleTests {
             executablePath
         );
 
-        return TestProcessRunner.runCaptureOutput(List.of("wasmtime", executablePath.toString()));
+        return TestProcessRunner.runCaptureOutput(List.of(
+            "node",
+            "--experimental-wasi-unstable-preview1",
+            "--no-warnings=ExperimentalWarning",
+            "--experimental-wasm-eh",
+            ShedCompilerFiles.getRoot().resolve("run-wasm.js").toString(),
+            executablePath.toString()
+        ));
     }
 }
diff --git a/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java b/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java
index b0917393..d1314e5c 100644
--- a/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java
+++ b/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java
@@ -1,6 +1,5 @@
 package org.shedlang.compiler.patio;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.shedlang.compiler.patio.ast.PatioCompilationUnit;
 import org.shedlang.compiler.patio.ast.PatioFunctionDefinition;
@@ -223,7 +222,6 @@ public abstract class PatioExampleTests {
     }
 
     @Test
-    @Disabled("WIP")
     public void whenExceptionIsThrownThenFirstMatchingExceptionHandlerIsUsed() throws IOException, InterruptedException {
         var patioFunction = PatioFunctionDefinition.builder()
             .withName(FUNCTION_NAME)
@@ -266,7 +264,7 @@ public abstract class PatioExampleTests {
                             )
                         )
                     ),
-                    List.of(Patio.int_(0))
+                    List.of(Patio.localRef("r2"))
                 )
             ))
             .addBodyInstruction(Patio.return_(
@@ -275,13 +273,12 @@ public abstract class PatioExampleTests {
             .build();
         var patio = Patio.compilationUnit(List.of(
             Patio.exceptionTypeDefinition("Error", PatioTypes.INT),
-            Patio.exceptionTypeDefinition("OtherError", PatioTypes.INT),
             patioFunction
         ));
 
         var result = run(patio);
 
-        assertThat(result, isSilentExit(47));
+        assertThat(result, isSilentExit(2));
     }
 
     @Test