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

fix tscript comment issues

Browse Source
This commit is contained in:
dfsek 2020-12-30 18:05:32 -07:00
parent 2be4b36d1a
commit 99acadaf59
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/java/com/dfsek/terra/api/structures/parser/Parser.java
View File

@ -87,7 +87,11 @@ public class Parser {
TokenHolder tokens = new TokenHolder(); TokenHolder tokens = new TokenHolder();
try { try {
while(tokenizer.hasNext()) tokens.add(tokenizer.fetch()); Token t = tokenizer.fetch();
while(t != null) {
tokens.add(t);
t = tokenizer.fetch();
}
} catch(TokenizerException e) { } catch(TokenizerException e) {
throw new ParseException("Failed to tokenize input", new Position(0, 0), e); throw new ParseException("Failed to tokenize input", new Position(0, 0), e);
} }

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

@ -18,23 +18,14 @@ public class Tokenizer {
reader = new Lookahead(new StringReader(data + '\0')); reader = new Lookahead(new StringReader(data + '\0'));
} }
public boolean hasNext() {
int whiteEnd = 0;
while(!reader.next(whiteEnd).isEOF() && reader.next(whiteEnd).isWhitespace()) whiteEnd++; // Consume whitespace.
return !reader.next(whiteEnd).isEOF();
}
public Token fetch() throws TokenizerException { public Token fetch() throws TokenizerException {
while(!reader.current().isEOF() && reader.current().isWhitespace()) reader.consume(); while(!reader.current().isEOF() && reader.current().isWhitespace()) reader.consume();
if(reader.current().isEOF()) return null; // EOF
if(reader.matches("//", true)) skipLine(); // Skip line if comment while(reader.matches("//", true)) skipLine(); // Skip line if comment
if(reader.matches("/*", true)) skipTo("*/"); // Skip multi line comment if(reader.matches("/*", true)) skipTo("*/"); // Skip multi line comment
if(reader.current().isEOF()) return null; // EOF
if(reader.matches("==", true)) if(reader.matches("==", true))
return new Token("==", Token.Type.EQUALS_OPERATOR, new Position(reader.getLine(), reader.getIndex())); return new Token("==", Token.Type.EQUALS_OPERATOR, new Position(reader.getLine(), reader.getIndex()));