1 files changed, 23 insertions, 2 deletions
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
index 3eff92bf..651a4f79 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
@@ -559,8 +559,8 @@ public class TypeChecker {
             case UntypedVarNode var ->
                 typeCheckVar(var, context);
 
-            case UntypedWhileNode untypedWhileNode ->
-                throw new UnsupportedOperationException("TODO");
+            case UntypedWhileNode while_ ->
+                typeCheckWhile(while_, context);
         };
     }
 
@@ -885,4 +885,25 @@ public class TypeChecker {
             }
         };
     }
+
+    private static TypeCheckerResult<TypedFunctionStatementNode> typeCheckWhile(
+        UntypedWhileNode untyped,
+        TypeCheckerContext context
+    ) {
+        var typedConditionResult = typeCheckExpression(untyped.condition(), context);
+        var typedCondition = typedConditionResult.value();
+        context = typedConditionResult.context();
+
+        checkExpressionType(typedCondition, Types.BOOL, context);
+
+        var typedBodyResult = typeCheckBlockNested(untyped.body(), context);
+        var typedBody = typedBodyResult.value();
+        context = typedBodyResult.context();
+
+        return context.toResult(new TypedWhileNode(
+            typedCondition,
+            typedBody,
+            untyped.source()
+        ));
+    }
 }