[core] Rename Tokenizer to CpdLexer

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

View File

@@ -4,11 +4,11 @@
package net.sourceforge.pmd.lang.swift;
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.impl.SimpleLanguageModuleBase;
import net.sourceforge.pmd.lang.swift.cpd.SwiftTokenizer;
import net.sourceforge.pmd.lang.swift.cpd.SwiftCpdLexer;
/**
* Language Module for Swift
@@ -41,7 +41,7 @@ public class SwiftLanguageModule extends SimpleLanguageModuleBase {
}
@Override
public Tokenizer createCpdTokenizer(LanguagePropertyBundle bundle) {
return new SwiftTokenizer();
public CpdLexer createCpdLexer(LanguagePropertyBundle bundle) {
return new SwiftCpdLexer();
}
}

View File

@@ -7,13 +7,15 @@ package net.sourceforge.pmd.lang.swift.cpd;
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.Lexer;
import net.sourceforge.pmd.cpd.impl.AntlrTokenizer;
import net.sourceforge.pmd.cpd.impl.AntlrCpdLexer;
import net.sourceforge.pmd.lang.swift.ast.SwiftLexer;
/**
* SwiftTokenizer
*
* <p>Note: This class has been called SwiftTokenizer in PMD 6</p>.
*/
public class SwiftTokenizer extends AntlrTokenizer {
public class SwiftCpdLexer extends AntlrCpdLexer {
@Override
protected Lexer getLexerForSource(final CharStream charStream) {

View File

@@ -9,9 +9,9 @@ import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
import net.sourceforge.pmd.lang.swift.SwiftLanguageModule;
class SwiftTokenizerTest extends CpdTextComparisonTest {
class SwiftCpdLexerTest extends CpdTextComparisonTest {
SwiftTokenizerTest() {
SwiftCpdLexerTest() {
super(SwiftLanguageModule.getInstance(), ".swift");
}