From 3c2ba407bd61f037074f7fdcfdee75c5953d8677 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 13 Jun 2023 19:46:00 +0100 Subject: Add missing suffix --- .../org/shedlang/compiler/backends/llvm/LlvmCompiler.java | 2 +- .../shedlang/compiler/stackir/InstructionSerializer.java | 2 +- .../java/org/shedlang/compiler/stackir/StackCompiler.java | 2 +- .../compiler/stackir/instructions/Instruction.java | 2 +- .../stackir/instructions/NamespaceFieldStore.java | 15 --------------- .../instructions/NamespaceFieldStoreInstruction.java | 15 +++++++++++++++ 6 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 src/main/java/org/shedlang/compiler/stackir/instructions/NamespaceFieldStore.java create mode 100644 src/main/java/org/shedlang/compiler/stackir/instructions/NamespaceFieldStoreInstruction.java (limited to 'src/main/java') 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 656193a3..322c9a4f 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 NamespaceFieldStore namespaceFieldStore -> { + case NamespaceFieldStoreInstruction 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 33d3dd32..ec63afd2 100644 --- a/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java +++ b/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java @@ -86,7 +86,7 @@ public class InstructionSerializer { treeString(localStoreInstruction.name()) ); - case NamespaceFieldStore namespaceFieldStore -> + case NamespaceFieldStoreInstruction namespaceFieldStore -> treeList( treeIdentifier("namespace-field-store"), treeString(namespaceFieldStore.namespaceName().toString()), diff --git a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java index e5728ca3..c579ac69 100644 --- a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java +++ b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java @@ -114,7 +114,7 @@ public class StackCompiler { case TypedFunctionDefinitionNode functionDefinition -> instructions = instructions .plus(new LocalLoadInstruction(functionDefinition.name(), functionDefinition.source())) - .plus(new NamespaceFieldStore( + .plus(new NamespaceFieldStoreInstruction( 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 c3357c06..a2b9d7a7 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, NamespaceFieldStore, PushBoolInstruction, PushIntInstruction, PushStringInstruction, PushUnitInstruction { + permits CallInstruction, DefineFunctionInstruction, DiscardInstruction, LocalLoadInstruction, LocalStoreInstruction, NamespaceFieldStoreInstruction, PushBoolInstruction, PushIntInstruction, PushStringInstruction, PushUnitInstruction { Source source(); } diff --git a/src/main/java/org/shedlang/compiler/stackir/instructions/NamespaceFieldStore.java b/src/main/java/org/shedlang/compiler/stackir/instructions/NamespaceFieldStore.java deleted file mode 100644 index 9a818708..00000000 --- a/src/main/java/org/shedlang/compiler/stackir/instructions/NamespaceFieldStore.java +++ /dev/null @@ -1,15 +0,0 @@ -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/main/java/org/shedlang/compiler/stackir/instructions/NamespaceFieldStoreInstruction.java b/src/main/java/org/shedlang/compiler/stackir/instructions/NamespaceFieldStoreInstruction.java new file mode 100644 index 00000000..197def00 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/stackir/instructions/NamespaceFieldStoreInstruction.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 NamespaceFieldStoreInstruction( + NamespaceName namespaceName, + String fieldName, + Source source +) implements Instruction { +} -- cgit v1.2.3