From d6afd5049c97159fbcb6e13aa033a07e4f56d181 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 2 Mar 2024 13:50:16 +0000 Subject: Parse effect params --- src/main/java/org/shedlang/compiler/parser/Parser.java | 6 +++++- .../compiler/ast/untyped/UntypedNodeMatchers.java | 7 +++++++ .../compiler/parser/ParserEffectParamTests.java | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 src/test/java/org/shedlang/compiler/parser/ParserEffectParamTests.java (limited to 'src') diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java index 14eb903f..45d3f1b1 100644 --- a/src/main/java/org/shedlang/compiler/parser/Parser.java +++ b/src/main/java/org/shedlang/compiler/parser/Parser.java @@ -1343,12 +1343,16 @@ public class Parser { static UntypedTypeLevelParamNode parseTypeLevelParam(TokenIterator tokens) { var start = tokens.position(); + var isEffectParam = tokens.trySkip(TokenType.SYMBOL_BANG); + var name = tokens.nextValue(TokenType.IDENTIFIER); var end = tokens.position(); var source = start.to(end); - return new UntypedTypeParamNode(name, source); + return isEffectParam + ? new UntypedEffectParamNode(name, source) + : new UntypedTypeParamNode(name, source); } private static UntypedTypeLevelReferenceNode parseTypeLevelReference(TokenIterator tokens) { diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java index cf28b0ad..e0597387 100644 --- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java +++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java @@ -118,6 +118,13 @@ public class UntypedNodeMatchers { ); } + public static Matcher isUntypedEffectParamNode(String name) { + return instanceOf( + UntypedEffectParamNode.class, + has("name", x -> x.name(), equalTo(name)) + ); + } + public static Matcher isUntypedEqualsNode( Matcher left, Matcher right diff --git a/src/test/java/org/shedlang/compiler/parser/ParserEffectParamTests.java b/src/test/java/org/shedlang/compiler/parser/ParserEffectParamTests.java new file mode 100644 index 00000000..dfd970bf --- /dev/null +++ b/src/test/java/org/shedlang/compiler/parser/ParserEffectParamTests.java @@ -0,0 +1,18 @@ +package org.shedlang.compiler.parser; + +import org.junit.jupiter.api.Test; + +import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.isUntypedEffectParamNode; +import static org.shedlang.compiler.parser.ParserTesting.parseString; +import static org.zwobble.precisely.AssertThat.assertThat; + +public class ParserEffectParamTests { + @Test + public void canParseEffectParam() { + var source = "!E"; + + var node = parseString(source, Parser::parseTypeLevelParam); + + assertThat(node, isUntypedEffectParamNode("E")); + } +} -- cgit v1.2.3