diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexParser.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexParser.java index d0e3834635..dee36a94ce 100644 --- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexParser.java +++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexParser.java @@ -8,7 +8,6 @@ import java.io.Reader; import net.sourceforge.pmd.lang.AbstractParser; import net.sourceforge.pmd.lang.ParserOptions; -import net.sourceforge.pmd.lang.TokenManager; import net.sourceforge.pmd.lang.ast.Node; import net.sourceforge.pmd.lang.ast.ParseException; @@ -23,11 +22,6 @@ public class ApexParser extends AbstractParser { apexParser = new net.sourceforge.pmd.lang.apex.ast.ApexParser((ApexParserOptions) parserOptions); } - @Override - public TokenManager createTokenManager(Reader source) { - return null; - } - @Override public Node parse(String fileName, Reader source) throws ParseException { return apexParser.parse(source); diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/AntlrTokenizer.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/AntlrTokenizer.java index a41a7e0ed2..5e55743087 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/AntlrTokenizer.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/AntlrTokenizer.java @@ -27,8 +27,6 @@ public abstract class AntlrTokenizer implements Tokenizer { public void tokenize(final SourceCode sourceCode, final Tokens tokenEntries) { final AntlrTokenManager tokenManager = getLexerForSource(sourceCode); - tokenManager.setFileName(sourceCode.getFileName()); - final AntlrTokenFilter tokenFilter = getTokenFilter(tokenManager); try { diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/JavaCCTokenizer.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/JavaCCTokenizer.java index 2b797ac11a..92295ff4de 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/JavaCCTokenizer.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/JavaCCTokenizer.java @@ -13,36 +13,37 @@ import net.sourceforge.pmd.cpd.Tokens; import net.sourceforge.pmd.cpd.token.JavaCCTokenFilter; import net.sourceforge.pmd.cpd.token.TokenFilter; import net.sourceforge.pmd.lang.TokenManager; -import net.sourceforge.pmd.lang.ast.GenericToken; +import net.sourceforge.pmd.lang.ast.TokenMgrError; +import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken; -public abstract class JavaCCTokenizer implements Tokenizer { +public abstract class JavaCCTokenizer implements Tokenizer { - protected abstract TokenManager getLexerForSource(SourceCode sourceCode); + protected abstract TokenManager getLexerForSource(SourceCode sourceCode); - protected TokenFilter getTokenFilter(TokenManager tokenManager) { + protected TokenFilter getTokenFilter(TokenManager tokenManager) { return new JavaCCTokenFilter(tokenManager); } - protected TokenEntry processToken(Tokens tokenEntries, GenericToken currentToken, String filename) { - return new TokenEntry(getImage((T) currentToken), filename, currentToken.getBeginLine(), currentToken.getBeginColumn(), currentToken.getEndColumn()); + protected TokenEntry processToken(Tokens tokenEntries, JavaccToken currentToken, String filename) { + return new TokenEntry(getImage(currentToken), filename, currentToken.getBeginLine(), currentToken.getBeginColumn(), currentToken.getEndColumn()); } - protected String getImage(T token) { + protected String getImage(JavaccToken token) { return token.getImage(); } @Override public void tokenize(SourceCode sourceCode, Tokens tokenEntries) throws IOException { - TokenManager tokenManager = getLexerForSource(sourceCode); - tokenManager.setFileName(sourceCode.getFileName()); + TokenManager tokenManager = getLexerForSource(sourceCode); try { - final TokenFilter tokenFilter = getTokenFilter(tokenManager); - - GenericToken currentToken = tokenFilter.getNextToken(); + final TokenFilter tokenFilter = getTokenFilter(tokenManager); + JavaccToken currentToken = tokenFilter.getNextToken(); while (currentToken != null) { tokenEntries.add(processToken(tokenEntries, currentToken, sourceCode.getFileName())); currentToken = tokenFilter.getNextToken(); } + } catch (TokenMgrError e) { + throw e.withFileName(sourceCode.getFileName()); } finally { tokenEntries.add(TokenEntry.getEOF()); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/JavaCCTokenFilter.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/JavaCCTokenFilter.java index b8feec5f64..23644a6b16 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/JavaCCTokenFilter.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/JavaCCTokenFilter.java @@ -6,24 +6,24 @@ package net.sourceforge.pmd.cpd.token; import net.sourceforge.pmd.cpd.token.internal.BaseTokenFilter; import net.sourceforge.pmd.lang.TokenManager; -import net.sourceforge.pmd.lang.ast.GenericToken; +import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken; /** * A generic filter for JavaCC-based token managers that allows to use comments * to enable / disable analysis of parts of the stream */ -public class JavaCCTokenFilter extends BaseTokenFilter { +public class JavaCCTokenFilter extends BaseTokenFilter { /** * Creates a new JavaCCTokenFilter * @param tokenManager The token manager from which to retrieve tokens to be filtered */ - public JavaCCTokenFilter(final TokenManager tokenManager) { + public JavaCCTokenFilter(final TokenManager tokenManager) { super(tokenManager); } @Override - protected boolean shouldStopProcessing(final GenericToken currentToken) { + protected boolean shouldStopProcessing(final JavaccToken currentToken) { return currentToken.getImage().isEmpty(); } } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/TokenFilter.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/TokenFilter.java index 965db0cbfd..3671f109db 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/TokenFilter.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/TokenFilter.java @@ -9,11 +9,11 @@ import net.sourceforge.pmd.lang.ast.GenericToken; /** * Defines filter to be applied to the token stream during CPD analysis */ -public interface TokenFilter { +public interface TokenFilter> { /** * Retrieves the next token to pass the filter * @return The next token to pass the filter, or null if the end of the stream was reached */ - GenericToken getNextToken(); + T getNextToken(); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/internal/BaseTokenFilter.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/internal/BaseTokenFilter.java index 4baca41d37..cbd0839a3e 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/internal/BaseTokenFilter.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/internal/BaseTokenFilter.java @@ -18,7 +18,7 @@ import net.sourceforge.pmd.lang.ast.GenericToken; * A generic filter for PMD token managers that allows to use comments * to enable / disable analysis of parts of the stream */ -public abstract class BaseTokenFilter implements TokenFilter { +public abstract class BaseTokenFilter> implements TokenFilter { private final TokenManager tokenManager; private final LinkedList unprocessedTokens; // NOPMD - used both as Queue and List diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractParser.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractParser.java index 870fb72440..2634c0a4ba 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractParser.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractParser.java @@ -4,8 +4,6 @@ package net.sourceforge.pmd.lang; -import java.io.Reader; - /** * This is a generic implementation of the Parser interface. * @@ -23,12 +21,4 @@ public abstract class AbstractParser implements Parser { return parserOptions; } - @Override - public TokenManager getTokenManager(String fileName, Reader source) { - TokenManager tokenManager = createTokenManager(source); - tokenManager.setFileName(fileName); - return tokenManager; - } - - protected abstract TokenManager createTokenManager(Reader source); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/Parser.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/Parser.java index a9e1581f54..cba8e671bb 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/Parser.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/Parser.java @@ -17,8 +17,6 @@ import net.sourceforge.pmd.lang.ast.ParseException; * - Ideally ParserOptions would be an argument to ::parse * - ::parse would also take some more parameters, eg an error collector * - The reader + filename would be a TextDocument - * - Remove TokenManager from here. Only JavaCC implementations support that, - * and it's barely used. * * @author Pieter_Van_Raemdonck - Application Engineers NV/SA - www.ae.be */ @@ -28,19 +26,6 @@ public interface Parser { */ ParserOptions getParserOptions(); - /** - * Get a TokenManager for the given source. - * - * @param fileName - * The file name being parsed (may be null). - * @param source - * Reader that provides the source code to tokenize. - * @return A TokenManager for reading token. - * @deprecated For removal in 7.0.0 - */ - @Deprecated - TokenManager getTokenManager(String fileName, Reader source); - /** * Parse source code and return the root node of the AST. diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/TokenManager.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/TokenManager.java index edb26311d1..89623409cc 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/TokenManager.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/TokenManager.java @@ -4,17 +4,13 @@ package net.sourceforge.pmd.lang; +import net.sourceforge.pmd.lang.ast.GenericToken; + /** * Common interface for interacting with parser Token Managers. */ -public interface TokenManager { - // TODO : Change the return to GenericToken in 7.0.0 - maybe even use generics TokenManager - Object getNextToken(); +public interface TokenManager> { + T getNextToken(); - /** - * @deprecated For removal in 7.0.0 - */ - @Deprecated - void setFileName(String fileName); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/AbstractTokenManager.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/AbstractTokenManager.java index a1f2e2801e..c85e9d9736 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/AbstractTokenManager.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/AbstractTokenManager.java @@ -8,32 +8,17 @@ import java.util.HashMap; import java.util.Map; import net.sourceforge.pmd.PMD; +import net.sourceforge.pmd.lang.TokenManager; +import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken; -public abstract class AbstractTokenManager { - - // Because the TokenMgrError class does not have access to the TokenManager - // instance, we - // cannot store the file name as an instance field, but must use a static. - private static ThreadLocal fileName = new ThreadLocal<>(); +public abstract class AbstractTokenManager implements TokenManager { protected Map suppressMap = new HashMap<>(); protected String suppressMarker = PMD.SUPPRESS_MARKER; + protected String fileName; - /** - * @deprecated For removal in 7.0.0 - */ - @Deprecated - public static void setFileName(String fileName) { - AbstractTokenManager.fileName.set(fileName); - } - - /** - * @deprecated For removal in 7.0.0 - */ - @Deprecated - public static String getFileName() { - String fileName = AbstractTokenManager.fileName.get(); - return fileName == null ? "(no file name provided)" : fileName; + public void setFileName(String fileName) { + this.fileName = fileName; } public void setSuppressMarker(String marker) { diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/GenericToken.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/GenericToken.java index c98472a1b1..ccabbaabc2 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/GenericToken.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/GenericToken.java @@ -6,17 +6,15 @@ package net.sourceforge.pmd.lang.ast; /** * Represents a language-independent token such as constants, values language reserved keywords, or comments. - * - * TODO make generic */ -public interface GenericToken { +public interface GenericToken> { /** * Obtain the next generic token according to the input stream which generated the instance of this token. * * @return the next generic token if it exists; null if it does not exist */ - GenericToken getNext(); + T getNext(); /** * Obtain a comment-type token which, according to the input stream which generated the instance of this token, @@ -24,7 +22,7 @@ public interface GenericToken { * * @return the comment-type token if it exists; null if it does not exist */ - GenericToken getPreviousComment(); + T getPreviousComment(); /** * Returns the token's text. diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/TokenMgrError.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/TokenMgrError.java index 114dac2a3a..668e824ad3 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/TokenMgrError.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/TokenMgrError.java @@ -61,7 +61,7 @@ public final class TokenMgrError extends RuntimeException { super(makeReason(eofSeen, lexStateName, errorAfter, curChar)); line = errorLine; column = errorColumn; - filename = AbstractTokenManager.getFileName(); + filename = null; } /** @@ -75,7 +75,7 @@ public final class TokenMgrError extends RuntimeException { super(makeReason(eofSeen, String.valueOf(lexState), errorAfter, curChar)); line = errorLine; column = errorColumn; - filename = AbstractTokenManager.getFileName(); + filename = null; } public int getLine() { diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrBaseParser.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrBaseParser.java index 7a92e0d9ea..10339ddd89 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrBaseParser.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrBaseParser.java @@ -11,7 +11,6 @@ import org.antlr.v4.runtime.Lexer; import net.sourceforge.pmd.lang.Parser; import net.sourceforge.pmd.lang.ParserOptions; -import net.sourceforge.pmd.lang.TokenManager; import net.sourceforge.pmd.lang.ast.Node; import net.sourceforge.pmd.lang.ast.ParseException; @@ -31,15 +30,6 @@ public abstract class AntlrBaseParser imp return parserOptions; } - @Override - public TokenManager getTokenManager(final String fileName, final Reader source) { - try { - return new AntlrTokenManager(getLexer(source), fileName); - } catch (final IOException e) { - throw new RuntimeException(e); - } - } - @Override public Node parse(final String fileName, final Reader source) throws ParseException { try { diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrTokenManager.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrTokenManager.java index 19905322e3..d13897fab6 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrTokenManager.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrTokenManager.java @@ -49,11 +49,6 @@ public class AntlrTokenManager implements TokenManager { return currentToken; } - @Override - public void setFileName(String fileName) { - this.fileName = fileName; - } - public String getFileName() { return fileName; } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JavaccToken.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JavaccToken.java index 7300acc2dd..237cd952b1 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JavaccToken.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JavaccToken.java @@ -27,7 +27,7 @@ import net.sourceforge.pmd.lang.ast.GenericToken; * *

TODO replace duplicates over PMD. */ -public class JavaccToken implements GenericToken, Comparable { +public class JavaccToken implements GenericToken, Comparable { /** * Kind for EOF tokens. diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JjtreeParserAdapter.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JjtreeParserAdapter.java index e5f9d9fc08..a2a804bd91 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JjtreeParserAdapter.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JjtreeParserAdapter.java @@ -34,14 +34,7 @@ public abstract class JjtreeParserAdapter implements Parser return parserOptions; } - @Override - public TokenManager getTokenManager(String fileName, Reader source) { - TokenManager tokenManager = createTokenManager(source); - tokenManager.setFileName(fileName); - return tokenManager; - } - - protected abstract TokenManager createTokenManager(Reader source); + protected abstract TokenManager createTokenManager(Reader source); protected abstract JavaccTokenDocument newDocument(String fullText); diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/cpd/token/internal/BaseTokenFilterTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/token/internal/BaseTokenFilterTest.java index 2478e0c913..e387b1e079 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/cpd/token/internal/BaseTokenFilterTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/token/internal/BaseTokenFilterTest.java @@ -78,9 +78,6 @@ public class BaseTokenFilterTest { } } - @Override - public void setFileName(final String fileName) { - } } class DummyTokenFilter extends BaseTokenFilter { diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java index 0dc68954ab..751215d4b6 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java @@ -84,10 +84,6 @@ public class DummyLanguageModule extends BaseLanguageModule { return node; } - @Override - protected TokenManager createTokenManager(Reader source) { - return null; - } }; } } diff --git a/pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/ast/CppTokenManager.java b/pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/ast/CppTokenManager.java index 88a3e07824..6884f014ca 100644 --- a/pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/ast/CppTokenManager.java +++ b/pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/ast/CppTokenManager.java @@ -30,8 +30,4 @@ public final class CppTokenManager implements TokenManager { return tokenManager.getNextToken(); } - @Override - public void setFileName(String fileName) { - CppParserImplTokenManager.setFileName(fileName); - } } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java b/pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java index 7361a5d4cc..4e96050cf4 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java @@ -14,7 +14,6 @@ import net.sourceforge.pmd.cpd.internal.JavaCCTokenizer; import net.sourceforge.pmd.cpd.token.JavaCCTokenFilter; import net.sourceforge.pmd.cpd.token.TokenFilter; import net.sourceforge.pmd.lang.TokenManager; -import net.sourceforge.pmd.lang.ast.GenericToken; import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken; import net.sourceforge.pmd.lang.java.ast.JavaTokenKinds; import net.sourceforge.pmd.lang.java.ast.JavaTokenManager; @@ -43,20 +42,19 @@ public class JavaTokenizer extends JavaCCTokenizer { } @Override - protected TokenManager getLexerForSource(SourceCode sourceCode) { + protected TokenManager getLexerForSource(SourceCode sourceCode) { final StringBuilder stringBuilder = sourceCode.getCodeBuffer(); return new JavaTokenManager(new StringReader(stringBuilder.toString())); } @Override - protected TokenFilter getTokenFilter(TokenManager tokenManager) { + protected TokenFilter getTokenFilter(TokenManager tokenManager) { return new JavaTokenFilter(tokenManager, ignoreAnnotations); } @Override - protected TokenEntry processToken(Tokens tokenEntries, GenericToken currentToken, String fileName) { - String image = currentToken.getImage(); - JavaccToken javaToken = (JavaccToken) currentToken; + protected TokenEntry processToken(Tokens tokenEntries, JavaccToken javaToken, String fileName) { + String image = javaToken.getImage(); constructorDetector.restoreConstructorToken(tokenEntries, javaToken); @@ -72,7 +70,7 @@ public class JavaTokenizer extends JavaCCTokenizer { constructorDetector.processToken(javaToken); - return new TokenEntry(image, fileName, currentToken.getBeginLine(), currentToken.getBeginColumn(), currentToken.getEndColumn()); + return new TokenEntry(image, fileName, javaToken.getBeginLine(), javaToken.getBeginColumn(), javaToken.getEndColumn()); } public void setIgnoreLiterals(boolean ignore) { @@ -106,14 +104,13 @@ public class JavaTokenizer extends JavaCCTokenizer { private boolean discardingAnnotations = false; private boolean ignoreAnnotations = false; - JavaTokenFilter(final TokenManager tokenManager, final boolean ignoreAnnotations) { + JavaTokenFilter(final TokenManager tokenManager, final boolean ignoreAnnotations) { super(tokenManager); this.ignoreAnnotations = ignoreAnnotations; } @Override - protected void analyzeToken(final GenericToken currentToken) { - JavaccToken token = (JavaccToken) currentToken; + protected void analyzeToken(final JavaccToken token) { detectAnnotations(token); skipSemicolon(token); diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaTokenManager.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaTokenManager.java index b7ea671a71..9228c0c277 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaTokenManager.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaTokenManager.java @@ -8,11 +8,12 @@ import java.io.Reader; import net.sourceforge.pmd.lang.TokenManager; import net.sourceforge.pmd.lang.ast.impl.javacc.CharStreamFactory; +import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken; /** * Java Token Manager implementation. */ -public class JavaTokenManager implements TokenManager { +public class JavaTokenManager implements TokenManager { private final JavaParserImplTokenManager tokenManager; public JavaTokenManager(Reader source) { @@ -20,12 +21,8 @@ public class JavaTokenManager implements TokenManager { } @Override - public Object getNextToken() { + public JavaccToken getNextToken() { return tokenManager.getNextToken(); } - @Override - public void setFileName(String fileName) { - tokenManager.setFileName(fileName); - } } diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java index 3a36ba5796..cd819ca7f9 100644 --- a/pmd-javascript/src/main/java/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java +++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java @@ -16,7 +16,7 @@ import net.sourceforge.pmd.util.IOUtil; /** * The Ecmascript Tokenizer */ -public class EcmascriptTokenizer extends JavaCCTokenizer { +public class EcmascriptTokenizer extends JavaCCTokenizer { @Override protected TokenManager getLexerForSource(SourceCode sourceCode) { diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/Ecmascript3Parser.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/Ecmascript3Parser.java index 9e42b38968..2c672f94bc 100644 --- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/Ecmascript3Parser.java +++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/Ecmascript3Parser.java @@ -8,10 +8,8 @@ import java.io.Reader; import net.sourceforge.pmd.lang.AbstractParser; import net.sourceforge.pmd.lang.ParserOptions; -import net.sourceforge.pmd.lang.TokenManager; import net.sourceforge.pmd.lang.ast.ParseException; import net.sourceforge.pmd.lang.ecmascript.ast.ASTAstRoot; -import net.sourceforge.pmd.lang.ecmascript5.ast.Ecmascript5TokenManager; /** * Adapter for the EcmascriptParser. @@ -25,11 +23,6 @@ public class Ecmascript3Parser extends AbstractParser { (EcmascriptParserOptions) parserOptions); } - @Override - public TokenManager createTokenManager(Reader source) { - return new Ecmascript5TokenManager(source); - } - @Override public ASTAstRoot parse(String fileName, Reader source) throws ParseException { return ecmascriptParser.parse(source); diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript5/ast/Ecmascript5TokenManager.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript5/ast/Ecmascript5TokenManager.java index 782c48d248..44c8c574b6 100644 --- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript5/ast/Ecmascript5TokenManager.java +++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript5/ast/Ecmascript5TokenManager.java @@ -32,8 +32,4 @@ public class Ecmascript5TokenManager implements TokenManager { return tokenManager.getNextToken(); } - @Override - public void setFileName(String fileName) { - Ecmascript5ParserImplTokenManager.setFileName(fileName); - } } diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/JspTokenManager.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/JspTokenManager.java index d19385e1f8..6634cfa1d4 100644 --- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/JspTokenManager.java +++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/JspTokenManager.java @@ -26,8 +26,4 @@ public class JspTokenManager implements TokenManager { return tokenManager.getNextToken(); } - @Override - public void setFileName(String fileName) { - JspParserImplTokenManager.setFileName(fileName); - } } diff --git a/pmd-matlab/src/main/java/net/sourceforge/pmd/lang/matlab/ast/MatlabTokenManager.java b/pmd-matlab/src/main/java/net/sourceforge/pmd/lang/matlab/ast/MatlabTokenManager.java index 7edb759361..8a212bc3ef 100644 --- a/pmd-matlab/src/main/java/net/sourceforge/pmd/lang/matlab/ast/MatlabTokenManager.java +++ b/pmd-matlab/src/main/java/net/sourceforge/pmd/lang/matlab/ast/MatlabTokenManager.java @@ -26,8 +26,4 @@ public class MatlabTokenManager implements TokenManager { return tokenManager.getNextToken(); } - @Override - public void setFileName(String fileName) { - MatlabParserImplTokenManager.setFileName(fileName); - } } diff --git a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaTokenManager.java b/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaTokenManager.java index 9a1276e9e4..528578088a 100644 --- a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaTokenManager.java +++ b/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaTokenManager.java @@ -8,7 +8,6 @@ import java.io.Reader; import net.sourceforge.pmd.annotation.InternalApi; import net.sourceforge.pmd.lang.TokenManager; -import net.sourceforge.pmd.lang.ast.AbstractTokenManager; import net.sourceforge.pmd.lang.ast.impl.javacc.CharStreamFactory; @@ -30,8 +29,4 @@ public class ModelicaTokenManager implements TokenManager { return modelicaParserTokenManager.getNextToken(); } - @Override - public void setFileName(String fileName) { - AbstractTokenManager.setFileName(fileName); - } } diff --git a/pmd-objectivec/src/main/java/net/sourceforge/pmd/lang/objectivec/ast/ObjectiveCTokenManager.java b/pmd-objectivec/src/main/java/net/sourceforge/pmd/lang/objectivec/ast/ObjectiveCTokenManager.java index fcc95c2cb2..54bfcd0265 100644 --- a/pmd-objectivec/src/main/java/net/sourceforge/pmd/lang/objectivec/ast/ObjectiveCTokenManager.java +++ b/pmd-objectivec/src/main/java/net/sourceforge/pmd/lang/objectivec/ast/ObjectiveCTokenManager.java @@ -32,8 +32,4 @@ public final class ObjectiveCTokenManager implements TokenManager { return tokenManager.getNextToken(); } - @Override - public void setFileName(String fileName) { - ObjectiveCParserImplTokenManager.setFileName(fileName); - } } diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLTokenManager.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLTokenManager.java index 519e5ba27e..8cc340bce1 100644 --- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLTokenManager.java +++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLTokenManager.java @@ -26,8 +26,4 @@ public class PLSQLTokenManager implements TokenManager { return tokenManager.getNextToken(); } - @Override - public void setFileName(String fileName) { - PLSQLParserImplTokenManager.setFileName(fileName); - } } diff --git a/pmd-python/src/main/java/net/sourceforge/pmd/cpd/PythonTokenizer.java b/pmd-python/src/main/java/net/sourceforge/pmd/cpd/PythonTokenizer.java index 2922d6ecc2..e65c0d80b6 100644 --- a/pmd-python/src/main/java/net/sourceforge/pmd/cpd/PythonTokenizer.java +++ b/pmd-python/src/main/java/net/sourceforge/pmd/cpd/PythonTokenizer.java @@ -17,7 +17,7 @@ import net.sourceforge.pmd.util.IOUtil; /** * The Python tokenizer. */ -public class PythonTokenizer extends JavaCCTokenizer { +public class PythonTokenizer extends JavaCCTokenizer { private static final Pattern STRING_NL_ESCAPE = Pattern.compile("\\\\\\r?\\n"); diff --git a/pmd-python/src/main/java/net/sourceforge/pmd/lang/python/ast/PythonTokenManager.java b/pmd-python/src/main/java/net/sourceforge/pmd/lang/python/ast/PythonTokenManager.java index 72b8095e16..b8d8428bee 100644 --- a/pmd-python/src/main/java/net/sourceforge/pmd/lang/python/ast/PythonTokenManager.java +++ b/pmd-python/src/main/java/net/sourceforge/pmd/lang/python/ast/PythonTokenManager.java @@ -33,11 +33,6 @@ public class PythonTokenManager implements TokenManager { return tokenManager.getNextToken(); } - @Override - public void setFileName(String fileName) { - PythonParserImplTokenManager.setFileName(fileName); - } - private static class PythonTokenDocument extends JavaccTokenDocument { PythonTokenDocument(String fullText) { diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaParser.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaParser.java index afc3aa2176..c429be06a1 100644 --- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaParser.java +++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaParser.java @@ -11,7 +11,6 @@ import org.apache.commons.io.IOUtils; import net.sourceforge.pmd.lang.AbstractParser; import net.sourceforge.pmd.lang.ParserOptions; -import net.sourceforge.pmd.lang.TokenManager; import net.sourceforge.pmd.lang.ast.ParseException; import net.sourceforge.pmd.lang.scala.ast.ASTSource; @@ -54,9 +53,4 @@ public class ScalaParser extends AbstractParser { return (ASTSource) new ScalaTreeBuilder().build(src); } - @Override - protected TokenManager createTokenManager(Reader source) { - return null; - } - } diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java index b9d6b2d910..daa198c747 100644 --- a/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java +++ b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java @@ -17,7 +17,6 @@ import net.sourceforge.pmd.lang.AbstractPmdLanguageVersionHandler; import net.sourceforge.pmd.lang.BaseLanguageModule; import net.sourceforge.pmd.lang.Parser; import net.sourceforge.pmd.lang.ParserOptions; -import net.sourceforge.pmd.lang.TokenManager; import net.sourceforge.pmd.lang.ast.Node; import net.sourceforge.pmd.lang.ast.ParseException; import net.sourceforge.pmd.lang.ast.RootNode; @@ -84,10 +83,6 @@ public class DummyLanguageModule extends BaseLanguageModule { return node; } - @Override - protected TokenManager createTokenManager(Reader source) { - return null; - } }; } } diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfTokenManager.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfTokenManager.java index 9cce89b6d6..5c6ab25deb 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfTokenManager.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfTokenManager.java @@ -26,8 +26,4 @@ public class VfTokenManager implements TokenManager { return tokenManager.getNextToken(); } - @Override - public void setFileName(String fileName) { - VfParserImplTokenManager.setFileName(fileName); - } } diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/VmTokenManager.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/VmTokenManager.java index 792541a0a9..2fa32c3599 100644 --- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/VmTokenManager.java +++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/VmTokenManager.java @@ -7,7 +7,6 @@ package net.sourceforge.pmd.lang.vm.ast; import java.io.Reader; import net.sourceforge.pmd.lang.TokenManager; -import net.sourceforge.pmd.lang.ast.AbstractTokenManager; import net.sourceforge.pmd.lang.ast.impl.javacc.CharStreamFactory; public class VmTokenManager implements TokenManager { @@ -23,9 +22,4 @@ public class VmTokenManager implements TokenManager { return vmParserTokenManager.getNextToken(); } - @Override - public void setFileName(final String fileName) { - AbstractTokenManager.setFileName(fileName); - } - } diff --git a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlParser.java b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlParser.java index 94ddd56f30..1303adbb7b 100644 --- a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlParser.java +++ b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlParser.java @@ -8,7 +8,6 @@ import java.io.Reader; import net.sourceforge.pmd.lang.AbstractParser; import net.sourceforge.pmd.lang.ParserOptions; -import net.sourceforge.pmd.lang.TokenManager; import net.sourceforge.pmd.lang.ast.Node; import net.sourceforge.pmd.lang.ast.ParseException; import net.sourceforge.pmd.lang.xml.ast.internal.XmlParserImpl; @@ -22,11 +21,6 @@ public class XmlParser extends AbstractParser { super(parserOptions); } - @Override - public TokenManager createTokenManager(Reader source) { - return null; - } - @Override public Node parse(String fileName, Reader source) throws ParseException { return new XmlParserImpl((XmlParserOptions) parserOptions).parse(source);