aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-10-31 19:09:16 +0000
committerMichael Williamson <mike@zwobble.org>2023-10-31 19:09:16 +0000
commit7a72d57dae13ab993baaa77f54023c062e56025d (patch)
tree66399c2e1e96c9d1fd3797d26d7efd08d532511d /src
parent01193de5040c7200de359ed0775b9ec5c7537ca2 (diff)
Parse effect functions
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionFunctionNode.java10
-rw-r--r--src/main/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNode.java3
-rw-r--r--src/main/java/org/shedlang/compiler/parser/Parser.java47
-rw-r--r--src/test/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNodeMatcher.java6
-rw-r--r--src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java10
-rw-r--r--src/test/java/org/shedlang/compiler/parser/ParserEffectDefinitionTests.java53
6 files changed, 126 insertions, 3 deletions
diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionFunctionNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionFunctionNode.java
new file mode 100644
index 00000000..8940eb24
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionFunctionNode.java
@@ -0,0 +1,10 @@
+package org.shedlang.compiler.ast.untyped;
+
+import org.shedlang.compiler.sources.Source;
+
+public record UntypedEffectDefinitionFunctionNode(
+ String name,
+ UntypedFunctionTypeNode type,
+ Source source
+) implements UntypedNode {
+}
diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNode.java
index 740c7fcb..48e6fdf0 100644
--- a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNode.java
+++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNode.java
@@ -3,9 +3,12 @@ package org.shedlang.compiler.ast.untyped;
import org.shedlang.compiler.sources.Source;
import org.shedlang.compiler.types.Visibility;
+import java.util.List;
+
public record UntypedEffectDefinitionNode(
String name,
Visibility visibility,
+ List<UntypedEffectDefinitionFunctionNode> functions,
Source source
) implements UntypedNamespaceStatementNode, UntypedVariableDeclarationNode {
}
diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java
index 3efdc40b..46a175f0 100644
--- a/src/main/java/org/shedlang/compiler/parser/Parser.java
+++ b/src/main/java/org/shedlang/compiler/parser/Parser.java
@@ -213,12 +213,57 @@ public class Parser {
var name = tokens.nextValue(TokenType.IDENTIFIER);
tokens.skip(TokenType.SYMBOL_BRACE_OPEN);
+
+ var functions = parseMany(
+ () -> tokens.isNext(TokenType.SYMBOL_BRACE_CLOSE),
+ () -> parseEffectDefinitionFunction(tokens),
+ () -> true
+ );
+
tokens.skip(TokenType.SYMBOL_BRACE_CLOSE);
var end = tokens.position();
var source = start.to(end);
- return new UntypedEffectDefinitionNode(name, visibility, source);
+ return new UntypedEffectDefinitionNode(name, visibility, functions, source);
+ }
+
+ private static UntypedEffectDefinitionFunctionNode parseEffectDefinitionFunction(
+ TokenIterator<TokenType> tokens
+ ) {
+ var start = tokens.position();
+
+ tokens.skip(TokenType.KEYWORD_FUN);
+
+ var name = tokens.nextValue(TokenType.IDENTIFIER);
+
+ var type = parseEffectDefinitionFunctionType(tokens);
+
+ tokens.skip(TokenType.SYMBOL_SEMICOLON);
+
+ var end = tokens.position();
+ var source = start.to(end);
+
+ return new UntypedEffectDefinitionFunctionNode(name, type, source);
+ }
+
+ private static UntypedFunctionTypeNode parseEffectDefinitionFunctionType(
+ TokenIterator<TokenType> tokens
+ ) {
+ var start = tokens.position();
+
+ tokens.skip(TokenType.SYMBOL_PAREN_OPEN);
+ var params = parseParamTypes(tokens);
+ tokens.skip(TokenType.SYMBOL_PAREN_CLOSE);
+
+ tokens.skip(TokenType.SYMBOL_THIN_ARROW);
+
+ var returnType = parseTopLevelTypeLevelExpression(tokens);
+
+ var end = tokens.position();
+ var source = start.to(end);
+
+ return new UntypedFunctionTypeNode(params, Optional.empty(), returnType, source);
}
private static final Map<TokenType, OperationParser> OPERATION_PARSERS = Stream.of(
diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNodeMatcher.java
index a0730475..3f32cb2f 100644
--- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNodeMatcher.java
+++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNodeMatcher.java
@@ -43,4 +43,10 @@ public class UntypedEffectDefinitionNodeMatcher extends MatcherBuilder<
public UntypedEffectDefinitionNodeMatcher withVisibility(Visibility visibility) {
return with(has("visibility", x -> x.visibility(), equalTo(visibility)));
}
+
+ public UntypedEffectDefinitionNodeMatcher withFunctions(
+ Matcher<Iterable<? extends UntypedEffectDefinitionFunctionNode>> functions
+ ) {
+ return with(has("functions", x -> x.functions(), functions));
+ }
}
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 cadf11f8..517ca77a 100644
--- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java
+++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java
@@ -88,6 +88,16 @@ public class UntypedNodeMatchers {
return UntypedEffectDefinitionNodeMatcher.empty();
}
+ public static Matcher<UntypedEffectDefinitionFunctionNode> isUntypedEffectDefinitionFunctionNode(
+ String name,
+ Matcher<? super UntypedFunctionTypeNode> type
+ ) {
+ return allOf(
+ has("name", x -> x.name(), equalTo(name)),
+ has("type", x -> x.type(), type)
+ );
+ }
+
public static Matcher<UntypedExpressionNode> isUntypedEqualsNode(
Matcher<UntypedExpressionNode> left,
Matcher<UntypedExpressionNode> right
diff --git a/src/test/java/org/shedlang/compiler/parser/ParserEffectDefinitionTests.java b/src/test/java/org/shedlang/compiler/parser/ParserEffectDefinitionTests.java
index 6fc623ca..03204719 100644
--- a/src/test/java/org/shedlang/compiler/parser/ParserEffectDefinitionTests.java
+++ b/src/test/java/org/shedlang/compiler/parser/ParserEffectDefinitionTests.java
@@ -3,13 +3,14 @@ package org.shedlang.compiler.parser;
import org.junit.jupiter.api.Test;
import org.shedlang.compiler.types.Visibility;
-import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.isUntypedEffectDefinitionNode;
+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 ParserEffectDefinitionTests {
@Test
- public void canParseEffectWithNoFunctions() {
+ public void canParseEffectName() {
var source = """
effect State {
}""";
@@ -50,4 +51,52 @@ public class ParserEffectDefinitionTests {
isUntypedEffectDefinitionNode().withVisibility(Visibility.PUBLIC)
);
}
+
+ @Test
+ public void canParseEffectWithNoFunctions() {
+ var source = """
+ effect State {
+ }""";
+
+ var node = parseString(source, Parser::parseNamespaceStatement);
+
+ assertThat(
+ node,
+ isUntypedEffectDefinitionNode()
+ .withFunctions(isSequence())
+ );
+ }
+
+ @Test
+ public void canParseEffectFunctions() {
+ var source = """
+ effect State {
+ fun get() -> Int;
+ fun set(Int) -> Unit;
+ }""";
+
+ var node = parseString(source, Parser::parseNamespaceStatement);
+
+ assertThat(
+ node,
+ isUntypedEffectDefinitionNode()
+ .withFunctions(isSequence(
+ isUntypedEffectDefinitionFunctionNode(
+ "get",
+ isUntypedFunctionTypeNode()
+ .withParams(isUntypedFunctionTypeParamsNode(isSequence(), isSequence()))
+ .withReturnType(isUntypedTypeLevelReferenceNode("Int"))
+ ),
+ isUntypedEffectDefinitionFunctionNode(
+ "set",
+ isUntypedFunctionTypeNode()
+ .withParams(isUntypedFunctionTypeParamsNode(
+ isSequence(isUntypedTypeLevelReferenceNode("Int")),
+ isSequence()
+ ))
+ .withReturnType(isUntypedTypeLevelReferenceNode("Unit"))
+ )
+ ))
+ );
+ }
}