diff options
Diffstat (limited to 'src/main/java')
4 files changed, 49 insertions, 2 deletions
diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedExpressionNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedExpressionNode.java index e8f3842d..60f80022 100644 --- a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedExpressionNode.java +++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedExpressionNode.java @@ -1,5 +1,5 @@ package org.shedlang.compiler.ast.untyped; public sealed interface UntypedExpressionNode extends UntypedNode - permits UntypedBinaryOperationNode, UntypedBoolLiteralNode, UntypedCallNode, UntypedFieldAccessNode, UntypedFunctionExpressionNode, UntypedIfNode, UntypedIntLiteralNode, UntypedReferenceNode, UntypedStringLiteralNode, UntypedTupleNode, UntypedWhenNode { + permits UntypedBinaryOperationNode, UntypedBoolLiteralNode, UntypedCallNode, UntypedFieldAccessNode, UntypedFunctionExpressionNode, UntypedIfNode, UntypedIntLiteralNode, UntypedReferenceNode, UntypedStringLiteralNode, UntypedTryNode, UntypedTupleNode, UntypedWhenNode { } diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedTryNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedTryNode.java new file mode 100644 index 00000000..b9146bb3 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedTryNode.java @@ -0,0 +1,13 @@ +package org.shedlang.compiler.ast.untyped; + +import org.shedlang.compiler.sources.Source; + +import java.util.List; + +public record UntypedTryNode( + UntypedBlockNode body, + UntypedTypeLevelExpressionNode handledEffect, + List<UntypedFunctionDefinitionNode> handlers, + Source source +) implements UntypedExpressionNode { +} diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java index 35efa5ab..1ed7799e 100644 --- a/src/main/java/org/shedlang/compiler/parser/Parser.java +++ b/src/main/java/org/shedlang/compiler/parser/Parser.java @@ -363,7 +363,7 @@ public class Parser { } } - private static UntypedNamespaceStatementNode parseFunctionDefinition(TokenIterator<TokenType> tokens) { + private static UntypedFunctionDefinitionNode parseFunctionDefinition(TokenIterator<TokenType> tokens) { var start = tokens.position(); var visibility = parseVisibility(tokens); @@ -808,6 +808,8 @@ public class Parser { case KEYWORD_FN -> parseFunctionExpression(tokens); + case KEYWORD_TRY -> parseTry(tokens); + case KEYWORD_WHEN -> parseWhen(tokens); case STRING -> parseStringLiteral(tokens); @@ -1054,6 +1056,35 @@ public class Parser { }; } + private static UntypedExpressionNode parseTry( + TokenIterator<TokenType> tokens + ) { + var start = tokens.position(); + + tokens.skip(TokenType.KEYWORD_TRY); + + var body = parseBlock(tokens); + + tokens.skip(TokenType.KEYWORD_HANDLE); + + var handledEffect = parseTopLevelTypeLevelExpression(tokens); + + tokens.skip(TokenType.SYMBOL_BRACE_OPEN); + + var handlers = parseMany( + () -> tokens.isNext(TokenType.SYMBOL_BRACE_CLOSE), + () -> parseFunctionDefinition(tokens), + () -> true + ); + + tokens.skip(TokenType.SYMBOL_BRACE_CLOSE); + + var end = tokens.position(); + var source = start.to(end); + + return new UntypedTryNode(body, handledEffect, handlers, source); + } + private static UntypedExpressionNode parseTuple( TokenIterator<TokenType> tokens ) { diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java index 3dcf8965..bdf185f8 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java @@ -424,6 +424,9 @@ public class TypeChecker { case UntypedStringLiteralNode untypedStringLiteral -> typeCheckStringLiteral(untypedStringLiteral, context); + case UntypedTryNode untypedTry -> + throw new UnsupportedOperationException("TODO"); + case UntypedTupleNode untypedTuple -> typeCheckTuple(untypedTuple, context); |