From dfea9b1ce0247ae61e590cf91c59f4dd3ae93db5 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 23 Jul 2023 11:30:13 +0100 Subject: Add int-to-bool instruction to Patio --- .../org/shedlang/compiler/patio/ast/PatioSerializer.java | 7 +++++++ .../compiler/patio/ast/instructions/PatioInstruction.java | 2 +- .../compiler/patio/ast/instructions/PatioIntToBool.java | 12 ++++++++++++ .../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/PatioIntToBool.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 fe96a467..530a95f0 100644 --- a/src/main/java/org/shedlang/compiler/patio/ast/PatioSerializer.java +++ b/src/main/java/org/shedlang/compiler/patio/ast/PatioSerializer.java @@ -207,6 +207,13 @@ public class PatioSerializer { operandToTree(intEquals.right()) ); + case PatioIntToBool intToBool -> + treeList( + treeIdentifier("int-to-bool"), + operandToTree(intToBool.target()), + operandToTree(intToBool.value()) + ); + case PatioIntToDataPtr intToDataPtr -> treeList( treeIdentifier("int-to-data-ptr"), 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 7db82b0a..18c93134 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, PatioBoolToInt, PatioCall, PatioCallPointer, PatioDataPtrToInt, PatioIf, PatioIntAdd, PatioIntEquals, PatioIntToDataPtr, PatioLocalStore, PatioMemoryLoad, PatioMemoryStore, PatioReturn { +public sealed interface PatioInstruction permits PatioAlloc, PatioBoolToInt, PatioCall, PatioCallPointer, PatioDataPtrToInt, PatioIf, PatioIntAdd, PatioIntEquals, PatioIntToBool, PatioIntToDataPtr, PatioLocalStore, PatioMemoryLoad, PatioMemoryStore, PatioReturn { Source source(); } diff --git a/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIntToBool.java b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIntToBool.java new file mode 100644 index 00000000..43bdca03 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/patio/ast/instructions/PatioIntToBool.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 PatioIntToBool( + PatioLocalRef target, + PatioOperand value, + Source source +) implements PatioInstruction { +} diff --git a/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java b/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java index 6ab294a4..0574d035 100644 --- a/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java +++ b/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java @@ -257,6 +257,15 @@ public class PatioSerializerTests { )); } + @Test + public void canSerializeIntToBool() { + var instruction = Patio.intToBool(Patio.localRef("target"), Patio.localRef("value")); + + var string = PatioTesting.serializeInstruction(instruction); + + assertThat(string, equalTo("(int-to-bool (local \"target\") (local \"value\"))")); + } + @Test public void canSerializeIntToDataPtr() { var instruction = Patio.intToDataPtr("target", "value"); 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 b89f308d..438022ec 100644 --- a/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java +++ b/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java @@ -124,6 +124,10 @@ public class Patio { return new PatioIntEquals(target, left, right, Sources.NULL); } + public static PatioInstruction intToBool(PatioLocalRef target, PatioLocalRef value) { + return new PatioIntToBool(target, value, Sources.NULL); + } + public static PatioInstruction intToDataPtr(String target, String value) { return new PatioIntToDataPtr( new PatioLocalRef(target), -- cgit v1.2.3