Parse constructed types

2 files changed, 66 insertions, 0 deletions

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 5b290949..7ad42734 100644
--- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java
+++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java
@@ -93,6 +93,17 @@ public class UntypedNodeMatchers {
         );
     }
 
+    public static Matcher<UntypedTypeLevelExpressionNode> isUntypedConstructedTypeNode(
+        Matcher<UntypedTypeLevelExpressionNode> receiver,
+        Matcher<Iterable<? extends UntypedTypeLevelExpressionNode>> args
+    ) {
+        return instanceOf(
+            UntypedConstructedTypeNode.class,
+            has("receiver", x -> x.receiver(), receiver),
+            has("args", x -> x.args(), args)
+        );
+    }
+
     public static UntypedEffectDefinitionNodeMatcher isUntypedEffectDefinitionNode() {
         return UntypedEffectDefinitionNodeMatcher.empty();
     }
diff --git a/src/test/java/org/shedlang/compiler/parser/ParserConstructedTypeTests.java b/src/test/java/org/shedlang/compiler/parser/ParserConstructedTypeTests.java
new file mode 100644
index 00000000..9221d000
--- /dev/null
+++ b/src/test/java/org/shedlang/compiler/parser/ParserConstructedTypeTests.java
@@ -0,0 +1,55 @@
+package org.shedlang.compiler.parser;
+
+import org.junit.jupiter.api.Test;
+
+import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.isUntypedConstructedTypeNode;
+import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.isUntypedTypeLevelReferenceNode;
+import static org.shedlang.compiler.parser.ParserTesting.parseString;
+import static org.zwobble.precisely.AssertThat.assertThat;
+import static org.zwobble.precisely.Matchers.isSequence;
+
+public class ParserConstructedTypeTests {
+    @Test
+    public void canParseConstructedTypeWithOneArg() {
+        var source = "List[String]";
+
+        var node = parseString(source, Parser::parseTopLevelTypeLevelExpression);
+
+        assertThat(node, isUntypedConstructedTypeNode(
+            isUntypedTypeLevelReferenceNode("List"),
+            isSequence(
+                isUntypedTypeLevelReferenceNode("String")
+            )
+        ));
+    }
+
+    @Test
+    public void canParseConstructedTypeWithMultipleArgs() {
+        var source = "X[T1, T2, T3]";
+
+        var node = parseString(source, Parser::parseTopLevelTypeLevelExpression);
+
+        assertThat(node, isUntypedConstructedTypeNode(
+            isUntypedTypeLevelReferenceNode("X"),
+            isSequence(
+                isUntypedTypeLevelReferenceNode("T1"),
+                isUntypedTypeLevelReferenceNode("T2"),
+                isUntypedTypeLevelReferenceNode("T3")
+            )
+        ));
+    }
+
+    @Test
+    public void argsCanHaveTrailingComma() {
+        var source = "List[String,]";
+
+        var node = parseString(source, Parser::parseTopLevelTypeLevelExpression);
+
+        assertThat(node, isUntypedConstructedTypeNode(
+            isUntypedTypeLevelReferenceNode("List"),
+            isSequence(
+                isUntypedTypeLevelReferenceNode("String")
+            )
+        ));
+    }
+}