From 02af075e89fbdeb22575f235a3acb2607e0b4edf Mon Sep 17 00:00:00 2001
From: Ben Culkin <scorpress@gmail.com>
Date: Tue, 27 Sep 2022 19:18:09 -0400
Subject: Minor changes

---
 JPratt/src/main/java/bjc/pratt/tokens/StringTokenStream.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'JPratt/src/main/java/bjc/pratt/tokens/StringTokenStream.java')

diff --git a/JPratt/src/main/java/bjc/pratt/tokens/StringTokenStream.java b/JPratt/src/main/java/bjc/pratt/tokens/StringTokenStream.java
index 8c7fcec..70876f2 100644
--- a/JPratt/src/main/java/bjc/pratt/tokens/StringTokenStream.java
+++ b/JPratt/src/main/java/bjc/pratt/tokens/StringTokenStream.java
@@ -33,6 +33,9 @@ public class StringTokenStream extends TokenStream<String, String> {
 
 	@Override
 	public Token<String, String> current() {
+		// Prime stream if necessary
+		if (curr == null)
+			return next();
 		return curr;
 	}
 
@@ -70,6 +73,8 @@ public class StringTokenStream extends TokenStream<String, String> {
 	@Override
 	public void rollback() {
 		iter.rollback();
+		
+		curr = iter.current();
 	}
 	
 	@Override
-- 
cgit v1.2.3