aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/shedlang/compiler/parser
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/shedlang/compiler/parser')
-rw-r--r--src/main/java/org/shedlang/compiler/parser/Parser.java36
1 files changed, 27 insertions, 9 deletions
diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java
index b1794c6c..a2b7b09b 100644
--- a/src/main/java/org/shedlang/compiler/parser/Parser.java
+++ b/src/main/java/org/shedlang/compiler/parser/Parser.java
@@ -71,16 +71,40 @@ public class Parser {
return new UntypedArgsNode(positional, named, argsSource);
}
+ private static List<UntypedFunctionStatementNode> parseBlock(TokenIterator<TokenType> tokens) {
+ tokens.skip(TokenType.SYMBOL_BRACE_OPEN);
+
+ if (tokens.trySkip(TokenType.SYMBOL_BRACE_CLOSE)) {
+ return List.of();
+ }
+
+ var body = new ArrayList<UntypedFunctionStatementNode>();
+
+ while (true) {
+ var statement = parseFunctionStatement(tokens);
+
+ body.add(statement);
+
+ if (tokens.isNext(TokenType.SYMBOL_BRACE_CLOSE) || statement instanceof UntypedReturnNode) {
+ tokens.skip(TokenType.SYMBOL_BRACE_CLOSE);
+ return body;
+ }
+ }
+ }
+
private static UntypedFunctionStatementNode parseExpressionStatement(TokenIterator<TokenType> tokens) {
var start = tokens.position();
var expression = parseTopLevelExpression(tokens);
- tokens.skip(TokenType.SYMBOL_SEMICOLON);
+
+ var isReturn = !tokens.trySkip(TokenType.SYMBOL_SEMICOLON);
var end = tokens.position();
var source = start.to(end);
- return new UntypedExpressionStatementNode(expression, source);
+ return isReturn
+ ? new UntypedReturnNode(expression, source)
+ : new UntypedExpressionStatementNode(expression, source);
}
private static UntypedNamespaceStatementNode parseFunctionDefinition(TokenIterator<TokenType> tokens) {
@@ -103,13 +127,7 @@ public class Parser {
tokens.skip(TokenType.SYMBOL_THIN_ARROW);
var returnType = parseTopLevelTypeLevelExpression(tokens);
- tokens.skip(TokenType.SYMBOL_BRACE_OPEN);
- var body = parseMany(
- () -> tokens.isNext(TokenType.SYMBOL_BRACE_CLOSE),
- () -> parseFunctionStatement(tokens),
- () -> true
- );
- tokens.skip(TokenType.SYMBOL_BRACE_CLOSE);
+ var body = parseBlock(tokens);
var end = tokens.position();
var source = start.to(end);