summaryrefslogtreecommitdiff
path: root/chapter14/src/main/java
diff options
context:
space:
mode:
authorCliff Click <cliffc@acm.org>2024-09-04 08:14:23 -0700
committerThalia Archibald <thalia@archibald.dev>2024-09-07 10:54:48 -0700
commit29db69cb40c2fda992a704a50e9159a1a3e23ac9 (patch)
treee614204f3312a05c26ef1726251929c465903b7c /chapter14/src/main/java
parentfb0315e1d8911534c6ce5a4d3a8b63a2005d6fe5 (diff)
downloadSimple-29db69cb40c2fda992a704a50e9159a1a3e23ac9.tar.gz
Simple-29db69cb40c2fda992a704a50e9159a1a3e23ac9.zip
Backport empty statement fix
Split Ch13 tests from Chapter12Test.java Handle forward refs never defined.
Diffstat (limited to 'chapter14/src/main/java')
-rw-r--r--chapter14/src/main/java/com/seaofnodes/simple/Parser.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/chapter14/src/main/java/com/seaofnodes/simple/Parser.java b/chapter14/src/main/java/com/seaofnodes/simple/Parser.java
index 5720ff8b..b249b0a4 100644
--- a/chapter14/src/main/java/com/seaofnodes/simple/Parser.java
+++ b/chapter14/src/main/java/com/seaofnodes/simple/Parser.java
@@ -181,6 +181,7 @@ public class Parser {
else if (matchx("continue")) return parseContinue();
else if (matchx("struct") ) return parseStruct();
else if (matchx("#showGraph")) return require(showGraph(),";");
+ else if (matchx(";") ) return null; // Empty statement
// declarations of vars with struct type are handled in parseExpressionStatement due
// to ambiguity
else return parseExpressionStatement();
@@ -637,7 +638,8 @@ public class Parser {
if( matchx("new") ) {
String structName = requireId();
Type t = TYPES.get(structName);
- if( t == null || !(t instanceof TypeStruct obj) ) throw errorSyntax("Unknown struct type '" + structName + "'");
+ if( !(t instanceof TypeStruct obj) || obj._fields==null )
+ throw error("Unknown struct type '" + structName + "'");
return newStruct(obj);
}
String name = _lexer.matchId();