From 01193de5040c7200de359ed0775b9ec5c7537ca2 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 31 Oct 2023 18:51:21 +0000 Subject: Parse effect visibility --- .../shedlang/compiler/ast/untyped/UntypedEffectDefinitionNode.java | 5 +---- src/main/java/org/shedlang/compiler/parser/Parser.java | 7 ++++++- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/main/java') 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 66dab2a5..740c7fcb 100644 --- a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNode.java +++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNode.java @@ -5,10 +5,7 @@ import org.shedlang.compiler.types.Visibility; public record UntypedEffectDefinitionNode( String name, + Visibility visibility, Source source ) implements UntypedNamespaceStatementNode, UntypedVariableDeclarationNode { - @Override - public Visibility visibility() { - return Visibility.PRIVATE; - } } diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java index 6be82270..3efdc40b 100644 --- a/src/main/java/org/shedlang/compiler/parser/Parser.java +++ b/src/main/java/org/shedlang/compiler/parser/Parser.java @@ -206,6 +206,8 @@ public class Parser { ) { var start = tokens.position(); + var visibility = parseVisibility(tokens); + tokens.skip(TokenType.KEYWORD_EFFECT); var name = tokens.nextValue(TokenType.IDENTIFIER); @@ -216,7 +218,7 @@ public class Parser { var end = tokens.position(); var source = start.to(end); - return new UntypedEffectDefinitionNode(name, source); + return new UntypedEffectDefinitionNode(name, visibility, source); } private static final Map OPERATION_PARSERS = Stream.of( @@ -617,6 +619,9 @@ public class Parser { case KEYWORD_PUB -> switch (tokens.peek(1).tokenType()) { + case KEYWORD_EFFECT -> + parseEffectDefinition(tokens); + case KEYWORD_FUN -> parseFunctionDefinition(tokens); -- cgit v1.2.3