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

found 2 cases that called function on empty set.

This commit is contained in:
parrt 2017-03-02 14:18:00 -08:00
parent 6572b08095
commit d9d21fe9b3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/Java/src/org/antlr/v4/runtime/DefaultErrorStrategy.java
View File

@ -548,7 +548,10 @@ public class DefaultErrorStrategy implements ANTLRErrorStrategy {
protected Token getMissingSymbol(Parser recognizer) {
Token currentSymbol = recognizer.getCurrentToken();
IntervalSet expecting = getExpectedTokens(recognizer);
int expectedTokenType = expecting.getMinElement(); // get any element
int expectedTokenType = Token.INVALID_TYPE;
if ( !expecting.isNil() ) {
expectedTokenType = expecting.getMinElement(); // get any element
}
String tokenText;
if ( expectedTokenType== Token.EOF ) tokenText = "<missing EOF>";
else tokenText = "<missing "+recognizer.getVocabulary().getDisplayName(expectedTokenType)+">";

5
runtime/Java/src/org/antlr/v4/runtime/ParserInterpreter.java
View File

@ -407,7 +407,10 @@ public class ParserInterpreter extends Parser {
if ( e instanceof InputMismatchException ) {
InputMismatchException ime = (InputMismatchException)e;
Token tok = e.getOffendingToken();
int expectedTokenType = ime.getExpectedTokens().getMinElement(); // get any element
int expectedTokenType = Token.INVALID_TYPE;
if ( !ime.getExpectedTokens().isNil() ) {
expectedTokenType = ime.getExpectedTokens().getMinElement(); // get any element
}
Token errToken =
getTokenFactory().create(new Pair<TokenSource, CharStream>(tok.getTokenSource(), tok.getTokenSource().getInputStream()),
expectedTokenType, tok.getText(),