Parse addition

3 files changed, 60 insertions, 0 deletions

diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java
index a2b7b09b..dcb06eb0 100644
--- a/src/main/java/org/shedlang/compiler/parser/Parser.java
+++ b/src/main/java/org/shedlang/compiler/parser/Parser.java
@@ -18,6 +18,28 @@ public class Parser {
     private Parser() {
     }
 
+    private static UntypedExpressionNode parseAdd(
+        UntypedExpressionNode left,
+        TokenIterator<TokenType> tokens
+    ) {
+        var start = left.source().start();
+
+        tokens.skip(TokenType.SYMBOL_PLUS);
+
+        // TODO: precedence
+        var right = parseTopLevelExpression(tokens);
+
+        var end = tokens.position();
+        var source = start.to(end);
+
+        return new UntypedBinaryOperationNode(
+            UntypedBinaryOperator.ADD,
+            left,
+            right,
+            source
+        );
+    }
+
     private static UntypedExpressionNode parseCall(UntypedExpressionNode receiver, TokenIterator<TokenType> tokens) {
         var start = receiver.source().start();
 
@@ -290,6 +312,10 @@ public class Parser {
 
         while (true) {
             switch (tokens.peek().tokenType()) {
+                // TODO: precedence
+                case SYMBOL_PLUS -> {
+                    left = parseAdd(left, tokens);
+                }
                 case SYMBOL_BANG, SYMBOL_PAREN_OPEN -> {
                     left = parseCall(left, tokens);
                 }
diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java
index 1f74008d..e7c8d01c 100644
--- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java
+++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java
@@ -10,6 +10,18 @@ public class UntypedNodeMatchers {
     private UntypedNodeMatchers() {
     }
 
+    public static Matcher<UntypedExpressionNode> isUntypedAddNode(
+        Matcher<UntypedExpressionNode> left,
+        Matcher<UntypedExpressionNode> right
+    ) {
+        return instanceOf(
+            UntypedBinaryOperationNode.class,
+            has("operator", x -> x.operator(), equalTo(UntypedBinaryOperator.ADD)),
+            has("left", x -> x.left(), left),
+            has("right", x -> x.right(), right)
+        );
+    }
+
     public static UntypedArgsNodeMatcher isUntypedArgsNode() {
         return UntypedArgsNodeMatcher.empty();
     }
diff --git a/src/test/java/org/shedlang/compiler/parser/ParserAddTests.java b/src/test/java/org/shedlang/compiler/parser/ParserAddTests.java
new file mode 100644
index 00000000..0195c0ae
--- /dev/null
+++ b/src/test/java/org/shedlang/compiler/parser/ParserAddTests.java
@@ -0,0 +1,22 @@
+package org.shedlang.compiler.parser;
+
+import org.junit.jupiter.api.Test;
+
+import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.isUntypedAddNode;
+import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.isUntypedIntLiteralNode;
+import static org.shedlang.compiler.parser.ParserTesting.parseString;
+import static org.zwobble.precisely.AssertThat.assertThat;
+
+public class ParserAddTests {
+    @Test
+    public void canParseAdditionOfTwoPrimaryExpressions() {
+        var source = "1 + 2";
+
+        var node = parseString(source, Parser::parseTopLevelExpression);
+
+        assertThat(node, isUntypedAddNode(
+            isUntypedIntLiteralNode(1),
+            isUntypedIntLiteralNode(2)
+        ));
+    }
+}