From 21c2c5075467151be765b4e77e59d876d258b0c1 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 22 Oct 2023 12:51:37 +0100 Subject: Parse visibility of functions --- .../UntypedFunctionDefinitionNodeMatcher.java | 5 ++++ .../parser/ParserFunctionDefinitionTests.java | 29 ++++++++++++++++++++++ 2 files changed, 34 insertions(+) (limited to 'src/test/java') diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedFunctionDefinitionNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedFunctionDefinitionNodeMatcher.java index b94432da..f50056f0 100644 --- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedFunctionDefinitionNodeMatcher.java +++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedFunctionDefinitionNodeMatcher.java @@ -3,6 +3,7 @@ package org.shedlang.compiler.ast.untyped; import org.pcollections.Empty; import org.pcollections.PVector; import org.shedlang.compiler.testing.MatcherBuilder; +import org.shedlang.compiler.types.Visibility; import org.zwobble.precisely.Matcher; import java.util.Optional; @@ -48,4 +49,8 @@ public class UntypedFunctionDefinitionNodeMatcher extends MatcherBuilder returnType) { return with(has("returnType", x -> x.returnType(), returnType)); } + + public UntypedFunctionDefinitionNodeMatcher withVisibility(Visibility visibility) { + return with(has("visibility", x -> x.visibility(), equalTo(visibility))); + } } diff --git a/src/test/java/org/shedlang/compiler/parser/ParserFunctionDefinitionTests.java b/src/test/java/org/shedlang/compiler/parser/ParserFunctionDefinitionTests.java index d799fa4d..2fa07aa0 100644 --- a/src/test/java/org/shedlang/compiler/parser/ParserFunctionDefinitionTests.java +++ b/src/test/java/org/shedlang/compiler/parser/ParserFunctionDefinitionTests.java @@ -2,6 +2,7 @@ package org.shedlang.compiler.parser; import org.junit.jupiter.api.Test; import org.shedlang.compiler.tokeniser.UnexpectedTokenException; +import org.shedlang.compiler.types.Visibility; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.*; @@ -29,6 +30,34 @@ public class ParserFunctionDefinitionTests { ); } + @Test + public void defaultVisibilityIsPrivate() { + var source = """ + fun f() -> Unit { + }"""; + + var node = parseString(source, Parser::parseNamespaceStatement); + + assertThat( + node, + isUntypedFunctionDefinitionNode().withVisibility(Visibility.PRIVATE) + ); + } + + @Test + public void whenFunIsPrefixWithPubThenVisibilityIsPublic() { + var source = """ + pub fun f() -> Unit { + }"""; + + var node = parseString(source, Parser::parseNamespaceStatement); + + assertThat( + node, + isUntypedFunctionDefinitionNode().withVisibility(Visibility.PUBLIC) + ); + } + @Test public void canParseFunctionWithSinglePositionalParam() { var source = """ -- cgit v1.2.3