mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-04 00:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix parser EOF NPE

Browse Source
This commit is contained in:
dfsek 2021-04-05 17:08:13 -07:00
parent 03ebafc7b6
commit da4aebe498
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/com/dfsek/terra/api/structures/tokenizer/Tokenizer.java
View File

@ -15,6 +15,7 @@ public class Tokenizer {
private final Lookahead reader; private final Lookahead reader;
private final Stack<Token> brackets = new Stack<>(); private final Stack<Token> brackets = new Stack<>();
private Token current; private Token current;
private Token last;
public Tokenizer(String data) throws ParseException { public Tokenizer(String data) throws ParseException {
reader = new Lookahead(new StringReader(data + '\0')); reader = new Lookahead(new StringReader(data + '\0'));
@ -28,7 +29,7 @@ public class Tokenizer {
* @throws ParseException If token does not exist * @throws ParseException If token does not exist
*/ */
public Token get() throws ParseException { public Token get() throws ParseException {
if(!hasNext()) throw new ParseException("Unexpected end of input", current.getPosition()); if(!hasNext()) throw new ParseException("Unexpected end of input", last.getPosition());
return current; return current;
} }
@ -39,7 +40,7 @@ public class Tokenizer {
* @throws ParseException If token does not exist * @throws ParseException If token does not exist
*/ */
public Token consume() throws ParseException { public Token consume() throws ParseException {
if(!hasNext()) throw new ParseException("Unexpected end of input", current.getPosition()); if(!hasNext()) throw new ParseException("Unexpected end of input", last.getPosition());
Token temp = current; Token temp = current;
current = fetchCheck(); current = fetchCheck();
return temp; return temp;
@ -57,8 +58,9 @@ public class Tokenizer {
private Token fetchCheck() throws ParseException { private Token fetchCheck() throws ParseException {
Token fetch = fetch(); Token fetch = fetch();
if(fetch != null) { if(fetch != null) {
if(fetch.getType().equals(Token.Type.BLOCK_BEGIN)) brackets.push(fetch); // Opening bracket last = fetch;
else if(fetch.getType().equals(Token.Type.BLOCK_END)) { if(fetch.getType() == Token.Type.BLOCK_BEGIN) brackets.push(fetch); // Opening bracket
else if(fetch.getType() == Token.Type.BLOCK_END) {
if(!brackets.isEmpty()) brackets.pop(); if(!brackets.isEmpty()) brackets.pop();
else throw new ParseException("Dangling opening brace", new Position(0, 0)); else throw new ParseException("Dangling opening brace", new Position(0, 0));
} }