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

error->syntaxError in listener

This commit is contained in:
Terence Parr 2012-06-25 13:25:13 -07:00
parent 740208ee4d
commit f396b4dc82
7 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/Java/src/org/antlr/v4/runtime/ANTLRErrorListener.java
View File

@ -70,12 +70,12 @@ public interface ANTLRErrorListener<Symbol> {
* the parser was able to recover in line without exiting the * the parser was able to recover in line without exiting the
* surrounding rule. * surrounding rule.
*/ */
public <T extends Symbol> void error(Recognizer<T, ?> recognizer, public <T extends Symbol> void syntaxError(Recognizer<T, ?> recognizer,
@Nullable T offendingSymbol, @Nullable T offendingSymbol,
int line, int line,
int charPositionInLine, int charPositionInLine,
String msg, String msg,
@Nullable RecognitionException e); @Nullable RecognitionException e);
/** Called when the parser detects a true ambiguity: an input sequence can be matched /** Called when the parser detects a true ambiguity: an input sequence can be matched
* literally by two or more pass through the grammar. ANTLR resolves the ambiguity in * literally by two or more pass through the grammar. ANTLR resolves the ambiguity in

12
runtime/Java/src/org/antlr/v4/runtime/BaseErrorListener.java
View File

@ -39,12 +39,12 @@ import org.antlr.v4.runtime.misc.IntervalSet;
public class BaseErrorListener<Symbol> implements ANTLRErrorListener<Symbol> { public class BaseErrorListener<Symbol> implements ANTLRErrorListener<Symbol> {
@Override @Override
public <T extends Symbol> void error(Recognizer<T, ?> recognizer, public <T extends Symbol> void syntaxError(Recognizer<T, ?> recognizer,
T offendingSymbol, T offendingSymbol,
int line, int line,
int charPositionInLine, int charPositionInLine,
String msg, String msg,
RecognitionException e) RecognitionException e)
{ {
} }

12
runtime/Java/src/org/antlr/v4/runtime/ConsoleErrorListener.java
View File

@ -36,12 +36,12 @@ public class ConsoleErrorListener extends BaseErrorListener<Object> {
public static final ConsoleErrorListener INSTANCE = new ConsoleErrorListener(); public static final ConsoleErrorListener INSTANCE = new ConsoleErrorListener();
@Override @Override
public <T extends Object> void error(Recognizer<T, ?> recognizer, public <T extends Object> void syntaxError(Recognizer<T, ?> recognizer,
T offendingSymbol, T offendingSymbol,
int line, int line,
int charPositionInLine, int charPositionInLine,
String msg, String msg,
RecognitionException e) RecognitionException e)
{ {
System.err.println("line " + line + ":" + charPositionInLine + " " + msg); System.err.println("line " + line + ":" + charPositionInLine + " " + msg);
} }

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

@ -329,7 +329,7 @@ public abstract class Lexer extends Recognizer<Integer, LexerATNSimulator>
_input.getText(Interval.of(_tokenStartCharIndex, _input.index()))+"'"; _input.getText(Interval.of(_tokenStartCharIndex, _input.index()))+"'";
ANTLRErrorListener<? super Integer> listener = getErrorListenerDispatch(); ANTLRErrorListener<? super Integer> listener = getErrorListenerDispatch();
listener.error(this, null, _tokenStartLine, _tokenStartCharPositionInLine, msg, e); listener.syntaxError(this, null, _tokenStartLine, _tokenStartCharPositionInLine, msg, e);
} }
public String getCharErrorDisplay(int c) { public String getCharErrorDisplay(int c) {

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

@ -317,7 +317,7 @@ public abstract class Parser extends Recognizer<Token, ParserATNSimulator<Token>
} }
ANTLRErrorListener<? super Token> listener = getErrorListenerDispatch(); ANTLRErrorListener<? super Token> listener = getErrorListenerDispatch();
listener.error(this, offendingToken, line, charPositionInLine, msg, e); listener.syntaxError(this, offendingToken, line, charPositionInLine, msg, e);
} }
/** Consume the current symbol and return it. E.g., given the following /** Consume the current symbol and return it. E.g., given the following

14
runtime/Java/src/org/antlr/v4/runtime/ProxyErrorListener.java
View File

@ -46,15 +46,15 @@ public class ProxyErrorListener<Symbol> implements ANTLRErrorListener<Symbol> {
} }
@Override @Override
public <T extends Symbol> void error(Recognizer<T, ?> recognizer, public <T extends Symbol> void syntaxError(Recognizer<T, ?> recognizer,
T offendingSymbol, T offendingSymbol,
int line, int line,
int charPositionInLine, int charPositionInLine,
String msg, String msg,
RecognitionException e) RecognitionException e)
{ {
for (ANTLRErrorListener<? super Symbol> listener : delegates) { for (ANTLRErrorListener<? super Symbol> listener : delegates) {
listener.error(recognizer, offendingSymbol, line, charPositionInLine, msg, e); listener.syntaxError(recognizer, offendingSymbol, line, charPositionInLine, msg, e);
} }
} }

2
tool/test/org/antlr/v4/test/TestPerformance.java
View File

@ -543,7 +543,7 @@ public class TestPerformance extends BaseTest {
public static DescriptiveErrorListener INSTANCE = new DescriptiveErrorListener(); public static DescriptiveErrorListener INSTANCE = new DescriptiveErrorListener();
@Override @Override
public <T extends Token> void error(Recognizer<T, ?> recognizer, T offendingSymbol, int line, int charPositionInLine, String msg, RecognitionException e) { public <T extends Token> void syntaxError(Recognizer<T, ?> recognizer, T offendingSymbol, int line, int charPositionInLine, String msg, RecognitionException e) {
String sourceName = recognizer.getInputStream().getSourceName(); String sourceName = recognizer.getInputStream().getSourceName();
sourceName = sourceName != null && !sourceName.isEmpty() ? sourceName+": " : ""; sourceName = sourceName != null && !sourceName.isEmpty() ? sourceName+": " : "";
System.err.println(sourceName+"line "+line+":"+charPositionInLine+" "+msg); System.err.println(sourceName+"line "+line+":"+charPositionInLine+" "+msg);