From f3aea758bcab9bbf07cca29d9e705aa112d94bad Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Thu, 2 Nov 2023 19:07:48 +0000
Subject: Allow resume statements without expression

---
 .../compiler/ast/untyped/UntypedNodeMatchers.java       |  2 +-
 .../compiler/parser/ParserFunctionResumeTests.java      | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'src/test/java')

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 e08c8198..8fd2ce41 100644
--- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java
+++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java
@@ -243,7 +243,7 @@ public class UntypedNodeMatchers {
     }
 
     public static Matcher<UntypedFunctionStatementNode> isUntypedResumeNode(
-        Matcher<UntypedExpressionNode> expression
+        Matcher<Optional<? extends UntypedExpressionNode>> expression
     ) {
         return instanceOf(
             UntypedResumeNode.class,
diff --git a/src/test/java/org/shedlang/compiler/parser/ParserFunctionResumeTests.java b/src/test/java/org/shedlang/compiler/parser/ParserFunctionResumeTests.java
index c581a4f9..8e134656 100644
--- a/src/test/java/org/shedlang/compiler/parser/ParserFunctionResumeTests.java
+++ b/src/test/java/org/shedlang/compiler/parser/ParserFunctionResumeTests.java
@@ -5,14 +5,27 @@ import org.junit.jupiter.api.Test;
 import static org.shedlang.compiler.ast.untyped.UntypedNodeMatchers.*;
 import static org.shedlang.compiler.parser.ParserTesting.parseString;
 import static org.zwobble.precisely.AssertThat.assertThat;
+import static org.zwobble.precisely.Matchers.isOptionalEmpty;
+import static org.zwobble.precisely.Matchers.isOptionalOf;
 
 public class ParserFunctionResumeTests {
     @Test
-    public void canParseResume() {
+    public void canParseResumeWithExpression() {
         var source = "resume x;";
 
         var node = parseString(source, Parser::parseFunctionStatement);
 
-        assertThat(node, isUntypedResumeNode(isUntypedReferenceNode("x")));
+        assertThat(node, isUntypedResumeNode(isOptionalOf(
+            isUntypedReferenceNode("x"))
+        ));
+    }
+
+    @Test
+    public void canParseResumeWithoutExpression() {
+        var source = "resume;";
+
+        var node = parseString(source, Parser::parseFunctionStatement);
+
+        assertThat(node, isUntypedResumeNode(isOptionalEmpty()));
     }
 }
-- 
cgit v1.2.3