forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Fix lexer error recovery could try to consume EOF

This commit is contained in:
Sam Harwell 2012-11-04 11:29:00 -06:00
parent 0903370117
commit b917c01bba
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
runtime/Java/src/org/antlr/v4/runtime/Lexer.java
View File

@ -134,17 +134,17 @@ public abstract class Lexer extends Recognizer<Integer, LexerATNSimulator>
throw new IllegalStateException("nextToken requires a non-null input stream."); throw new IllegalStateException("nextToken requires a non-null input stream.");
} }
if (_hitEOF) {
emitEOF();
return _token;
}
// Mark start location in char stream so unbuffered streams are // Mark start location in char stream so unbuffered streams are
// guaranteed at least have text of current token // guaranteed at least have text of current token
int tokenStartMarker = _input.mark(); int tokenStartMarker = _input.mark();
try{ try{
outer: outer:
while (true) { while (true) {
if (_hitEOF) {
emitEOF();
return _token;
}
_token = null; _token = null;
_channel = Token.DEFAULT_CHANNEL; _channel = Token.DEFAULT_CHANNEL;
_tokenStartCharIndex = _input.index(); _tokenStartCharIndex = _input.index();
@ -369,7 +369,10 @@ public abstract class Lexer extends Recognizer<Integer, LexerATNSimulator>
} }
public void recover(LexerNoViableAltException e) { public void recover(LexerNoViableAltException e) {
getInterpreter().consume(_input); // skip a char and try again if (_input.LA(1) != IntStream.EOF) {
// skip a char and try again
getInterpreter().consume(_input);
}
} }
public void notifyListeners(LexerNoViableAltException e) { public void notifyListeners(LexerNoViableAltException e) {