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

12
pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/cpd/test/CpdTextComparisonTest.kt
View File

@@ -31,9 +31,9 @@ abstract class CpdTextComparisonTest(
extensionIncludingDot
)
fun newTokenizer(config: LanguagePropertyConfig): Tokenizer {
fun newCpdLexer(config: LanguagePropertyConfig): CpdLexer {
val properties = language.newPropertyBundle().also { config.setProperties(it) }
return language.createCpdTokenizer(properties)
return language.createCpdLexer(properties)
}
override val resourceLoader: Class<*>
@@ -64,7 +64,7 @@ abstract class CpdTextComparisonTest(
config: LanguagePropertyConfig = defaultProperties()
) {
super.doTest(fileBaseName, expectedSuffix) { fdata ->
val tokens = tokenize(newTokenizer(config), fdata)
val tokens = tokenize(newCpdLexer(config), fdata)
buildString { format(tokens) }
}
}
@@ -83,7 +83,7 @@ abstract class CpdTextComparisonTest(
config: LanguagePropertyConfig = defaultProperties()
): LexException =
shouldThrow {
tokenize(newTokenizer(config), fileData)
tokenize(newCpdLexer(config), fileData)
}
@@ -169,10 +169,10 @@ abstract class CpdTextComparisonTest(
fun sourceCodeOf(text: String, fileName: FileId = FileId.UNKNOWN): FileData =
FileData(fileName = fileName, fileText = text)
fun tokenize(tokenizer: Tokenizer, fileData: FileData): Tokens =
fun tokenize(cpdLexer: CpdLexer, fileData: FileData): Tokens =
Tokens().also { tokens ->
val source = sourceCodeOf(fileData)
Tokenizer.tokenize(tokenizer, source, tokens)
CpdLexer.tokenize(cpdLexer, source, tokens)
}
private companion object {