From 6587267906ea7b43270868b8bdee96bceed17602 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 17 Sep 2023 16:31:02 +0100 Subject: Parse tuple targets --- .../compiler/ast/untyped/UntypedNodeMatchers.java | 9 +++++++++ .../shedlang/compiler/parser/ParserAssignTests.java | 18 +++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) (limited to 'src/test/java') 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 1af0a613..a86c8d6e 100644 --- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java +++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java @@ -197,6 +197,15 @@ public class UntypedNodeMatchers { ); } + public static Matcher isUntypedTargetTupleNode( + Matcher> elements + ) { + return instanceOf( + UntypedTargetNode.Tuple.class, + has("elements", x -> x.elements(), elements) + ); + } + public static Matcher isUntypedTargetValNode(String name) { return instanceOf( UntypedTargetNode.Val.class, diff --git a/src/test/java/org/shedlang/compiler/parser/ParserAssignTests.java b/src/test/java/org/shedlang/compiler/parser/ParserAssignTests.java index 3640db47..9c29d328 100644 --- a/src/test/java/org/shedlang/compiler/parser/ParserAssignTests.java +++ b/src/test/java/org/shedlang/compiler/parser/ParserAssignTests.java @@ -5,10 +5,11 @@ import org.junit.jupiter.api.Test; import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.*; import static org.shedlang.compiler.parser.ParserTesting.parseString; import static org.zwobble.precisely.AssertThat.assertThat; +import static org.zwobble.precisely.Matchers.isSequence; public class ParserAssignTests { @Test - public void canParseAssignAsFunctionStatement() { + public void canParseReassignAsFunctionStatement() { var source = "assign x = y;"; var node = parseString(source, Parser::parseFunctionStatement); @@ -18,4 +19,19 @@ public class ParserAssignTests { isUntypedReferenceNode("y") )); } + + @Test + public void canParseTupleTarget() { + var source = "#(val x, assign y) = z;"; + + var node = parseString(source, Parser::parseFunctionStatement); + + assertThat(node, isUntypedAssignNode( + isUntypedTargetTupleNode(isSequence( + isUntypedTargetValNode("x"), + isUntypedTargetReassignNode("y") + )), + isUntypedReferenceNode("z") + )); + } } -- cgit v1.2.3