From 29db69cb40c2fda992a704a50e9159a1a3e23ac9 Mon Sep 17 00:00:00 2001
From: Cliff Click <cliffc@acm.org>
Date: Wed, 4 Sep 2024 08:14:23 -0700
Subject: Backport empty statement fix

Split Ch13 tests from Chapter12Test.java
Handle forward refs never defined.
---
 chapter08/Makefile                                        | 2 +-
 chapter08/src/main/java/com/seaofnodes/simple/Parser.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'chapter08')

diff --git a/chapter08/Makefile b/chapter08/Makefile
index 56f69e12..3c271042 100644
--- a/chapter08/Makefile
+++ b/chapter08/Makefile
@@ -36,7 +36,7 @@ main_javas   := $(wildcard $(SRC)/$(SIMPLE)/*java $(SRC)/$(SIMPLE)/*/*java)
 test_javas   := $(wildcard $(TST)/$(SIMPLE)/*java $(TST)/$(SIMPLE)/*/*java)
 main_classes := $(patsubst $(SRC)/%java,$(CLZDIR)/main/%class,$(main_javas))
 test_classes := $(patsubst $(TST)/%java,$(CLZDIR)/test/%class,$(test_javas))
-test_cp      := $(patsubst $(TST)/$(SIMPLE)/%.java,com.seaofnodes.simple.%,$(test_javas))
+test_cp      := $(patsubst $(TST)/$(SIMPLE)/%.java,com.seaofnodes.simple.%,$(wildcard $(TST)/$(SIMPLE)/*Test.java))
 classes = $(main_classes) $(test_classes)
 # All the libraries
 libs = $(wildcard lib/*jar)
diff --git a/chapter08/src/main/java/com/seaofnodes/simple/Parser.java b/chapter08/src/main/java/com/seaofnodes/simple/Parser.java
index 47e7c2c4..69796828 100644
--- a/chapter08/src/main/java/com/seaofnodes/simple/Parser.java
+++ b/chapter08/src/main/java/com/seaofnodes/simple/Parser.java
@@ -145,6 +145,7 @@ public class Parser {
         else if (matchx("break")) return parseBreak();
         else if (matchx("continue")) return parseContinue();
         else if (matchx("#showGraph")) return require(showGraph(),";");
+        else if (matchx(";")) return null; // Empty statement
         else return parseExpressionStatement();
     }
 
-- 
cgit v1.2.3