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

Merge pull request #902 from parrt/add-error-nodes 

Add error nodes
This commit is contained in:
Terence Parr 2015-06-12 17:45:07 -07:00
parent d2b86997d1 12a36946e8
commit 235d1a9216
1 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,7 +218,7 @@ public class ParserInterpreter extends Parser {
setState(atn.ruleToStopState[p.ruleIndex].stateNumber);
getContext().exception = e;
getErrorHandler().reportError(this, e);
getErrorHandler().recover(this, e);
recover(e);
}
break;
@ -271,7 +271,7 @@ public class ParserInterpreter extends Parser {
case Transition.SET:
case Transition.NOT_SET:
if (!transition.matches(_input.LA(1), Token.MIN_USER_TOKEN_TYPE, 65535)) {
_errHandler.recoverInline(this);
recoverInline();
}
matchWildcard();
break;
@ -404,4 +404,46 @@ public class ParserInterpreter extends Parser {
overrideDecisionInputIndex = tokenIndex;
overrideDecisionAlt = forcedAlt;
}
/** Rely on the error handler for this parser but, if no tokens are consumed
* to recover, add an error node. Otherwise, nothing is seen in the parse
* tree.
*/
protected void recover(RecognitionException e) {
int i = _input.index();
getErrorHandler().recover(this, e);
if ( _input.index()==i ) {
// no input consumed, better add an error node
if ( e instanceof InputMismatchException ) {
InputMismatchException ime = (InputMismatchException)e;
Token tok = e.getOffendingToken();
int expectedTokenType = ime.getExpectedTokens().getMinElement(); // get any element
String tokenText;
if ( expectedTokenType== Token.EOF ) tokenText = "<missing EOF>";
else tokenText = "<mismatched "+tok.getText()+">";
Token errToken =
getTokenFactory().create(new Pair<TokenSource, CharStream>(tok.getTokenSource(), tok.getTokenSource().getInputStream()),
expectedTokenType, tok.getText(),
Token.DEFAULT_CHANNEL,
-1, -1, // invalid start/stop
tok.getLine(), tok.getCharPositionInLine());
_ctx.addErrorNode(errToken);
}
else { // NoViableAlt
Token tok = e.getOffendingToken();
Token errToken =
getTokenFactory().create(new Pair<TokenSource, CharStream>(tok.getTokenSource(), tok.getTokenSource().getInputStream()),
Token.INVALID_TYPE, tok.getText(),
Token.DEFAULT_CHANNEL,
-1, -1, // invalid start/stop
tok.getLine(), tok.getCharPositionInLine());
_ctx.addErrorNode(errToken);
}
}
}
protected Token recoverInline() {
return _errHandler.recoverInline(this);
}
}