aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-07-05 21:45:09 +0100
committerMichael Williamson <mike@zwobble.org>2023-07-05 21:45:09 +0100
commitfa240b137df27cf6a938eb0432ef62ad7ba718e4 (patch)
treebf21089017b12671748be580af0f1b7664ea6fcc /src
parent562f7d9e1d798b0e0d8e83c620690df082fc5139 (diff)
Parse implicit return
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/shedlang/compiler/ast/untyped/UntypedFunctionStatementNode.java2
-rw-r--r--src/main/java/org/shedlang/compiler/ast/untyped/UntypedReturnNode.java9
-rw-r--r--src/main/java/org/shedlang/compiler/parser/Parser.java36
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java6
-rw-r--r--src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java9
-rw-r--r--src/test/java/org/shedlang/compiler/parser/ParserFunctionDefinitionTests.java43
6 files changed, 94 insertions, 11 deletions
diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedFunctionStatementNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedFunctionStatementNode.java
index 45d71235..6ecff062 100644
--- a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedFunctionStatementNode.java
+++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedFunctionStatementNode.java
@@ -1,4 +1,4 @@
package org.shedlang.compiler.ast.untyped;
-public sealed interface UntypedFunctionStatementNode extends UntypedNode permits UntypedExpressionStatementNode, UntypedValNode {
+public sealed interface UntypedFunctionStatementNode extends UntypedNode permits UntypedExpressionStatementNode, UntypedReturnNode, UntypedValNode {
}
diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedReturnNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedReturnNode.java
new file mode 100644
index 00000000..36230db8
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedReturnNode.java
@@ -0,0 +1,9 @@
+package org.shedlang.compiler.ast.untyped;
+
+import org.shedlang.compiler.sources.Source;
+
+public record UntypedReturnNode(
+ UntypedExpressionNode expression,
+ Source source
+) implements UntypedFunctionStatementNode {
+}
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);
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
index 626f1f92..4f8d051b 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
@@ -71,6 +71,9 @@ public class TypeChecker {
case UntypedExpressionStatementNode expressionStatement ->
List.of();
+ case UntypedReturnNode return_ ->
+ List.of();
+
case UntypedValNode val ->
targetVariables(val.target());
};
@@ -307,6 +310,9 @@ public class TypeChecker {
case UntypedExpressionStatementNode expressionStatement ->
typeCheckExpressionStatement(expressionStatement, context);
+ case UntypedReturnNode return_ ->
+ throw new UnsupportedOperationException("TODO");
+
case UntypedValNode val ->
typeCheckVal(val, context);
};
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 ad6c8a49..1f74008d 100644
--- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java
+++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java
@@ -79,6 +79,15 @@ public class UntypedNodeMatchers {
);
}
+ public static Matcher<UntypedFunctionStatementNode> isUntypedReturnNode(
+ Matcher<UntypedExpressionNode> expression
+ ) {
+ return instanceOf(
+ UntypedReturnNode.class,
+ has("expression", x -> x.expression(), expression)
+ );
+ }
+
public static Matcher<UntypedExpressionNode> isUntypedStringLiteralNode(String value) {
return instanceOf(
UntypedStringLiteralNode.class,
diff --git a/src/test/java/org/shedlang/compiler/parser/ParserFunctionDefinitionTests.java b/src/test/java/org/shedlang/compiler/parser/ParserFunctionDefinitionTests.java
index c9961426..0f96b59b 100644
--- a/src/test/java/org/shedlang/compiler/parser/ParserFunctionDefinitionTests.java
+++ b/src/test/java/org/shedlang/compiler/parser/ParserFunctionDefinitionTests.java
@@ -1,6 +1,7 @@
package org.shedlang.compiler.parser;
import org.junit.jupiter.api.Test;
+import org.shedlang.compiler.tokeniser.UnexpectedTokenException;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.*;
@@ -182,7 +183,7 @@ public class ParserFunctionDefinitionTests {
}
@Test
- public void canParseFunctionWithBody() {
+ public void canParseFunctionWithBodyWithoutReturn() {
var source = """
fun f() -> Unit {
a;
@@ -202,4 +203,44 @@ public class ParserFunctionDefinitionTests {
))
);
}
+
+ @Test
+ public void canParseFunctionWithBodyWithImplicitReturn() {
+ var source = """
+ fun f() -> Unit {
+ a;
+ b;
+ c
+ }""";
+
+ var node = parseString(source, Parser::parseNamespaceStatement);
+
+ assertThat(
+ node,
+ isUntypedFunctionDefinitionNode()
+ .withBody(isSequence(
+ isUntypedExpressionStatementNode(isUntypedReferenceNode("a")),
+ isUntypedExpressionStatementNode(isUntypedReferenceNode("b")),
+ isUntypedReturnNode(isUntypedReferenceNode("c"))
+ ))
+ );
+ }
+
+ @Test
+ public void implicitReturnEndsFunction() {
+ var source = """
+ fun f() -> Unit {
+ a;
+ b
+ c
+ }""";
+
+ var error = assertThrows(
+ UnexpectedTokenException.class,
+ () -> parseString(source, Parser::parseNamespaceStatement)
+ );
+
+ assertThat(error.getActual().value(), equalTo("c"));
+ assertThat(error.getExpected(), equalTo(TokenType.SYMBOL_BRACE_CLOSE.toString()));
+ }
}