TouchInstinct
/
checkstyle
307
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug introduced during cleanup of duplicate code: 

Reader cannot be reused by fallback lexer, it would
never see the characters that have been consumed before
the RecognitionException in the first parsing attempt.

Also added comment why the JDK 1.4 grammar is tried first.
This commit is contained in:
Lars Kühne 2002-03-19 20:26:02 +00:00
parent 08c03a7a57
commit 190c0e5ca6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/checkstyle/com/puppycrawl/tools/checkstyle/Checker.java
View File

@ -229,10 +229,14 @@ public class Checker
try {
fireFileStarted(aFileName);
final String[] lines = getLines(aFileName);
final Reader sar = new StringArrayReader(lines);
VerifierSingleton.getInstance().clearMessages();
VerifierSingleton.getInstance().setLines(lines);
try {
// try the 1.4 grammar first, this will succeed for
// all code that compiles without any warnings in JDK 1.4,
// that should cover most cases
final Reader sar = new StringArrayReader(lines);
final GeneratedJava14Lexer jl = new GeneratedJava14Lexer(sar);
jl.setFilename(aFileName);
final GeneratedJava14Recognizer jr =
@ -243,11 +247,12 @@ public class Checker
}
catch (RecognitionException re) {
// Parsing might have failed because the checked
// filecontains "assert" statement. Retry with a
// file contains "assert" as an identifier. Retry with a
// grammar that treats "assert" as an identifier
// and not as a keyword
// Arghh - the pain - duplicate code!
final Reader sar = new StringArrayReader(lines);
final GeneratedJavaLexer jl = new GeneratedJavaLexer(sar);
jl.setFilename(aFileName);
final GeneratedJavaRecognizer jr =