diff options
| author | Michael Williamson <mike@zwobble.org> | 2023-10-29 18:23:36 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2023-10-29 18:23:36 +0000 |
| commit | 5ab307fa798626d7f852ebec65f87e2af7487c53 (patch) | |
| tree | 731295fdb7980c979db0a1643e9031104adfd82f /src | |
| parent | 7bc7dbd5f5d73c1c070ed69af2ab143d7a1c199e (diff) | |
Infer return type of function expressions properly
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java | 14 | ||||
| -rw-r--r-- | src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionExpressionTests.java | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java index 15623e98..17cf42a3 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java @@ -627,13 +627,6 @@ public class TypeChecker { ) { var typedSignature = typeCheckFunctionSignature(untyped.signature(), context); - var type = new FunctionType( - functionSignatureToPositionalParams(typedSignature), - functionSignatureToNamedParams(typedSignature), - functionSignatureToEffect(typedSignature), - functionSignatureToReturnType(typedSignature).orElse(Types.UNIT) - ); - var typedBodyResult = typeCheckFunctionBody( untyped.body(), typedSignature, @@ -642,6 +635,13 @@ public class TypeChecker { var typedBody = typedBodyResult.value(); context = typedBodyResult.context(); + var type = new FunctionType( + functionSignatureToPositionalParams(typedSignature), + functionSignatureToNamedParams(typedSignature), + functionSignatureToEffect(typedSignature), + typedBody.type() + ); + var typed = new TypedFunctionExpressionNode( typedSignature, typedBody, diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionExpressionTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionExpressionTests.java index 80627018..35d61efd 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionExpressionTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionExpressionTests.java @@ -43,7 +43,7 @@ public class TypeCheckerFunctionExpressionTests { public void returnTypeCanBeInferred() { var untyped = UntypedFunctionExpressionNode.builder() .withoutReturnType() - .addStatement(Untyped.expressionStatement(Untyped.stringLiteral(""))) + .addStatement(Untyped.functionReturn(Untyped.stringLiteral(""))) .build(); var context = TypeCheckerContext.EMPTY; @@ -52,7 +52,7 @@ public class TypeCheckerFunctionExpressionTests { assertThat( typed.value(), isTypedFunctionExpressionNode() - .withType(new FunctionType(List.of(), List.of(), Effects.NONE, Types.UNIT)) + .withType(new FunctionType(List.of(), List.of(), Effects.NONE, Types.STRING)) ); } } |
