From fd8442075faa603b3956d51d81486424624c5355 Mon Sep 17 00:00:00 2001
From: Thalia Archibald <thalia@archibald.dev>
Date: Fri, 21 Jun 2024 12:58:51 -0700
Subject: Backport tests (#87)

* Fix unexpected number parse errors

* Add chapter titles

* Split test files by chapter

* Backport rename Fuzzer08Test to FuzzerWrap

* Replace graph build scripts with Makefile

* Backport Chapter05Test.testRegress1

* Backport require space after 'return'

* Backport check EOF after return statement
---
 chapter04/src/main/java/com/seaofnodes/simple/Parser.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'chapter04/src/main/java/com')

diff --git a/chapter04/src/main/java/com/seaofnodes/simple/Parser.java b/chapter04/src/main/java/com/seaofnodes/simple/Parser.java
index e42613e2..3359f14e 100644
--- a/chapter04/src/main/java/com/seaofnodes/simple/Parser.java
+++ b/chapter04/src/main/java/com/seaofnodes/simple/Parser.java
@@ -406,6 +406,7 @@ public class Parser {
         String getAnyNextToken() {
             if (isEOF()) return "";
             if (isIdStart(peek())) return parseId();
+            if (isNumber(peek())) return parseNumberString();
             if (isPunctuation(peek())) return parsePunctuation();
             return String.valueOf(peek());
         }
@@ -414,13 +415,16 @@ public class Parser {
         boolean isNumber(char ch) {return Character.isDigit(ch);}
 
         private Type parseNumber() {
-            int start = _position;
-            while (isNumber(nextChar())) ;
-            String snum = new String(_input, start, --_position - start);
+            String snum = parseNumberString();
             if (snum.length() > 1 && snum.charAt(0) == '0')
                 throw error("Syntax error: integer values cannot start with '0'");
             return TypeInteger.constant(Long.parseLong(snum));
         }
+        private String parseNumberString() {
+            int start = _position;
+            while (isNumber(nextChar())) ;
+            return new String(_input, start, --_position - start);
+        }
 
         // First letter of an identifier
         private boolean isIdStart(char ch) {
-- 
cgit v1.2.3