From f3d28bc5d05eea6d8ed9db603682631290f8da2c Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 5 Nov 2023 20:08:08 +0000 Subject: Throw error if handling field not on effect --- .../compiler/ast/untyped/UntypedTryNode.java | 8 +++++ .../shedlang/compiler/typechecker/TypeChecker.java | 12 ++++++-- .../compiler/typechecker/TypeCheckerTryTests.java | 35 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedTryNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedTryNode.java index c7906c8a..50a5a2c2 100644 --- a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedTryNode.java +++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedTryNode.java @@ -50,5 +50,13 @@ public record UntypedTryNode( this.handlers ); } + + public Builder addHandlerField(UntypedFunctionDefinitionNode handlerField) { + return new Builder( + this.body, + this.handledEffect, + this.handlers.plus(handlerField) + ); + } } } diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java index 44842599..222ddc79 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java @@ -1625,8 +1625,16 @@ public class TypeChecker { var effectInfo = context.userDefinedEffectInfo(handledEffect, typedHandledEffect.source()); // TODO: Don't create unnecessary list - for (var field : effectInfo.fields().stream().toList()) { - throw new MissingEffectHandlerFieldError(field.getKey(), untyped.source()); + for (var effectField : effectInfo.fields().stream().toList()) { + throw new MissingEffectHandlerFieldError(effectField.getKey(), untyped.source()); + } + + for (var handlerField : untyped.handlers()) { + throw new NoSuchFieldError( + Types.effectType(handledEffect), + handlerField.name(), + handlerField.source() + ); } return context.toResult(new TypedTryNode( diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTryTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTryTests.java index 9d2c06b0..c7a98211 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTryTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTryTests.java @@ -3,8 +3,10 @@ package org.shedlang.compiler.typechecker; import org.junit.jupiter.api.Test; import org.shedlang.compiler.ast.untyped.Untyped; import org.shedlang.compiler.ast.untyped.UntypedCallNode; +import org.shedlang.compiler.ast.untyped.UntypedFunctionDefinitionNode; import org.shedlang.compiler.ast.untyped.UntypedTryNode; import org.shedlang.compiler.typechecker.errors.MissingEffectHandlerFieldError; +import org.shedlang.compiler.typechecker.errors.NoSuchFieldError; import org.shedlang.compiler.typechecker.errors.NotUserDefinedEffectError; import org.shedlang.compiler.typechecker.errors.UnexpectedEffectError; import org.shedlang.compiler.types.*; @@ -189,4 +191,37 @@ public class TypeCheckerTryTests { assertThat(error.fieldName(), equalTo("mark")); } + + @Test + public void whenHandlerHasFieldNotInEffectThenErrorIsThrown() { + var handledEffect = Effects.userDefined(NAMESPACE_NAME, "HandledEffect"); + var untyped = UntypedTryNode.builder() + .withHandledEffect(Untyped.typeLevelReference(handledEffect.name())) + .addHandlerField( + UntypedFunctionDefinitionNode.builder() + .withName("mark") + .build() + ) + .build(); + var context = TypeCheckerContext.EMPTY + .addUserDefinedEffectInfo( + handledEffect, + UserDefinedEffectInfo.builder() + .build() + ) + .enterFunction( + P.map( + Map.entry(handledEffect.name(), Variable.defined(Types.effectType(handledEffect), VariableType.CONSTANT)) + ), + Effects.NONE, + Optional.empty() + ); + + var error = assertThrows( + NoSuchFieldError.class, + () -> typeCheckExpression(untyped, context) + ); + + assertThat(error.fieldName(), equalTo("mark")); + } } -- cgit v1.2.3