From c240d003f4256713dad982f91beaf47b862ce5ad Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 5 Nov 2023 16:17:46 +0000 Subject: Type check body of try node --- .../compiler/ast/typed/TypedNodeMatchers.java | 4 ++ .../compiler/ast/typed/TypedTryNodeMatcher.java | 40 ++++++++++++++++++++ .../compiler/typechecker/TypeCheckerTryTests.java | 43 ++++++++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 src/test/java/org/shedlang/compiler/ast/typed/TypedTryNodeMatcher.java create mode 100644 src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTryTests.java (limited to 'src/test/java') 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 fafb4da6..ec392e5c 100644 --- a/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java +++ b/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java @@ -315,6 +315,10 @@ public class TypedNodeMatchers { ); } + public static TypedTryNodeMatcher isTypedTryNode() { + return TypedTryNodeMatcher.empty(); + } + public static Matcher isTypedTupleNode( Matcher> elements ) { diff --git a/src/test/java/org/shedlang/compiler/ast/typed/TypedTryNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/typed/TypedTryNodeMatcher.java new file mode 100644 index 00000000..b6a124b9 --- /dev/null +++ b/src/test/java/org/shedlang/compiler/ast/typed/TypedTryNodeMatcher.java @@ -0,0 +1,40 @@ +package org.shedlang.compiler.ast.typed; + +import org.pcollections.PVector; +import org.shedlang.compiler.testing.MatcherBuilder; +import org.shedlang.compiler.util.P; +import org.zwobble.precisely.Matcher; + +import static org.zwobble.precisely.Matchers.has; + +public class TypedTryNodeMatcher extends MatcherBuilder< + TypedExpressionNode, + TypedTryNode, + TypedTryNodeMatcher +> { + public static TypedTryNodeMatcher empty() { + return new TypedTryNodeMatcher(P.vector()); + } + + public TypedTryNodeMatcher(PVector> submatchers) { + super(submatchers); + } + + @Override + protected Class expectedType() { + return TypedTryNode.class; + } + + @Override + protected TypedTryNodeMatcher create( + PVector> submatchers + ) { + return new TypedTryNodeMatcher(submatchers); + } + + public TypedTryNodeMatcher withBody( + Matcher body + ) { + return with(has("body", x -> x.body(), body)); + } +} diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTryTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTryTests.java new file mode 100644 index 00000000..32808834 --- /dev/null +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTryTests.java @@ -0,0 +1,43 @@ +package org.shedlang.compiler.typechecker; + +import org.junit.jupiter.api.Test; +import org.shedlang.compiler.ast.untyped.Untyped; +import org.shedlang.compiler.ast.untyped.UntypedTryNode; +import org.shedlang.compiler.types.Effects; +import org.shedlang.compiler.types.NamespaceName; +import org.shedlang.compiler.types.Types; +import org.shedlang.compiler.util.P; + +import java.util.Map; + +import static org.shedlang.compiler.ast.typed.TypedNodeMatchers.*; +import static org.shedlang.compiler.typechecker.TypeCheckerTesting.typeCheckExpression; +import static org.zwobble.precisely.AssertThat.assertThat; +import static org.zwobble.precisely.Matchers.isSequence; + +public class TypeCheckerTryTests { + private static final NamespaceName NAMESPACE_NAME = NamespaceName.of("Example"); + + @Test + public void bodyIsTypeChecked() { + var untyped = UntypedTryNode.builder() + .addBodyStatement(Untyped.expressionStatement(Untyped.intLiteral(42))) + .withHandledEffect(Untyped.typeLevelReference("Empty")) + .build(); + var effect = Effects.userDefined(NAMESPACE_NAME, "Empty"); + var context = TypeCheckerContext.EMPTY + .enterGlobal(P.map( + Map.entry("Empty", Types.effectType(effect)) + )); + + var result = typeCheckExpression(untyped, context); + + assertThat( + result.value(), + isTypedTryNode() + .withBody(isTypedBlockNode(isSequence( + isTypedExpressionStatementNode(isTypedIntLiteralNode(42)) + ))) + ); + } +} -- cgit v1.2.3