From e9b4a3d35aa08ff7579957a6c7622fff63f972c4 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Thu, 20 Jul 2023 10:17:06 +0100 Subject: Rename int to int-get --- src/main/java/org/shedlang/compiler/patio/PatioCodeGen.java | 2 +- .../org/shedlang/compiler/patio/PatioInstructionSerializer.java | 8 ++++---- .../shedlang/compiler/patio/instructions/PatioInstruction.java | 2 +- .../java/org/shedlang/compiler/patio/instructions/PatioInt.java | 9 --------- .../org/shedlang/compiler/patio/instructions/PatioIntGet.java | 9 +++++++++ 5 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 src/main/java/org/shedlang/compiler/patio/instructions/PatioInt.java create mode 100644 src/main/java/org/shedlang/compiler/patio/instructions/PatioIntGet.java (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/patio/PatioCodeGen.java b/src/main/java/org/shedlang/compiler/patio/PatioCodeGen.java index fe74e70b..5fdcd30f 100644 --- a/src/main/java/org/shedlang/compiler/patio/PatioCodeGen.java +++ b/src/main/java/org/shedlang/compiler/patio/PatioCodeGen.java @@ -124,7 +124,7 @@ public class PatioCodeGen { context = localResult.context(); return context - .addInstruction(new PatioInt(local, value, source)) + .addInstruction(new PatioIntGet(local, value, source)) .temporaryPush(local); } } diff --git a/src/main/java/org/shedlang/compiler/patio/PatioInstructionSerializer.java b/src/main/java/org/shedlang/compiler/patio/PatioInstructionSerializer.java index d0785c7a..132803fe 100644 --- a/src/main/java/org/shedlang/compiler/patio/PatioInstructionSerializer.java +++ b/src/main/java/org/shedlang/compiler/patio/PatioInstructionSerializer.java @@ -50,11 +50,11 @@ public class PatioInstructionSerializer { ) ); - case PatioInt int_ -> + case PatioIntGet intGet -> treeList( - treeIdentifier("int"), - localToTree(int_.target()), - treeInt(int_.value()) + treeIdentifier("int-get"), + localToTree(intGet.target()), + treeInt(intGet.value()) ); case PatioLocalCopy localCopy -> diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioInstruction.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioInstruction.java index 9d68b623..c7ce5e85 100644 --- a/src/main/java/org/shedlang/compiler/patio/instructions/PatioInstruction.java +++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioInstruction.java @@ -2,6 +2,6 @@ package org.shedlang.compiler.patio.instructions; import org.shedlang.compiler.sources.Source; -public sealed interface PatioInstruction permits PatioAlloc, PatioCallPointer, PatioFunctionPointerGet, PatioInt, PatioLocalCopy, PatioMemoryLoad, PatioMemoryStore, PatioReturn { +public sealed interface PatioInstruction permits PatioAlloc, PatioCallPointer, PatioFunctionPointerGet, PatioIntGet, PatioLocalCopy, PatioMemoryLoad, PatioMemoryStore, PatioReturn { Source source(); } diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioInt.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioInt.java deleted file mode 100644 index f02c6146..00000000 --- a/src/main/java/org/shedlang/compiler/patio/instructions/PatioInt.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.shedlang.compiler.patio.instructions; - -import org.shedlang.compiler.sources.Source; - -/** - * Store the given value in the target local. - */ -public record PatioInt(PatioLocal target, int value, Source source) implements PatioInstruction { -} diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioIntGet.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioIntGet.java new file mode 100644 index 00000000..0d1bbfc2 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioIntGet.java @@ -0,0 +1,9 @@ +package org.shedlang.compiler.patio.instructions; + +import org.shedlang.compiler.sources.Source; + +/** + * Store the given value in the target local. + */ +public record PatioIntGet(PatioLocal target, int value, Source source) implements PatioInstruction { +} -- cgit v1.2.3