From f05dc81d1dd083a90e6d24c00e658f9a4b04e5be Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 4 Nov 2023 17:05:17 +0000 Subject: Add effect info for user defined effects --- .../TypeCheckerEffectDefinitionTests.java | 45 +++++++++++++++++++++- .../shedlang/compiler/types/FieldsInfoTests.java | 6 +-- 2 files changed, 46 insertions(+), 5 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerEffectDefinitionTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerEffectDefinitionTests.java index 60e9dfc2..bf99f75c 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerEffectDefinitionTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerEffectDefinitionTests.java @@ -1,18 +1,25 @@ package org.shedlang.compiler.typechecker; import org.junit.jupiter.api.Test; +import org.shedlang.compiler.ast.untyped.Untyped; import org.shedlang.compiler.ast.untyped.UntypedEffectDefinitionNode; +import org.shedlang.compiler.ast.untyped.UntypedFunctionTypeNode; +import org.shedlang.compiler.sources.Sources; import org.shedlang.compiler.typechecker.errors.CannotDefineEffectOutsideOfNamespaceError; import org.shedlang.compiler.types.Effects; +import org.shedlang.compiler.types.FunctionType; 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.junit.jupiter.api.Assertions.assertThrows; import static org.shedlang.compiler.ast.typed.TypedNodeMatchers.isTypedEffectDefinitionNode; import static org.shedlang.compiler.typechecker.TypeCheckerTesting.typeCheckNamespaceStatement; import static org.zwobble.precisely.AssertThat.assertThat; -import static org.zwobble.precisely.Matchers.equalTo; -import static org.zwobble.precisely.Matchers.isOptionalOf; +import static org.zwobble.precisely.Matchers.*; +import static org.zwobble.precisely.Matchers.isSequence; public class TypeCheckerEffectDefinitionTests { private static final NamespaceName NAMESPACE_NAME = NamespaceName.of("Example"); @@ -47,6 +54,40 @@ public class TypeCheckerEffectDefinitionTests { ); } + @Test + public void effectInfoHasFunctions() { + var untyped = UntypedEffectDefinitionNode.builder() + .withName("ExampleEffect") + .addFunction( + "b", + UntypedFunctionTypeNode.builder() + .withReturnType(Untyped.typeLevelReference("String")) + .build() + ) + .addFunction( + "a", + UntypedFunctionTypeNode.builder() + .withReturnType(Untyped.typeLevelReference("Bool")) + .build() + ) + .build(); + var context = TypeCheckerContext.EMPTY + .enterGlobal(P.map( + Map.entry("String", Types.metaType(Types.STRING)), + Map.entry("Bool", Types.metaType(Types.BOOL)) + )); + + var typed = typeCheckNamespaceStatement(untyped, context); + + assertThat( + typed.context().userDefinedEffectInfo(Effects.userDefined(NAMESPACE_NAME, "ExampleEffect"), Sources.NULL), + has("functions", x -> x.functions().stream().toList(), isSequence( + equalTo(Map.entry("b", FunctionType.builder().withReturnType(Types.STRING).build())), + equalTo(Map.entry("a", FunctionType.builder().withReturnType(Types.BOOL).build())) + )) + ); + } + @Test public void typedNodeHasEffect() { var untyped = UntypedEffectDefinitionNode.builder() diff --git a/src/test/java/org/shedlang/compiler/types/FieldsInfoTests.java b/src/test/java/org/shedlang/compiler/types/FieldsInfoTests.java index a8976376..d86338fc 100644 --- a/src/test/java/org/shedlang/compiler/types/FieldsInfoTests.java +++ b/src/test/java/org/shedlang/compiler/types/FieldsInfoTests.java @@ -12,7 +12,7 @@ import static org.zwobble.precisely.Matchers.equalTo; public class FieldsInfoTests { @Test public void fieldCountReturnsNumberOfFields() { - var namespaceTypeInfo = new FieldsInfo(P.orderedMap( + var namespaceTypeInfo = new FieldsInfo<>(P.orderedMap( Map.entry("a", Types.INT), Map.entry("b", Types.STRING) )); @@ -24,7 +24,7 @@ public class FieldsInfoTests { @Test public void fieldIndexReturnsIndexOfFieldInMap() { - var namespaceTypeInfo = new FieldsInfo(P.orderedMap( + var namespaceTypeInfo = new FieldsInfo<>(P.orderedMap( Map.entry("a", Types.INT), Map.entry("b", Types.STRING) )); @@ -36,7 +36,7 @@ public class FieldsInfoTests { @Test public void whenFieldDoesNotExistThenFieldIndexThrowsError() { - var namespaceTypeInfo = new FieldsInfo(P.orderedMap( + var namespaceTypeInfo = new FieldsInfo<>(P.orderedMap( Map.entry("a", Types.INT), Map.entry("b", Types.STRING) )); -- cgit v1.2.3