aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-06-12 23:16:32 +0100
committerMichael Williamson <mike@zwobble.org>2023-06-12 23:16:32 +0100
commit8a0ba886b0818a289d2990732ebf7769a013e7f0 (patch)
tree30a47cadb5f99c18e71145ef06f07b23870311f0 /src
parent339a9ae71595b0d6e0cdcc86495061e65859033c (diff)
Replace module-export instruction with namespace-field-store
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/shedlang/compiler/ShedCompiler.java2
-rw-r--r--src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java2
-rw-r--r--src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java7
-rw-r--r--src/main/java/org/shedlang/compiler/stackir/StackCompiler.java9
-rw-r--r--src/main/java/org/shedlang/compiler/stackir/instructions/Instruction.java2
-rw-r--r--src/main/java/org/shedlang/compiler/stackir/instructions/ModuleExportInstruction.java9
-rw-r--r--src/main/java/org/shedlang/compiler/stackir/instructions/NamespaceFieldStore.java15
-rw-r--r--src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java10
-rw-r--r--src/test/java/org/shedlang/compiler/stackir/StackCompilerNamespaceTests.java7
-rw-r--r--src/test/java/org/shedlang/compiler/stackir/instructions/InstructionMatchers.java8
-rw-r--r--src/test/java/org/shedlang/compiler/stackir/instructions/Instructions.java5
11 files changed, 49 insertions, 27 deletions
diff --git a/src/main/java/org/shedlang/compiler/ShedCompiler.java b/src/main/java/org/shedlang/compiler/ShedCompiler.java
index 8cc102d8..932ca148 100644
--- a/src/main/java/org/shedlang/compiler/ShedCompiler.java
+++ b/src/main/java/org/shedlang/compiler/ShedCompiler.java
@@ -65,7 +65,7 @@ public class ShedCompiler {
));
var typedNode = TypeChecker.typeCheckNamespace(untypedNode, context);
- var instructions = StackCompiler.compileNamespace(typedNode);
+ var instructions = StackCompiler.compileNamespace(typedNode, namespaceName);
namespaces.put(namespaceName, instructions);
}
diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java
index db7ffd13..656193a3 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java
@@ -33,7 +33,7 @@ public class LlvmCompiler {
yield context.addLocal(localStore.name(), value);
}
- case ModuleExportInstruction moduleExportInstruction -> {
+ case NamespaceFieldStore namespaceFieldStore -> {
throw new UnsupportedOperationException("TODO");
}
case PushBoolInstruction pushBool ->
diff --git a/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java b/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java
index 70959410..33d3dd32 100644
--- a/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java
+++ b/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java
@@ -86,10 +86,11 @@ public class InstructionSerializer {
treeString(localStoreInstruction.name())
);
- case ModuleExportInstruction moduleExportInstruction ->
+ case NamespaceFieldStore namespaceFieldStore ->
treeList(
- treeIdentifier("module-export"),
- treeString(moduleExportInstruction.name())
+ treeIdentifier("namespace-field-store"),
+ treeString(namespaceFieldStore.namespaceName().toString()),
+ treeString(namespaceFieldStore.fieldName())
);
case PushBoolInstruction pushBoolInstruction ->
diff --git a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
index ff9b7de2..e5728ca3 100644
--- a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
+++ b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
@@ -3,6 +3,7 @@ package org.shedlang.compiler.stackir;
import org.pcollections.PVector;
import org.shedlang.compiler.ast.typed.*;
import org.shedlang.compiler.stackir.instructions.*;
+import org.shedlang.compiler.types.NamespaceName;
import org.shedlang.compiler.util.P;
import java.util.stream.Collectors;
@@ -102,7 +103,7 @@ public class StackCompiler {
return P.vector(new PushIntInstruction(node.value(), node.source()));
}
- public static PVector<Instruction> compileNamespace(TypedNamespaceNode node) {
+ public static PVector<Instruction> compileNamespace(TypedNamespaceNode node, NamespaceName namespaceName) {
var instructions = node.body().stream()
.map(statement -> compileNamespaceStatement(statement))
.reduce(P.vector(), PVector::plusAll);
@@ -113,7 +114,11 @@ public class StackCompiler {
case TypedFunctionDefinitionNode functionDefinition ->
instructions = instructions
.plus(new LocalLoadInstruction(functionDefinition.name(), functionDefinition.source()))
- .plus(new ModuleExportInstruction(functionDefinition.name(), functionDefinition.source()));
+ .plus(new NamespaceFieldStore(
+ namespaceName,
+ functionDefinition.name(),
+ functionDefinition.source()
+ ));
}
}
diff --git a/src/main/java/org/shedlang/compiler/stackir/instructions/Instruction.java b/src/main/java/org/shedlang/compiler/stackir/instructions/Instruction.java
index fde83eed..c3357c06 100644
--- a/src/main/java/org/shedlang/compiler/stackir/instructions/Instruction.java
+++ b/src/main/java/org/shedlang/compiler/stackir/instructions/Instruction.java
@@ -3,7 +3,7 @@ package org.shedlang.compiler.stackir.instructions;
import org.shedlang.compiler.sources.Source;
public sealed interface Instruction
- permits CallInstruction, DefineFunctionInstruction, DiscardInstruction, LocalLoadInstruction, LocalStoreInstruction, ModuleExportInstruction, PushBoolInstruction, PushIntInstruction, PushStringInstruction, PushUnitInstruction {
+ permits CallInstruction, DefineFunctionInstruction, DiscardInstruction, LocalLoadInstruction, LocalStoreInstruction, NamespaceFieldStore, PushBoolInstruction, PushIntInstruction, PushStringInstruction, PushUnitInstruction {
Source source();
}
diff --git a/src/main/java/org/shedlang/compiler/stackir/instructions/ModuleExportInstruction.java b/src/main/java/org/shedlang/compiler/stackir/instructions/ModuleExportInstruction.java
deleted file mode 100644
index 0f41ba04..00000000
--- a/src/main/java/org/shedlang/compiler/stackir/instructions/ModuleExportInstruction.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.shedlang.compiler.stackir.instructions;
-
-import org.shedlang.compiler.sources.Source;
-
-public record ModuleExportInstruction(
- String name,
- Source source
-) implements Instruction {
-}
diff --git a/src/main/java/org/shedlang/compiler/stackir/instructions/NamespaceFieldStore.java b/src/main/java/org/shedlang/compiler/stackir/instructions/NamespaceFieldStore.java
new file mode 100644
index 00000000..9a818708
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/stackir/instructions/NamespaceFieldStore.java
@@ -0,0 +1,15 @@
+package org.shedlang.compiler.stackir.instructions;
+
+import org.shedlang.compiler.sources.Source;
+import org.shedlang.compiler.types.NamespaceName;
+
+/**
+ * Pop a value from the stack and store it as the field with the given name on
+ * the given namespace.
+ */
+public record NamespaceFieldStore(
+ NamespaceName namespaceName,
+ String fieldName,
+ Source source
+) implements Instruction {
+}
diff --git a/src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java b/src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java
index c13035b6..ffeedf4c 100644
--- a/src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java
+++ b/src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java
@@ -5,6 +5,7 @@ import org.shedlang.compiler.sources.Sources;
import org.shedlang.compiler.stackir.instructions.DefineFunctionInstruction;
import org.shedlang.compiler.stackir.instructions.Instruction;
import org.shedlang.compiler.stackir.instructions.Instructions;
+import org.shedlang.compiler.types.NamespaceName;
import java.util.List;
@@ -80,12 +81,15 @@ public class InstructionSerializerTests {
}
@Test
- public void canSerializeModuleExport() {
- var instruction = Instructions.moduleExport("x");
+ public void canSerializeNamespaceFieldStore() {
+ var instruction = Instructions.namespaceFieldStore(
+ new NamespaceName(List.of("Example", "Lib")),
+ "x"
+ );
var string = serialize(instruction);
- assertThat(string, equalTo("(module-export \"x\")"));
+ assertThat(string, equalTo("(namespace-field-store \"Example/Lib\" \"x\")"));
}
@Test
diff --git a/src/test/java/org/shedlang/compiler/stackir/StackCompilerNamespaceTests.java b/src/test/java/org/shedlang/compiler/stackir/StackCompilerNamespaceTests.java
index 88a91157..a3b34c55 100644
--- a/src/test/java/org/shedlang/compiler/stackir/StackCompilerNamespaceTests.java
+++ b/src/test/java/org/shedlang/compiler/stackir/StackCompilerNamespaceTests.java
@@ -4,6 +4,7 @@ import org.junit.jupiter.api.Test;
import org.shedlang.compiler.ast.typed.Typed;
import org.shedlang.compiler.ast.typed.TypedFunctionDefinitionNode;
import org.shedlang.compiler.stackir.instructions.DefineFunctionInstruction;
+import org.shedlang.compiler.types.NamespaceName;
import org.shedlang.compiler.types.Types;
import java.util.List;
@@ -15,6 +16,8 @@ import static org.zwobble.precisely.Matchers.*;
public class StackCompilerNamespaceTests {
@Test
public void bodyOfNamespaceIsCompiledWithNamesBeingExported() {
+ var namespaceName = new NamespaceName(List.of("Example"));
+
var node = Typed.namespace(List.of(
TypedFunctionDefinitionNode.builder()
.withName("f")
@@ -24,7 +27,7 @@ public class StackCompilerNamespaceTests {
.build()
));
- var instructions = StackCompiler.compileNamespace(node);
+ var instructions = StackCompiler.compileNamespace(node, namespaceName);
assertThat(instructions, isSequence(
instanceOf(
@@ -33,7 +36,7 @@ public class StackCompilerNamespaceTests {
),
isLocalStoreInstruction("f"),
isLocalLoadInstruction("f"),
- isModuleExportInstruction("f")
+ isNamespaceFieldStore(namespaceName, "f")
));
}
}
diff --git a/src/test/java/org/shedlang/compiler/stackir/instructions/InstructionMatchers.java b/src/test/java/org/shedlang/compiler/stackir/instructions/InstructionMatchers.java
index 0cbad43d..3f36e727 100644
--- a/src/test/java/org/shedlang/compiler/stackir/instructions/InstructionMatchers.java
+++ b/src/test/java/org/shedlang/compiler/stackir/instructions/InstructionMatchers.java
@@ -1,5 +1,6 @@
package org.shedlang.compiler.stackir.instructions;
+import org.shedlang.compiler.types.NamespaceName;
import org.zwobble.precisely.Matcher;
import java.math.BigInteger;
@@ -46,10 +47,11 @@ public class InstructionMatchers {
);
}
- public static Matcher<Instruction> isModuleExportInstruction(String name) {
+ public static Matcher<Instruction> isNamespaceFieldStore(NamespaceName namespaceName, String fieldName) {
return instanceOf(
- ModuleExportInstruction.class,
- has("name", x -> x.name(), equalTo(name))
+ NamespaceFieldStore.class,
+ has("namespaceName", x -> x.namespaceName(), equalTo(namespaceName)),
+ has("fieldName", x -> x.fieldName(), equalTo(fieldName))
);
}
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 cb147883..3d8eb1e1 100644
--- a/src/test/java/org/shedlang/compiler/stackir/instructions/Instructions.java
+++ b/src/test/java/org/shedlang/compiler/stackir/instructions/Instructions.java
@@ -1,6 +1,7 @@
package org.shedlang.compiler.stackir.instructions;
import org.shedlang.compiler.sources.Sources;
+import org.shedlang.compiler.types.NamespaceName;
import java.math.BigInteger;
import java.util.List;
@@ -25,8 +26,8 @@ public class Instructions {
return new LocalStoreInstruction(name, Sources.NULL);
}
- public static Instruction moduleExport(String name) {
- return new ModuleExportInstruction(name, Sources.NULL);
+ public static Instruction namespaceFieldStore(NamespaceName namespaceName, String fieldName) {
+ return new NamespaceFieldStore(namespaceName, fieldName, Sources.NULL);
}
public static DefineFunctionInstruction.Param param(String name) {