From 375a1bfb7fbc08a55bde8866a3f67fc6e460c808 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 31 Oct 2023 18:49:10 +0000 Subject: Parse empty effect definitions --- .../ast/untyped/UntypedEffectDefinitionNode.java | 14 ++++++++ .../ast/untyped/UntypedNamespaceStatementNode.java | 2 +- .../java/org/shedlang/compiler/parser/Parser.java | 21 +++++++++++ .../compiler/typechecker/DeclaredVariables.java | 6 ++++ .../shedlang/compiler/typechecker/TypeChecker.java | 10 ++++++ .../UntypedEffectDefinitionNodeMatcher.java | 41 ++++++++++++++++++++++ .../compiler/ast/untyped/UntypedNodeMatchers.java | 4 +++ .../parser/ParserEffectDefinitionTests.java | 24 +++++++++++++ 8 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNode.java create mode 100644 src/test/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNodeMatcher.java create mode 100644 src/test/java/org/shedlang/compiler/parser/ParserEffectDefinitionTests.java (limited to 'src') diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNode.java new file mode 100644 index 00000000..66dab2a5 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNode.java @@ -0,0 +1,14 @@ +package org.shedlang.compiler.ast.untyped; + +import org.shedlang.compiler.sources.Source; +import org.shedlang.compiler.types.Visibility; + +public record UntypedEffectDefinitionNode( + String name, + Source source +) implements UntypedNamespaceStatementNode, UntypedVariableDeclarationNode { + @Override + public Visibility visibility() { + return Visibility.PRIVATE; + } +} diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedNamespaceStatementNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedNamespaceStatementNode.java index ac229649..8d94d5b8 100644 --- a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedNamespaceStatementNode.java +++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedNamespaceStatementNode.java @@ -1,4 +1,4 @@ package org.shedlang.compiler.ast.untyped; -public sealed interface UntypedNamespaceStatementNode extends UntypedNode permits UntypedAssignNode, UntypedFunctionDefinitionNode, UntypedStructDefinitionNode, UntypedSumTypeDefinitionNode { +public sealed interface UntypedNamespaceStatementNode extends UntypedNode permits UntypedAssignNode, UntypedEffectDefinitionNode, UntypedFunctionDefinitionNode, UntypedStructDefinitionNode, UntypedSumTypeDefinitionNode { } diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java index cf01705d..6be82270 100644 --- a/src/main/java/org/shedlang/compiler/parser/Parser.java +++ b/src/main/java/org/shedlang/compiler/parser/Parser.java @@ -201,6 +201,24 @@ public class Parser { } } + private static UntypedEffectDefinitionNode parseEffectDefinition( + TokenIterator tokens + ) { + var start = tokens.position(); + + tokens.skip(TokenType.KEYWORD_EFFECT); + + var name = tokens.nextValue(TokenType.IDENTIFIER); + + tokens.skip(TokenType.SYMBOL_BRACE_OPEN); + tokens.skip(TokenType.SYMBOL_BRACE_CLOSE); + + var end = tokens.position(); + var source = start.to(end); + + return new UntypedEffectDefinitionNode(name, source); + } + private static final Map OPERATION_PARSERS = Stream.of( new FieldAccessParser(), new BinaryOperationParser(TokenType.SYMBOL_EQUALS_EQUALS, OperatorPrecedence.EQUALS, UntypedBinaryOperator.EQUALS), @@ -591,6 +609,9 @@ public class Parser { static UntypedNamespaceStatementNode parseNamespaceStatement(TokenIterator tokens) { return switch (tokens.peek().tokenType()) { + case KEYWORD_EFFECT -> + parseEffectDefinition(tokens); + case KEYWORD_FUN -> parseFunctionDefinition(tokens); diff --git a/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java b/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java index 35af5842..5134b490 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java +++ b/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java @@ -86,6 +86,12 @@ class DeclaredVariables { case UntypedAssignNode assign -> forAssign(assign, variables); + case UntypedEffectDefinitionNode effectDefinition -> + variables.plus(DeclaredVariable.fromNode( + VariableType.CONSTANT, + effectDefinition + )); + case UntypedFunctionDefinitionNode functionDefinition -> variables.plus(DeclaredVariable.fromNode( VariableType.CONSTANT, diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java index 3f430b9e..3dcf8965 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java @@ -1040,6 +1040,13 @@ public class TypeChecker { ); } + case UntypedEffectDefinitionNode untypedEffectDefinition -> { + dependencyChecker = dependencyChecker.addDeferredDependencies( + untypedEffectDefinition.name(), + Set.of() + ); + } + case UntypedFunctionDefinitionNode untypedFunctionDefinition -> { dependencyChecker = dependencyChecker.addDeferredDependencies( untypedFunctionDefinition.name(), @@ -1116,6 +1123,9 @@ public class TypeChecker { case UntypedAssignNode assign -> typeCheckStepsAssign(assign); + case UntypedEffectDefinitionNode effectDefinition -> + throw new UnsupportedOperationException("TODO"); + case UntypedFunctionDefinitionNode functionDefinition -> typeCheckStepsFunctionDefinition(functionDefinition); diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNodeMatcher.java new file mode 100644 index 00000000..33c64c7d --- /dev/null +++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNodeMatcher.java @@ -0,0 +1,41 @@ +package org.shedlang.compiler.ast.untyped; + +import org.pcollections.PVector; +import org.shedlang.compiler.testing.MatcherBuilder; +import org.shedlang.compiler.util.P; +import org.zwobble.precisely.Matcher; + +import static org.zwobble.precisely.Matchers.equalTo; +import static org.zwobble.precisely.Matchers.has; + +public class UntypedEffectDefinitionNodeMatcher extends MatcherBuilder< + UntypedNamespaceStatementNode, + UntypedEffectDefinitionNode, + UntypedEffectDefinitionNodeMatcher +> { + public static UntypedEffectDefinitionNodeMatcher empty() { + return new UntypedEffectDefinitionNodeMatcher(P.vector()); + } + + public UntypedEffectDefinitionNodeMatcher( + PVector> submatchers + ) { + super(submatchers); + } + + @Override + protected Class expectedType() { + return UntypedEffectDefinitionNode.class; + } + + @Override + protected UntypedEffectDefinitionNodeMatcher create( + PVector> submatchers + ) { + return new UntypedEffectDefinitionNodeMatcher(submatchers); + } + + public UntypedEffectDefinitionNodeMatcher withName(String name) { + return with(has("name", x -> x.name(), equalTo(name))); + } +} 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 4810f7e7..cadf11f8 100644 --- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java +++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java @@ -84,6 +84,10 @@ public class UntypedNodeMatchers { ); } + public static UntypedEffectDefinitionNodeMatcher isUntypedEffectDefinitionNode() { + return UntypedEffectDefinitionNodeMatcher.empty(); + } + public static Matcher isUntypedEqualsNode( Matcher left, Matcher right diff --git a/src/test/java/org/shedlang/compiler/parser/ParserEffectDefinitionTests.java b/src/test/java/org/shedlang/compiler/parser/ParserEffectDefinitionTests.java new file mode 100644 index 00000000..e697c542 --- /dev/null +++ b/src/test/java/org/shedlang/compiler/parser/ParserEffectDefinitionTests.java @@ -0,0 +1,24 @@ +package org.shedlang.compiler.parser; + +import org.junit.jupiter.api.Test; + +import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.isUntypedEffectDefinitionNode; +import static org.shedlang.compiler.parser.ParserTesting.parseString; +import static org.zwobble.precisely.AssertThat.assertThat; + +public class ParserEffectDefinitionTests { + @Test + public void canParseEffectWithNoFunctions() { + var source = """ + effect State { + }"""; + + var node = parseString(source, Parser::parseNamespaceStatement); + + assertThat( + node, + isUntypedEffectDefinitionNode() + .withName("State") + ); + } +} -- cgit v1.2.3