From 52ea9be878308da4113abcd14b70ba4b39503ef6 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 30 Jun 2023 19:12:25 +0100 Subject: Add namespace-import instruction --- .../llvm/LlvmCodeGenNamespaceImportTests.java | 44 ++++++++++++++++++++++ .../wasm/WasmCodeGenNamespaceImportTests.java | 27 +++++++++++++ .../stackir/InstructionSerializerTests.java | 11 ++++++ .../stackir/instructions/Instructions.java | 4 ++ 4 files changed, 86 insertions(+) create mode 100644 src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenNamespaceImportTests.java create mode 100644 src/test/java/org/shedlang/compiler/backends/wasm/WasmCodeGenNamespaceImportTests.java (limited to 'src/test/java') diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenNamespaceImportTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenNamespaceImportTests.java new file mode 100644 index 00000000..9e43f449 --- /dev/null +++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenNamespaceImportTests.java @@ -0,0 +1,44 @@ +package org.shedlang.compiler.backends.llvm; + +import org.junit.jupiter.api.Test; +import org.shedlang.compiler.backends.llvm.ir.ast.LlvmFunctionDeclaration; +import org.shedlang.compiler.backends.llvm.ir.ast.instructions.LlvmCall; +import org.shedlang.compiler.stackir.instructions.Instructions; +import org.shedlang.compiler.types.NamespaceName; + +import java.util.List; + +import static org.shedlang.compiler.backends.llvm.ir.ast.LlvmIrMatchers.isLlvmVariableGlobal; +import static org.shedlang.compiler.backends.llvm.ir.ast.LlvmIrMatchers.isLlvmVariableLocal; +import static org.zwobble.precisely.AssertThat.assertThat; +import static org.zwobble.precisely.Matchers.*; + +public class LlvmCodeGenNamespaceImportTests { + @Test + public void namespaceImportCallsNamespaceImportFunction() { + var namespaceName = new NamespaceName(List.of("Example", "Project")); + var instruction = Instructions.namespaceImport(namespaceName); + var context = LlvmCodeGenContext.EMPTY; + + var result = LlvmCodeGen.generateInstruction(instruction, context); + + assertThat(result.topLevelEntities(), isSequence( + instanceOf( + LlvmFunctionDeclaration.class, + has("name", x -> x.name(), equalTo("shed__namespaceImport__Example_Project")), + has("returnType", x -> x.returnType(), equalTo(LlvmCodeGenTypes.VALUE_TYPE)), + has("params", x -> x.params(), isSequence()) + ) + )); + assertThat(result.instructions(), isSequence( + instanceOf( + LlvmCall.class, + has("target", x -> x.target(), isOptionalOf(isLlvmVariableLocal("namespace__Example_Project__0"))), + has("returnType", x -> x.returnType(), equalTo(LlvmCodeGenTypes.VALUE_TYPE)), + has("functionPointer", x -> x.functionPointer(), isLlvmVariableGlobal("shed__namespaceImport__Example_Project")), + has("args", x -> x.args(), isSequence()) + ) + )); + assertThat(result.stack(), isSequence(isLlvmVariableLocal("namespace__Example_Project__0"))); + } +} diff --git a/src/test/java/org/shedlang/compiler/backends/wasm/WasmCodeGenNamespaceImportTests.java b/src/test/java/org/shedlang/compiler/backends/wasm/WasmCodeGenNamespaceImportTests.java new file mode 100644 index 00000000..7c2e61d6 --- /dev/null +++ b/src/test/java/org/shedlang/compiler/backends/wasm/WasmCodeGenNamespaceImportTests.java @@ -0,0 +1,27 @@ +package org.shedlang.compiler.backends.wasm; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.shedlang.compiler.stackir.instructions.Instructions; +import org.shedlang.compiler.testing.snapshots.SnapshotResolver; +import org.shedlang.compiler.testing.snapshots.Snapshotter; +import org.shedlang.compiler.types.NamespaceName; + +import java.io.IOException; +import java.util.List; + +import static org.shedlang.compiler.backends.wasm.WasmCodeGenTesting.objdumpContext; + +@ExtendWith({SnapshotResolver.class}) +public class WasmCodeGenNamespaceImportTests { + @Test + public void namespaceImportCallsNamespaceImportFunction(Snapshotter snapshotter) throws IOException, InterruptedException { + var namespaceName = new NamespaceName(List.of("Example", "Project")); + var instruction = Instructions.namespaceImport(namespaceName); + var context = WasmCodeGenContext.EMPTY; + + var result = WasmCodeGen.generateInstruction(instruction, context); + + snapshotter.assertSnapshot(objdumpContext(result)); + } +} diff --git a/src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java b/src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java index 14e71249..5877613d 100644 --- a/src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java +++ b/src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java @@ -93,6 +93,17 @@ public class InstructionSerializerTests { assertThat(string, equalTo("(namespace-field-store \"Example/Lib\" \"x\")")); } + @Test + public void canSerializeNamespaceImport() { + var instruction = Instructions.namespaceImport( + new NamespaceName(List.of("Example", "Lib")) + ); + + var string = serialize(instruction); + + assertThat(string, equalTo("(namespace-import \"Example/Lib\")")); + } + @Test public void canSerializePushBool() { var instruction = Instructions.pushBool(true); diff --git a/src/test/java/org/shedlang/compiler/stackir/instructions/Instructions.java b/src/test/java/org/shedlang/compiler/stackir/instructions/Instructions.java index 33c45a36..6108947b 100644 --- a/src/test/java/org/shedlang/compiler/stackir/instructions/Instructions.java +++ b/src/test/java/org/shedlang/compiler/stackir/instructions/Instructions.java @@ -30,6 +30,10 @@ public class Instructions { return new NamespaceFieldStoreInstruction(namespaceName, fieldName, Sources.NULL); } + public static Instruction namespaceImport(NamespaceName namespaceName) { + return new NamespaceImportInstruction(namespaceName, Sources.NULL); + } + public static DefineFunctionInstruction.Param param(String name) { return new DefineFunctionInstruction.Param(name, Sources.NULL); } -- cgit v1.2.3