From 09dcc2a2c64eb2544d810bbc586241346130d258 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 9 Feb 2025 17:12:36 +0000 Subject: Parse type-level params for function type --- .../untyped/UntypedFunctionTypeNodeMatcher.java | 7 +++++ .../compiler/parser/ParserFunctionTypeTests.java | 32 ++++++++++++++++++++++ 2 files changed, 39 insertions(+) (limited to 'src/test/java') diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedFunctionTypeNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedFunctionTypeNodeMatcher.java index eb13ced4..2c7da346 100644 --- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedFunctionTypeNodeMatcher.java +++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedFunctionTypeNodeMatcher.java @@ -5,6 +5,7 @@ import org.pcollections.PVector; import org.shedlang.compiler.testing.MatcherBuilder; import org.zwobble.precisely.Matcher; +import java.util.List; import java.util.Optional; import static org.zwobble.precisely.Matchers.has; @@ -45,4 +46,10 @@ public class UntypedFunctionTypeNodeMatcher extends MatcherBuilder< public UntypedFunctionTypeNodeMatcher withReturnType(Matcher returnType) { return with(has("returnType", x -> x.returnType(), returnType)); } + + public UntypedFunctionTypeNodeMatcher withTypeLevelParams( + Matcher>> typeLevelParams + ) { + return with(has("typeLevelParams", x -> x.typeLevelParams(), typeLevelParams)); + } } diff --git a/src/test/java/org/shedlang/compiler/parser/ParserFunctionTypeTests.java b/src/test/java/org/shedlang/compiler/parser/ParserFunctionTypeTests.java index 209220ad..319b0252 100644 --- a/src/test/java/org/shedlang/compiler/parser/ParserFunctionTypeTests.java +++ b/src/test/java/org/shedlang/compiler/parser/ParserFunctionTypeTests.java @@ -164,4 +164,36 @@ public class ParserFunctionTypeTests { .withEffect(isOptionalOf(isUntypedTypeLevelReferenceNode("Io"))) ); } + + @Test + public void canParseSingleTypeLevelParam() { + var source = "fn [A]() -> Unit"; + + var node = parseString(source, Parser::parseTopLevelTypeLevelExpression); + + assertThat( + node, + isUntypedFunctionTypeNode() + .withTypeLevelParams(isOptionalOf(isSequence( + isUntypedTypeParamNode("A") + ))) + ); + } + + @Test + public void canParseManyTypeLevelParams() { + var source = "fn [A, B, C]() -> Unit"; + + var node = parseString(source, Parser::parseTopLevelTypeLevelExpression); + + assertThat( + node, + isUntypedFunctionTypeNode() + .withTypeLevelParams(isOptionalOf(isSequence( + isUntypedTypeParamNode("A"), + isUntypedTypeParamNode("B"), + isUntypedTypeParamNode("C") + ))) + ); + } } -- cgit v1.2.3