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

Track the number of syntax errors in Parser.notifyErrorListeners instead of in the error strategy

This commit is contained in:
Sam Harwell 2013-03-25 17:17:23 -05:00
parent e9bccee49f
commit c6a9d62b25
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,7 +98,6 @@ public class DefaultErrorStrategy implements ANTLRErrorStrategy {
// System.err.print("[SPURIOUS] ");
return; // don't count spurious errors
}
recognizer._syntaxErrors++;
beginErrorCondition(recognizer);
if ( e instanceof NoViableAltException ) {
reportNoViableAlternative(recognizer, (NoViableAltException) e);
@ -244,7 +243,6 @@ public class DefaultErrorStrategy implements ANTLRErrorStrategy {
public void reportUnwantedToken(Parser recognizer) {
if (errorRecoveryMode) return;
recognizer._syntaxErrors++;
beginErrorCondition(recognizer);
Token t = recognizer.getCurrentToken();
@ -257,7 +255,6 @@ public class DefaultErrorStrategy implements ANTLRErrorStrategy {
public void reportMissingToken(Parser recognizer) {
if (errorRecoveryMode) return;
recognizer._syntaxErrors++;
beginErrorCondition(recognizer);
Token t = recognizer.getCurrentToken();

21
runtime/Java/src/org/antlr/v4/runtime/Parser.java
View File

@ -117,8 +117,11 @@ public abstract class Parser extends Recognizer<Token, ParserATNSimulator> {
*/
protected List<ParseTreeListener> _parseListeners;
/** Did the recognizer encounter a syntax error? Track how many. */
protected int _syntaxErrors = 0;
/**
* The number of syntax errors reported during parsing. This value is
* incremented each time {@link #notifyErrorListeners} is called.
*/
protected int _syntaxErrors;
public Parser(TokenStream input) {
setInputStream(input);
@ -299,12 +302,13 @@ public abstract class Parser extends Recognizer<Token, ParserATNSimulator> {
}
}
/** Get number of recognition errors (lexer, parser, tree parser). Each
* recognizer tracks its own number. So parser and lexer each have
* separate count. Does not count the spurious errors found between
* an error and next valid token match
/**
* Get number of recognition errors (lexer, parser). Each recognizer tracks
* its own number. So parser and lexer each have separate count. Does not
* count the spurious errors found between an error and next valid token
* match
*
* See also reportError()
* @see #notifyErrorListeners
*/
public int getNumberOfSyntaxErrors() {
return _syntaxErrors;
@ -351,13 +355,14 @@ public abstract class Parser extends Recognizer<Token, ParserATNSimulator> {
return _input.LT(1);
}
public void notifyErrorListeners(String msg) {
public final void notifyErrorListeners(String msg) {
notifyErrorListeners(getCurrentToken(), msg, null);
}
public void notifyErrorListeners(Token offendingToken, String msg,
@Nullable RecognitionException e)
{
_syntaxErrors++;
int line = -1;
int charPositionInLine = -1;
line = offendingToken.getLine();