aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-07-07 18:31:11 +0100
committerMichael Williamson <mike@zwobble.org>2023-07-07 18:31:17 +0100
commitd42333cb45df71c033d8b542f6df5b3b4fcdf8b4 (patch)
tree93dc91db7f96876f832fd8b50451ee4f1da6e171 /src
parent6820962c44cc7a27fe45d0a2ebe8140cd11f5811 (diff)
Add typed sub node
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/shedlang/compiler/ast/typed/TypedBinaryOperator.java3
-rw-r--r--src/main/java/org/shedlang/compiler/stackir/StackCompiler.java7
-rw-r--r--src/test/java/org/shedlang/compiler/ast/typed/Typed.java12
-rw-r--r--src/test/java/org/shedlang/compiler/stackir/StackCompilerIntSubTests.java26
-rw-r--r--src/test/java/org/shedlang/compiler/stackir/instructions/InstructionMatchers.java4
5 files changed, 50 insertions, 2 deletions
diff --git a/src/main/java/org/shedlang/compiler/ast/typed/TypedBinaryOperator.java b/src/main/java/org/shedlang/compiler/ast/typed/TypedBinaryOperator.java
index 5f6498f6..9f5fdf2c 100644
--- a/src/main/java/org/shedlang/compiler/ast/typed/TypedBinaryOperator.java
+++ b/src/main/java/org/shedlang/compiler/ast/typed/TypedBinaryOperator.java
@@ -4,7 +4,8 @@ import org.shedlang.compiler.types.Type;
import org.shedlang.compiler.types.Types;
public enum TypedBinaryOperator {
- INT_ADD(Types.INT);
+ INT_ADD(Types.INT),
+ INT_SUB(Types.INT);;
private final Type type;
diff --git a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
index c96b8cfd..75afaa31 100644
--- a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
+++ b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
@@ -15,7 +15,12 @@ public class StackCompiler {
private static PVector<Instruction> compileBinaryOperation(TypedBinaryOperationNode node) {
return compileExpression(node.left())
.plusAll(compileExpression(node.right()))
- .plus(new IntAddInstruction(node.source()));
+ .plus(switch (node.operator()) {
+ case INT_ADD ->
+ new IntAddInstruction(node.source());
+ case INT_SUB ->
+ new IntSubInstruction(node.source());
+ });
}
private static PVector<Instruction> compileBoolLiteral(TypedBoolLiteralNode node) {
diff --git a/src/test/java/org/shedlang/compiler/ast/typed/Typed.java b/src/test/java/org/shedlang/compiler/ast/typed/Typed.java
index cb4d1f02..18fe79cf 100644
--- a/src/test/java/org/shedlang/compiler/ast/typed/Typed.java
+++ b/src/test/java/org/shedlang/compiler/ast/typed/Typed.java
@@ -51,6 +51,18 @@ public class Typed {
return new TypedIntLiteralNode(BigInteger.valueOf(value), Sources.NULL);
}
+ public static TypedBinaryOperationNode intSub(
+ TypedExpressionNode left,
+ TypedExpressionNode right
+ ) {
+ return new TypedBinaryOperationNode(
+ TypedBinaryOperator.INT_SUB,
+ left,
+ right,
+ Sources.NULL
+ );
+ }
+
public static TypedNamedArgNode namedArg(String name, TypedExpressionNode expression) {
return new TypedNamedArgNode(name, expression, Sources.NULL);
}
diff --git a/src/test/java/org/shedlang/compiler/stackir/StackCompilerIntSubTests.java b/src/test/java/org/shedlang/compiler/stackir/StackCompilerIntSubTests.java
new file mode 100644
index 00000000..b11863c5
--- /dev/null
+++ b/src/test/java/org/shedlang/compiler/stackir/StackCompilerIntSubTests.java
@@ -0,0 +1,26 @@
+package org.shedlang.compiler.stackir;
+
+import org.junit.jupiter.api.Test;
+import org.shedlang.compiler.ast.typed.Typed;
+
+import static org.shedlang.compiler.stackir.instructions.InstructionMatchers.*;
+import static org.zwobble.precisely.AssertThat.assertThat;
+import static org.zwobble.precisely.Matchers.isSequence;
+
+public class StackCompilerIntSubTests {
+ @Test
+ public void intSubIsCompiledToIntSubInstruction() {
+ var node = Typed.intSub(
+ Typed.intLiteral(42),
+ Typed.intLiteral(47)
+ );
+
+ var instructions = StackCompiler.compileExpression(node);
+
+ assertThat(instructions, isSequence(
+ isPushIntInstruction(42),
+ isPushIntInstruction(47),
+ isIntSubInstruction()
+ ));
+ }
+}
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 201a69c2..08f02227 100644
--- a/src/test/java/org/shedlang/compiler/stackir/instructions/InstructionMatchers.java
+++ b/src/test/java/org/shedlang/compiler/stackir/instructions/InstructionMatchers.java
@@ -37,6 +37,10 @@ public class InstructionMatchers {
return instanceOf(IntAddInstruction.class);
}
+ public static Matcher<Instruction> isIntSubInstruction() {
+ return instanceOf(IntSubInstruction.class);
+ }
+
public static Matcher<Instruction> isLocalLoadInstruction(String name) {
return instanceOf(
LocalLoadInstruction.class,