phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR review

Browse Source
This commit is contained in:
Matias Fraga
2018-09-10 15:55:14 -03:00
parent 755ae837c1
commit c2643f0278
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pmd-core/src/main/java/net/sourceforge/pmd/cpd/AntlrTokenizer.java
View File

@ -9,7 +9,7 @@ import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.Lexer; import org.antlr.v4.runtime.Lexer;
import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.Token;
import net.sourceforge.pmd.lang.AntlrTokenManager; import net.sourceforge.pmd.lang.antlr.AntlrTokenManager;
import net.sourceforge.pmd.lang.ast.TokenMgrError; import net.sourceforge.pmd.lang.ast.TokenMgrError;
/** /**
@ -23,7 +23,6 @@ public abstract class AntlrTokenizer implements Tokenizer {
public void tokenize(final SourceCode sourceCode, final Tokens tokenEntries) { public void tokenize(final SourceCode sourceCode, final Tokens tokenEntries) {
AntlrTokenManager tokenManager = getLexerForSource(sourceCode); AntlrTokenManager tokenManager = getLexerForSource(sourceCode);
tokenManager.resetListeners();
try { try {
Token token = (Token) tokenManager.getNextToken(); Token token = (Token) tokenManager.getNextToken();

7
pmd-core/src/main/java/net/sourceforge/pmd/lang/AntlrTokenManager.java → pmd-core/src/main/java/net/sourceforge/pmd/lang/antlr/AntlrTokenManager.java
View File

@ -2,13 +2,15 @@
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/ */
package net.sourceforge.pmd.lang; package net.sourceforge.pmd.lang.antlr;
import org.antlr.v4.runtime.BaseErrorListener; import org.antlr.v4.runtime.BaseErrorListener;
import org.antlr.v4.runtime.Lexer; import org.antlr.v4.runtime.Lexer;
import org.antlr.v4.runtime.RecognitionException; import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer; import org.antlr.v4.runtime.Recognizer;
import net.sourceforge.pmd.lang.TokenManager;
/** /**
* Generic token manager implementation for all Antlr lexers. * Generic token manager implementation for all Antlr lexers.
*/ */
@ -25,6 +27,7 @@ public class AntlrTokenManager implements TokenManager {
public AntlrTokenManager(final Lexer lexer, final String fileName) { public AntlrTokenManager(final Lexer lexer, final String fileName) {
this.lexer = lexer; this.lexer = lexer;
this.fileName = fileName; this.fileName = fileName;
resetListeners();
} }
@Override @Override
@ -41,7 +44,7 @@ public class AntlrTokenManager implements TokenManager {
return fileName; return fileName;
} }
public void resetListeners() { private void resetListeners() {
lexer.removeErrorListeners(); lexer.removeErrorListeners();
lexer.addErrorListener(new ErrorHandler()); lexer.addErrorListener(new ErrorHandler());
} }

2
pmd-swift/src/main/java/net/sourceforge/pmd/cpd/SwiftTokenizer.java
View File

@ -6,7 +6,7 @@ package net.sourceforge.pmd.cpd;
import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.CharStream;
import net.sourceforge.pmd.lang.AntlrTokenManager; import net.sourceforge.pmd.lang.antlr.AntlrTokenManager;
import net.sourceforge.pmd.lang.swift.antlr4.SwiftLexer; import net.sourceforge.pmd.lang.swift.antlr4.SwiftLexer;
/** /**