diff --git a/runtime/Java/src/org/antlr/v4/runtime/ANTLRErrorListener.java b/runtime/Java/src/org/antlr/v4/runtime/ANTLRErrorListener.java index 31100f3de..4e65bc3d6 100644 --- a/runtime/Java/src/org/antlr/v4/runtime/ANTLRErrorListener.java +++ b/runtime/Java/src/org/antlr/v4/runtime/ANTLRErrorListener.java @@ -70,12 +70,12 @@ public interface ANTLRErrorListener { * the parser was able to recover in line without exiting the * surrounding rule. */ - public void error(Recognizer recognizer, - @Nullable T offendingSymbol, - int line, - int charPositionInLine, - String msg, - @Nullable RecognitionException e); + public void syntaxError(Recognizer recognizer, + @Nullable T offendingSymbol, + int line, + int charPositionInLine, + String msg, + @Nullable RecognitionException e); /** 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 diff --git a/runtime/Java/src/org/antlr/v4/runtime/BaseErrorListener.java b/runtime/Java/src/org/antlr/v4/runtime/BaseErrorListener.java index 739480c26..9bbdaa341 100644 --- a/runtime/Java/src/org/antlr/v4/runtime/BaseErrorListener.java +++ b/runtime/Java/src/org/antlr/v4/runtime/BaseErrorListener.java @@ -39,12 +39,12 @@ import org.antlr.v4.runtime.misc.IntervalSet; public class BaseErrorListener implements ANTLRErrorListener { @Override - public void error(Recognizer recognizer, - T offendingSymbol, - int line, - int charPositionInLine, - String msg, - RecognitionException e) + public void syntaxError(Recognizer recognizer, + T offendingSymbol, + int line, + int charPositionInLine, + String msg, + RecognitionException e) { } diff --git a/runtime/Java/src/org/antlr/v4/runtime/ConsoleErrorListener.java b/runtime/Java/src/org/antlr/v4/runtime/ConsoleErrorListener.java index fd2030e05..dff6b510a 100644 --- a/runtime/Java/src/org/antlr/v4/runtime/ConsoleErrorListener.java +++ b/runtime/Java/src/org/antlr/v4/runtime/ConsoleErrorListener.java @@ -36,12 +36,12 @@ public class ConsoleErrorListener extends BaseErrorListener { public static final ConsoleErrorListener INSTANCE = new ConsoleErrorListener(); @Override - public void error(Recognizer recognizer, - T offendingSymbol, - int line, - int charPositionInLine, - String msg, - RecognitionException e) + public void syntaxError(Recognizer recognizer, + T offendingSymbol, + int line, + int charPositionInLine, + String msg, + RecognitionException e) { System.err.println("line " + line + ":" + charPositionInLine + " " + msg); } diff --git a/runtime/Java/src/org/antlr/v4/runtime/Lexer.java b/runtime/Java/src/org/antlr/v4/runtime/Lexer.java index b7fcc483d..4fa81e149 100644 --- a/runtime/Java/src/org/antlr/v4/runtime/Lexer.java +++ b/runtime/Java/src/org/antlr/v4/runtime/Lexer.java @@ -329,7 +329,7 @@ public abstract class Lexer extends Recognizer _input.getText(Interval.of(_tokenStartCharIndex, _input.index()))+"'"; ANTLRErrorListener listener = getErrorListenerDispatch(); - listener.error(this, null, _tokenStartLine, _tokenStartCharPositionInLine, msg, e); + listener.syntaxError(this, null, _tokenStartLine, _tokenStartCharPositionInLine, msg, e); } public String getCharErrorDisplay(int c) { diff --git a/runtime/Java/src/org/antlr/v4/runtime/Parser.java b/runtime/Java/src/org/antlr/v4/runtime/Parser.java index a5868e32b..de9b9630a 100644 --- a/runtime/Java/src/org/antlr/v4/runtime/Parser.java +++ b/runtime/Java/src/org/antlr/v4/runtime/Parser.java @@ -317,7 +317,7 @@ public abstract class Parser extends Recognizer } ANTLRErrorListener 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 diff --git a/runtime/Java/src/org/antlr/v4/runtime/ProxyErrorListener.java b/runtime/Java/src/org/antlr/v4/runtime/ProxyErrorListener.java index a47c3b8e0..3c4bbcdd5 100644 --- a/runtime/Java/src/org/antlr/v4/runtime/ProxyErrorListener.java +++ b/runtime/Java/src/org/antlr/v4/runtime/ProxyErrorListener.java @@ -46,15 +46,15 @@ public class ProxyErrorListener implements ANTLRErrorListener { } @Override - public void error(Recognizer recognizer, - T offendingSymbol, - int line, - int charPositionInLine, - String msg, - RecognitionException e) + public void syntaxError(Recognizer recognizer, + T offendingSymbol, + int line, + int charPositionInLine, + String msg, + RecognitionException e) { for (ANTLRErrorListener listener : delegates) { - listener.error(recognizer, offendingSymbol, line, charPositionInLine, msg, e); + listener.syntaxError(recognizer, offendingSymbol, line, charPositionInLine, msg, e); } } diff --git a/tool/test/org/antlr/v4/test/TestPerformance.java b/tool/test/org/antlr/v4/test/TestPerformance.java index 65bbe9b0d..f0c92a111 100644 --- a/tool/test/org/antlr/v4/test/TestPerformance.java +++ b/tool/test/org/antlr/v4/test/TestPerformance.java @@ -543,7 +543,7 @@ public class TestPerformance extends BaseTest { public static DescriptiveErrorListener INSTANCE = new DescriptiveErrorListener(); @Override - public void error(Recognizer recognizer, T offendingSymbol, int line, int charPositionInLine, String msg, RecognitionException e) { + public void syntaxError(Recognizer recognizer, T offendingSymbol, int line, int charPositionInLine, String msg, RecognitionException e) { String sourceName = recognizer.getInputStream().getSourceName(); sourceName = sourceName != null && !sourceName.isEmpty() ? sourceName+": " : ""; System.err.println(sourceName+"line "+line+":"+charPositionInLine+" "+msg);