From 533f367444e198ed7294bfa4d5a96b4d4e542547 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 23 Jul 2023 11:28:32 +0100 Subject: Add bool-to-int instruction to Patio --- .../org/shedlang/compiler/patio/ast/PatioSerializer.java | 7 +++++++ .../compiler/patio/ast/instructions/PatioBoolToInt.java | 12 ++++++++++++ .../compiler/patio/ast/instructions/PatioInstruction.java | 2 +- .../org/shedlang/compiler/patio/PatioSerializerTests.java | 9 +++++++++ .../java/org/shedlang/compiler/patio/instructions/Patio.java | 4 ++++ 5 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioBoolToInt.java (limited to 'src') diff --git a/src/main/java/org/shedlang/compiler/patio/ast/PatioSerializer.java b/src/main/java/org/shedlang/compiler/patio/ast/PatioSerializer.java index 7a170d58..fe96a467 100644 --- a/src/main/java/org/shedlang/compiler/patio/ast/PatioSerializer.java +++ b/src/main/java/org/shedlang/compiler/patio/ast/PatioSerializer.java @@ -145,6 +145,13 @@ public class PatioSerializer { dataLayoutToTree(alloc.layout()) ); + case PatioBoolToInt boolToInt -> + treeList( + treeIdentifier("bool-to-int"), + operandToTree(boolToInt.target()), + operandToTree(boolToInt.value()) + ); + case PatioCall call -> treeList( treeIdentifier("call"), diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioBoolToInt.java b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioBoolToInt.java new file mode 100644 index 00000000..5edf01e9 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioBoolToInt.java @@ -0,0 +1,12 @@ +package org.shedlang.compiler.patio.ast.instructions; + +import org.shedlang.compiler.patio.ast.operands.PatioLocalRef; +import org.shedlang.compiler.patio.ast.operands.PatioOperand; +import org.shedlang.compiler.sources.Source; + +public record PatioBoolToInt( + PatioLocalRef target, + PatioOperand value, + Source source +) implements PatioInstruction { +} diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioInstruction.java b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioInstruction.java index b4cf464b..7db82b0a 100644 --- a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioInstruction.java +++ b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioInstruction.java @@ -2,6 +2,6 @@ package org.shedlang.compiler.patio.ast.instructions; import org.shedlang.compiler.sources.Source; -public sealed interface PatioInstruction permits PatioAlloc, PatioCall, PatioCallPointer, PatioDataPtrToInt, PatioIf, PatioIntAdd, PatioIntEquals, PatioIntToDataPtr, PatioLocalStore, PatioMemoryLoad, PatioMemoryStore, PatioReturn { +public sealed interface PatioInstruction permits PatioAlloc, PatioBoolToInt, PatioCall, PatioCallPointer, PatioDataPtrToInt, PatioIf, PatioIntAdd, PatioIntEquals, PatioIntToDataPtr, PatioLocalStore, PatioMemoryLoad, PatioMemoryStore, PatioReturn { Source source(); } diff --git a/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java b/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java index 57b7948d..6ab294a4 100644 --- a/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java +++ b/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java @@ -139,6 +139,15 @@ public class PatioSerializerTests { assertThat(string, equalTo("(alloc (local \"x\") (struct (int int byte)))")); } + @Test + public void canSerializeBoolToInt() { + var instruction = Patio.boolToInt(Patio.localRef("target"), Patio.localRef("value")); + + var string = PatioTesting.serializeInstruction(instruction); + + assertThat(string, equalTo("(bool-to-int (local \"target\") (local \"value\"))")); + } + @Test public void canSerializeCallWithoutTarget() { var instruction = Patio.call( diff --git a/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java b/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java index 2bdca7a4..b89f308d 100644 --- a/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java +++ b/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java @@ -22,6 +22,10 @@ public class Patio { return new PatioBool(value); } + public static PatioInstruction boolToInt(PatioLocalRef target, PatioLocalRef value) { + return new PatioBoolToInt(target, value, Sources.NULL); + } + public static PatioInstruction call( Optional target, String name, -- cgit v1.2.3