From a0074f328bfabc0c28d7e5b1202761daaa265fc8 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 27 Sep 2023 20:22:34 +0100 Subject: Parse struct without fields --- .../ast/untyped/UntypedNamespaceStatementNode.java | 2 +- .../ast/untyped/UntypedStructDefinitionNode.java | 12 +++++++ .../untyped/UntypedStructFieldDefinitionNode.java | 10 ++++++ .../java/org/shedlang/compiler/parser/Parser.java | 22 +++++++++++++ .../compiler/typechecker/DeclaredVariables.java | 3 ++ .../shedlang/compiler/typechecker/TypeChecker.java | 8 +++++ .../compiler/ast/untyped/UntypedNodeMatchers.java | 4 +++ .../UntypedStructDefinitionNodeMatcher.java | 37 ++++++++++++++++++++++ .../parser/ParserStructDefinitionTests.java | 26 +++++++++++++++ 9 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNode.java create mode 100644 src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructFieldDefinitionNode.java create mode 100644 src/test/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNodeMatcher.java create mode 100644 src/test/java/org/shedlang/compiler/parser/ParserStructDefinitionTests.java (limited to 'src') 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 90e7142f..16eafcf9 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 { +public sealed interface UntypedNamespaceStatementNode extends UntypedNode permits UntypedAssignNode, UntypedFunctionDefinitionNode, UntypedStructDefinitionNode { } diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNode.java new file mode 100644 index 00000000..49490b8d --- /dev/null +++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNode.java @@ -0,0 +1,12 @@ +package org.shedlang.compiler.ast.untyped; + +import org.shedlang.compiler.sources.Source; + +import java.util.List; + +public record UntypedStructDefinitionNode( + String name, + List fields, + Source source +) implements UntypedNamespaceStatementNode { +} diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructFieldDefinitionNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructFieldDefinitionNode.java new file mode 100644 index 00000000..b2e69866 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructFieldDefinitionNode.java @@ -0,0 +1,10 @@ +package org.shedlang.compiler.ast.untyped; + +import org.shedlang.compiler.sources.Source; + +public record UntypedStructFieldDefinitionNode( + String name, + UntypedTypeLevelExpressionNode type, + Source source +) implements UntypedNode { +} diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java index 831f5732..2bda39ed 100644 --- a/src/main/java/org/shedlang/compiler/parser/Parser.java +++ b/src/main/java/org/shedlang/compiler/parser/Parser.java @@ -452,6 +452,9 @@ public class Parser { case KEYWORD_FUN -> parseFunctionDefinition(tokens); + case KEYWORD_STRUCT -> + parseStructDefinition(tokens); + case KEYWORD_VAL -> parseAssign(tokens); @@ -556,6 +559,25 @@ public class Parser { }; } + private static UntypedNamespaceStatementNode parseStructDefinition(TokenIterator tokens) { + var start = tokens.position(); + + tokens.skip(TokenType.KEYWORD_STRUCT); + + var name = tokens.nextValue(TokenType.IDENTIFIER); + + tokens.skip(TokenType.SYMBOL_PAREN_OPEN); + tokens.skip(TokenType.SYMBOL_PAREN_CLOSE); + + tokens.skip(TokenType.SYMBOL_BRACE_OPEN); + tokens.skip(TokenType.SYMBOL_BRACE_CLOSE); + + var end = tokens.position(); + var source = start.to(end); + + return new UntypedStructDefinitionNode(name, List.of(), source); + } + static UntypedExpressionNode parseSubExpression(TokenIterator tokens, OperatorPrecedence parentPrecedence) { return parseExpression(tokens, Optional.of(parentPrecedence)); } diff --git a/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java b/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java index 7175f51c..b12061f8 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java +++ b/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java @@ -71,6 +71,9 @@ class DeclaredVariables { VariableType.CONSTANT, functionDefinition.source() )); + + case UntypedStructDefinitionNode struct -> + throw new UnsupportedOperationException("TODO"); }; } diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java index eaeadf1a..930efd85 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java @@ -673,12 +673,17 @@ public class TypeChecker { dependencies ); } + case UntypedFunctionDefinitionNode untypedFunctionDefinition -> { dependencyChecker = dependencyChecker.addDeferredDependencies( untypedFunctionDefinition.name(), dependencies ); } + + case UntypedStructDefinitionNode untypedStruct -> { + throw new UnsupportedOperationException("TODO"); + } } } @@ -721,6 +726,9 @@ public class TypeChecker { case UntypedFunctionDefinitionNode functionDefinition -> typeCheckStepsFunctionDefinition(functionDefinition); + + case UntypedStructDefinitionNode structDefinition -> + throw new UnsupportedOperationException("TODO"); }; } 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 0dac3b15..95d666cd 100644 --- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java +++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java @@ -194,6 +194,10 @@ public class UntypedNodeMatchers { ); } + public static UntypedStructDefinitionNodeMatcher isUntypedStructDefinitionNode() { + return UntypedStructDefinitionNodeMatcher.empty(); + } + public static Matcher isUntypedSubNode( Matcher left, Matcher right diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNodeMatcher.java new file mode 100644 index 00000000..5a73f49b --- /dev/null +++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNodeMatcher.java @@ -0,0 +1,37 @@ +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 UntypedStructDefinitionNodeMatcher extends MatcherBuilder { + public static UntypedStructDefinitionNodeMatcher empty() { + return new UntypedStructDefinitionNodeMatcher(P.vector()); + } + + public UntypedStructDefinitionNodeMatcher(PVector> submatchers) { + super(submatchers); + } + + @Override + protected Class expectedType() { + return UntypedStructDefinitionNode.class; + } + + @Override + protected UntypedStructDefinitionNodeMatcher create(PVector> submatchers) { + return new UntypedStructDefinitionNodeMatcher(submatchers); + } + + public UntypedStructDefinitionNodeMatcher withName(String name) { + return with(has("name", x -> x.name(), equalTo(name))); + } + + public UntypedStructDefinitionNodeMatcher withFields(Matcher> fields) { + return with(has("fields", x -> x.fields(), fields)); + } +} diff --git a/src/test/java/org/shedlang/compiler/parser/ParserStructDefinitionTests.java b/src/test/java/org/shedlang/compiler/parser/ParserStructDefinitionTests.java new file mode 100644 index 00000000..8a0fe6b6 --- /dev/null +++ b/src/test/java/org/shedlang/compiler/parser/ParserStructDefinitionTests.java @@ -0,0 +1,26 @@ +package org.shedlang.compiler.parser; + +import org.junit.jupiter.api.Test; + +import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.isUntypedStructDefinitionNode; +import static org.shedlang.compiler.parser.ParserTesting.parseString; +import static org.zwobble.precisely.AssertThat.assertThat; +import static org.zwobble.precisely.Matchers.isSequence; + +public class ParserStructDefinitionTests { + @Test + public void canParseStructWithNoFields() { + var source = """ + struct X() {} + """; + + var node = parseString(source, Parser::parseNamespaceStatement); + + assertThat( + node, + isUntypedStructDefinitionNode() + .withName("X") + .withFields(isSequence()) + ); + } +} -- cgit v1.2.3