From f3bcdfe21627f64c11abda54596eb1388caa74e7 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 22 Oct 2023 13:32:01 +0100 Subject: Add visibility for structs --- .../ast/untyped/UntypedStructDefinitionNode.java | 8 ++++++- .../java/org/shedlang/compiler/parser/Parser.java | 7 +++++- .../compiler/typechecker/DeclaredVariables.java | 2 +- .../UntypedStructDefinitionNodeMatcher.java | 5 +++++ .../parser/ParserStructDefinitionTests.java | 25 ++++++++++++++++++++++ 5 files changed, 44 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNode.java index 706265ba..979b590e 100644 --- a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNode.java +++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNode.java @@ -3,26 +3,30 @@ package org.shedlang.compiler.ast.untyped; import org.pcollections.PVector; import org.shedlang.compiler.sources.Source; import org.shedlang.compiler.sources.Sources; +import org.shedlang.compiler.types.Visibility; import org.shedlang.compiler.util.P; import java.util.List; public record UntypedStructDefinitionNode( String name, + Visibility visibility, List fields, Source source ) implements UntypedNamespaceStatementNode { public static Builder builder() { - return new Builder("X", P.vector()); + return new Builder("X", Visibility.PRIVATE, P.vector()); } public record Builder( String name, + Visibility visibility, PVector fields ) { public UntypedStructDefinitionNode build() { return new UntypedStructDefinitionNode( this.name, + this.visibility, this.fields, Sources.NULL ); @@ -31,6 +35,7 @@ public record UntypedStructDefinitionNode( public Builder withName(String name) { return new Builder( name, + this.visibility, this.fields ); } @@ -38,6 +43,7 @@ public record UntypedStructDefinitionNode( public Builder addField(UntypedStructFieldDefinitionNode field) { return new Builder( this.name, + this.visibility, this.fields.plus(field) ); } diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java index b66fccb1..0151e7d6 100644 --- a/src/main/java/org/shedlang/compiler/parser/Parser.java +++ b/src/main/java/org/shedlang/compiler/parser/Parser.java @@ -509,6 +509,9 @@ public class Parser { case KEYWORD_FUN -> parseFunctionDefinition(tokens); + case KEYWORD_STRUCT -> + parseStructDefinition(tokens); + case KEYWORD_VAL -> parseAssign(tokens); @@ -631,6 +634,8 @@ public class Parser { private static UntypedNamespaceStatementNode parseStructDefinition(TokenIterator tokens) { var start = tokens.position(); + var visibility = parseVisibility(tokens); + tokens.skip(TokenType.KEYWORD_STRUCT); var name = tokens.nextValue(TokenType.IDENTIFIER); @@ -649,7 +654,7 @@ public class Parser { var end = tokens.position(); var source = start.to(end); - return new UntypedStructDefinitionNode(name, fields, source); + return new UntypedStructDefinitionNode(name, visibility, fields, source); } private static UntypedStructFieldDefinitionNode parseStructFieldDefinition(TokenIterator tokens) { diff --git a/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java b/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java index f9878a53..ce057c56 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java +++ b/src/main/java/org/shedlang/compiler/typechecker/DeclaredVariables.java @@ -101,7 +101,7 @@ class DeclaredVariables { variables.plus(new DeclaredVariable( struct.name(), VariableType.CONSTANT, - Visibility.PRIVATE, + struct.visibility(), struct.source() )); diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNodeMatcher.java index 5a73f49b..98bb535f 100644 --- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNodeMatcher.java +++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNodeMatcher.java @@ -2,6 +2,7 @@ package org.shedlang.compiler.ast.untyped; import org.pcollections.PVector; import org.shedlang.compiler.testing.MatcherBuilder; +import org.shedlang.compiler.types.Visibility; import org.shedlang.compiler.util.P; import org.zwobble.precisely.Matcher; @@ -34,4 +35,8 @@ public class UntypedStructDefinitionNodeMatcher extends MatcherBuilder> fields) { return with(has("fields", x -> x.fields(), fields)); } + + public UntypedStructDefinitionNodeMatcher withVisibility(Visibility visibility) { + return with(has("visibility", x -> x.visibility(), equalTo(visibility))); + } } diff --git a/src/test/java/org/shedlang/compiler/parser/ParserStructDefinitionTests.java b/src/test/java/org/shedlang/compiler/parser/ParserStructDefinitionTests.java index 3fd640b1..cfe3e58e 100644 --- a/src/test/java/org/shedlang/compiler/parser/ParserStructDefinitionTests.java +++ b/src/test/java/org/shedlang/compiler/parser/ParserStructDefinitionTests.java @@ -1,6 +1,7 @@ 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.*; import static org.shedlang.compiler.parser.ParserTesting.parseString; @@ -46,4 +47,28 @@ public class ParserStructDefinitionTests { )) ); } + + @Test + public void defaultVisibilityIsPrivate() { + var source = "struct X() {}"; + + var node = parseString(source, Parser::parseNamespaceStatement); + + assertThat( + node, + isUntypedStructDefinitionNode().withVisibility(Visibility.PRIVATE) + ); + } + + @Test + public void whenHasPubPrefixThenVisibilityIsPublic() { + var source = "pub struct X() {}"; + + var node = parseString(source, Parser::parseNamespaceStatement); + + assertThat( + node, + isUntypedStructDefinitionNode().withVisibility(Visibility.PUBLIC) + ); + } } -- cgit v1.2.3