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

[core] Rename Tokenizer to CpdLexer

Browse Source 
See #4065
This commit is contained in:
Andreas Dangel
2024-01-11 17:04:48 +01:00
parent 55d91791c3
commit 6163f67b06
119 changed files with 423 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pmd-cs/src/main/java/net/sourceforge/pmd/lang/cs/CsLanguageModule.java
View File

@ -5,10 +5,10 @@
package net.sourceforge.pmd.lang.cs;
import net.sourceforge.pmd.cpd.CpdLanguageProperties;
import net.sourceforge.pmd.cpd.Tokenizer;
import net.sourceforge.pmd.cpd.CpdLexer;
import net.sourceforge.pmd.lang.LanguagePropertyBundle;
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.cs.cpd.CsTokenizer;
import net.sourceforge.pmd.lang.cs.cpd.CsCpdLexer;
import net.sourceforge.pmd.lang.impl.CpdOnlyLanguageModuleBase;
/**
@ -38,7 +38,7 @@ public class CsLanguageModule extends CpdOnlyLanguageModuleBase {
}
@Override
public Tokenizer createCpdTokenizer(LanguagePropertyBundle bundle) {
return new CsTokenizer(bundle);
public CpdLexer createCpdLexer(LanguagePropertyBundle bundle) {
return new CsCpdLexer(bundle);
}
}

8
pmd-cs/src/main/java/net/sourceforge/pmd/lang/cs/cpd/CsTokenizer.java → pmd-cs/src/main/java/net/sourceforge/pmd/lang/cs/cpd/CsCpdLexer.java
View File

@ -8,8 +8,8 @@ import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.Lexer;
import net.sourceforge.pmd.cpd.CpdLanguageProperties;
import net.sourceforge.pmd.cpd.impl.AntlrCpdLexer;
import net.sourceforge.pmd.cpd.impl.AntlrTokenFilter;
import net.sourceforge.pmd.cpd.impl.AntlrTokenizer;
import net.sourceforge.pmd.cpd.impl.BaseTokenFilter;
import net.sourceforge.pmd.lang.LanguagePropertyBundle;
import net.sourceforge.pmd.lang.TokenManager;
@ -18,14 +18,16 @@ import net.sourceforge.pmd.lang.cs.ast.CSharpLexer;
/**
* The C# tokenizer.
*
* <p>Note: This class has been called CsTokenizer in PMD 6</p>.
*/
public class CsTokenizer extends AntlrTokenizer {
public class CsCpdLexer extends AntlrCpdLexer {
private final boolean ignoreUsings;
private final boolean ignoreLiteralSequences;
private final boolean ignoreAttributes;
public CsTokenizer(LanguagePropertyBundle properties) {
public CsCpdLexer(LanguagePropertyBundle properties) {
ignoreUsings = properties.getProperty(CpdLanguageProperties.CPD_IGNORE_IMPORTS);
ignoreLiteralSequences = properties.getProperty(CpdLanguageProperties.CPD_IGNORE_LITERAL_SEQUENCES);
ignoreAttributes = properties.getProperty(CpdLanguageProperties.CPD_IGNORE_METADATA);

4
pmd-cs/src/test/java/net/sourceforge/pmd/lang/cs/cpd/CsTokenizerTest.java → pmd-cs/src/test/java/net/sourceforge/pmd/lang/cs/cpd/CsCpdLexerTest.java
View File

@ -14,9 +14,9 @@ import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
import net.sourceforge.pmd.cpd.test.LanguagePropertyConfig;
import net.sourceforge.pmd.lang.ast.LexException;
class CsTokenizerTest extends CpdTextComparisonTest {
class CsCpdLexerTest extends CpdTextComparisonTest {
CsTokenizerTest() {
CsCpdLexerTest() {
super("cs", ".cs");
}