Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #10272: Upgrade Java Grammar from ANTLR2 to ANTLR4 #10280

Merged
merged 8 commits into from
Aug 11, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3817,6 +3817,7 @@
<targetTests>
<param>com.puppycrawl.tools.checkstyle.grammar.*</param>
<param>com.puppycrawl.tools.checkstyle.JavaParserTest</param>
<param>com.puppycrawl.tools.checkstyle.JavaAstVisitorTest</param>
</targetTests>
<excludedTestClasses>
<param>*.Input*</param>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
////////////////////////////////////////////////////////////////////////////////
// checkstyle: Checks Java source code for adherence to a set of rules.
// Copyright (C) 2001-2021 the original author or authors.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
////////////////////////////////////////////////////////////////////////////////

package com.puppycrawl.tools.checkstyle;

import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.InputMismatchException;
import org.antlr.v4.runtime.Parser;
import org.antlr.v4.runtime.Token;

/**
* Extending BailErrorStrategy allows us to report errors while
* cancelling the parsing operation. If input is not syntactically
* correct, we do not need to use antlr's recovery strategy, which
* can add significant overhead.
*
*/
public class CheckstyleParserErrorStrategy extends BailErrorStrategy {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved this to it's own class since we share this error strategy with both (Java and Javadoc) parsers now.


@Override
public Token recoverInline(Parser recognizer) {
reportError(recognizer, new InputMismatchException(recognizer));
return super.recoverInline(recognizer);
}
}