Check that bodies of if are type checked

2 files changed, 56 insertions, 2 deletions

diff --git a/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java b/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java
index fa7fe7ba..8ce4b168 100644
--- a/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java
+++ b/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java
@@ -1,7 +1,5 @@
 package org.shedlang.compiler.ast.typed;
 
-import org.shedlang.compiler.ast.untyped.UntypedBlockNode;
-import org.shedlang.compiler.ast.untyped.UntypedFunctionStatementNode;
 import org.shedlang.compiler.types.Type;
 import org.shedlang.compiler.types.TypeLevelValue;
 import org.zwobble.precisely.Matcher;
@@ -57,6 +55,16 @@ public class TypedNodeMatchers {
         return TypedCallNodeMatcher.empty();
     }
 
+    public static Matcher<TypedConditionalBranchNode> isTypedConditionalBranchNode(
+        Matcher<TypedExpressionNode> condition,
+        Matcher<TypedBlockNode> body
+    ) {
+        return allOf(
+            has("condition", x -> x.condition(), condition),
+            has("body", x -> x.body(), body)
+        );
+    }
+
     public static Matcher<TypedFunctionStatementNode> isTypedExpressionStatementNode(
         Matcher<TypedExpressionNode> expression
     ) {
@@ -79,6 +87,17 @@ public class TypedNodeMatchers {
         );
     }
 
+    public static Matcher<TypedExpressionNode> isTypedIfNode(
+        Matcher<Iterable<? extends TypedConditionalBranchNode>> conditionalBranches,
+        Matcher<TypedBlockNode> elseBody
+    ) {
+        return instanceOf(
+            TypedIfNode.class,
+            has("conditionalBranches", x -> x.conditionalBranches(), conditionalBranches),
+            has("elseBody", x -> x.elseBody(), elseBody)
+        );
+    }
+
     public static Matcher<TypedExpressionNode> isTypedIntAddNode(
         Matcher<TypedExpressionNode> left,
         Matcher<TypedExpressionNode> right
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIfTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIfTests.java
index 47a6cc22..8ec1848e 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIfTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIfTests.java
@@ -9,11 +9,46 @@ import org.shedlang.compiler.types.Types;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.shedlang.compiler.ast.typed.TypedNodeMatchers.*;
 import static org.zwobble.precisely.AssertThat.assertThat;
 import static org.zwobble.precisely.Matchers.equalTo;
+import static org.zwobble.precisely.Matchers.isSequence;
 
 public class TypeCheckerIfTests {
     @Test
+    public void bodiesAreTypedChecked() {
+        var untyped = Untyped.if_(
+            List.of(
+                Untyped.conditionalBranch(
+                    Untyped.boolLiteral(true),
+                    Untyped.block(List.of(
+                        Untyped.blockReturn(Untyped.stringLiteral("a"))
+                    ))
+                )
+            ),
+            Untyped.block(List.of(
+                Untyped.blockReturn(Untyped.stringLiteral("b"))
+            ))
+        );
+
+        var result = TypeChecker.typeCheckExpression(untyped, TypeCheckerContext.EMPTY);
+
+        assertThat(result.value(), isTypedIfNode(
+            isSequence(
+                isTypedConditionalBranchNode(
+                    isTypedBoolLiteralNode(true),
+                    isTypedBlockNode(isSequence(
+                        isTypedBlockReturnNode(isTypedStringLiteralNode("a"))
+                    ))
+                )
+            ),
+            isTypedBlockNode(isSequence(
+                isTypedBlockReturnNode(isTypedStringLiteralNode("b"))
+            ))
+        ));
+    }
+
+    @Test
     public void canTypeCheckIfWithAllBranchesGivingTheSameType() {
         var untyped = Untyped.if_(
             List.of(