Apple-2-SW/bastools
1
0
Fork 0
mirror of https://github.com/AppleCommander/bastools.git synced 2026-04-20 23:16:53 +00:00
Code Issues Projects Releases Wiki Activity

Renaming TokenReader. Now there is a ModernTokenReader and ClassicTokenReader.

Browse Source
This commit is contained in:
Rob Greene
2025-11-04 12:05:38 -06:00
parent 1b5a75359b
commit 3c3aedbcfb
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/main/java/org/applecommander/bastools/api/TokenReader.java → api/src/main/java/org/applecommander/bastools/api/ModernTokenReader.java
+3 -3
View File
@@ -42,7 +42,7 @@ import org.applecommander.bastools.api.model.Token;
*
* @author rob
*/
public class TokenReader {
public class ModernTokenReader {
private boolean hasMore = true;
// Internal flag just in case we consume the EOL (see REM for instance)s
private boolean needSyntheticEol = false;
@@ -68,7 +68,7 @@ public class TokenReader {
}
}
private static Queue<Token> tokenize(Reader reader) throws IOException {
TokenReader tokenReader = new TokenReader(reader);
ModernTokenReader tokenReader = new ModernTokenReader(reader);
LinkedList<Token> tokens = new LinkedList<>();
while (tokenReader.hasMore()) {
// Magic number: maximum number of pieces from the StreamTokenizer that may be combined.
@@ -78,7 +78,7 @@ public class TokenReader {
return tokens;
}
private TokenReader(Reader reader) {
private ModernTokenReader(Reader reader) {
this.reader = reader;
this.tokenizer = ApplesoftKeyword.tokenizer(reader);
}
api/src/test/java/org/applecommander/bastools/api/TokenReaderTest.java → api/src/test/java/org/applecommander/bastools/api/ModernTokenReaderTest.java
+4 -4
View File
@@ -27,17 +27,17 @@ import java.util.Queue;
import static org.junit.Assert.*;
public class TokenReaderTest {
public class ModernTokenReaderTest {
@Test
public void testCanRead() throws IOException {
Queue<Token> tokens = TokenReader.tokenize("../samples/destroyer.bas");
Queue<Token> tokens = ModernTokenReader.tokenize("../samples/destroyer.bas");
assertNotNull(tokens);
assertFalse(tokens.isEmpty());
}
@Test
public void testReadPR() throws IOException {
Queue<Token> tokens = TokenReader.tokenize(new ByteArrayInputStream("40 PR = 6".getBytes()));
Queue<Token> tokens = ModernTokenReader.tokenize(new ByteArrayInputStream("40 PR = 6".getBytes()));
assertEquals(Token.number(1, 40.0), tokens.remove());
assertEquals(Token.ident(1, "PR"), tokens.remove());
assertEquals(Token.keyword(1, ApplesoftKeyword.eq), tokens.remove());
@@ -47,7 +47,7 @@ public class TokenReaderTest {
@Test
public void testReadPRnum() throws IOException {
Queue<Token> tokens = TokenReader.tokenize(new ByteArrayInputStream("10 PR#6".getBytes()));
Queue<Token> tokens = ModernTokenReader.tokenize(new ByteArrayInputStream("10 PR#6".getBytes()));
assertEquals(Token.number(1, 10.0), tokens.remove());
assertEquals(Token.keyword(1, ApplesoftKeyword.PR), tokens.remove());
assertEquals(Token.number(1, 6.0), tokens.remove());