From 5494b33b978fc8ed1f50e63feb658de43bf78f58 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Wed, 22 Nov 2023 21:40:19 +0000
Subject: Rename UntypedBranchingExpressionNode to
 UntypedExpressionWithChildBlocksNode

---
 .../compiler/ast/untyped/UntypedBranchingExpressionNode.java         | 5 -----
 .../compiler/ast/untyped/UntypedExpressionWithChildBlocksNode.java   | 5 +++++
 src/main/java/org/shedlang/compiler/ast/untyped/UntypedIfNode.java   | 4 ++--
 src/main/java/org/shedlang/compiler/ast/untyped/UntypedTryNode.java  | 4 ++--
 src/main/java/org/shedlang/compiler/parser/Parser.java               | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 src/main/java/org/shedlang/compiler/ast/untyped/UntypedBranchingExpressionNode.java
 create mode 100644 src/main/java/org/shedlang/compiler/ast/untyped/UntypedExpressionWithChildBlocksNode.java

(limited to 'src/main/java')

diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedBranchingExpressionNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedBranchingExpressionNode.java
deleted file mode 100644
index 1e7f18ff..00000000
--- a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedBranchingExpressionNode.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.shedlang.compiler.ast.untyped;
-
-public interface UntypedBranchingExpressionNode {
-    Iterable<UntypedBlockNode> exhaustiveBranchBodies();
-}
diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedExpressionWithChildBlocksNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedExpressionWithChildBlocksNode.java
new file mode 100644
index 00000000..3da1e6b3
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedExpressionWithChildBlocksNode.java
@@ -0,0 +1,5 @@
+package org.shedlang.compiler.ast.untyped;
+
+public interface UntypedExpressionWithChildBlocksNode {
+    Iterable<UntypedBlockNode> exhaustiveChildBlocks();
+}
diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedIfNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedIfNode.java
index da9a04e1..b69c767f 100644
--- a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedIfNode.java
+++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedIfNode.java
@@ -9,9 +9,9 @@ public record UntypedIfNode(
     List<UntypedConditionalBranchNode> conditionalBranches,
     UntypedBlockNode elseBody,
     Source source
-) implements UntypedBranchingExpressionNode, UntypedExpressionNode {
+) implements UntypedExpressionWithChildBlocksNode, UntypedExpressionNode {
     @Override
-    public Iterable<UntypedBlockNode> exhaustiveBranchBodies() {
+    public Iterable<UntypedBlockNode> exhaustiveChildBlocks() {
         return Lists.concat(
             conditionalBranches.stream().map(branch -> branch.body()).toList(),
             List.of(elseBody)
diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedTryNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedTryNode.java
index 70a7e2bb..323f7fca 100644
--- a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedTryNode.java
+++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedTryNode.java
@@ -12,9 +12,9 @@ public record UntypedTryNode(
     UntypedTypeLevelExpressionNode handledEffect,
     List<UntypedTryHandlerMethodNode> handlerMethods,
     Source source
-) implements UntypedBranchingExpressionNode, UntypedExpressionNode {
+) implements UntypedExpressionWithChildBlocksNode, UntypedExpressionNode {
     @Override
-    public Iterable<UntypedBlockNode> exhaustiveBranchBodies() {
+    public Iterable<UntypedBlockNode> exhaustiveChildBlocks() {
         return List.of(body);
     }
 
diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java
index 72bbbb32..7b7e8358 100644
--- a/src/main/java/org/shedlang/compiler/parser/Parser.java
+++ b/src/main/java/org/shedlang/compiler/parser/Parser.java
@@ -305,8 +305,8 @@ public class Parser {
 
         var expression = parseTopLevelExpression(tokens);
 
-        var isReturn = expression instanceof UntypedBranchingExpressionNode branchingExpression
-            ? expressionStatementBehaviour(branchingExpression.exhaustiveBranchBodies()) == UntypedFunctionStatementBehaviour.BLOCK_RETURN
+        var isReturn = expression instanceof UntypedExpressionWithChildBlocksNode branchingExpression
+            ? expressionStatementBehaviour(branchingExpression.exhaustiveChildBlocks()) == UntypedFunctionStatementBehaviour.BLOCK_RETURN
             : !tokens.trySkip(TokenType.SYMBOL_SEMICOLON);
 
         var end = tokens.position();
-- 
cgit v1.2.3