From 7bc7dbd5f5d73c1c070ed69af2ab143d7a1c199e Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 29 Oct 2023 18:22:31 +0000 Subject: Support inferring return type from multiple return statements --- .../org/shedlang/compiler/typechecker/TypeChecker.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java index 0ceca376..15623e98 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java @@ -682,14 +682,13 @@ public class TypeChecker { ); } case ReturnTypeState.ImplicitLowerBound implicitLowerBound -> { - throw new UnsupportedOperationException("TODO"); -// var supertype = Types.commonSupertype(List.of( -// implicitLowerBound.type(), -// returnValueType -// )); -// context = context.updateReturnTypeState( -// ReturnTypeState.implicitLowerBound(supertype) -// ); + var supertype = Types.commonSupertype(List.of( + implicitLowerBound.type(), + returnValueType + )); + context = context.updateReturnTypeState( + ReturnTypeState.implicitLowerBound(supertype) + ); } case ReturnTypeState.NotInFunction notInFunction -> { // This should be syntactically impossible, but since we only have -- cgit v1.2.3