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

Merge branch 'master' into 7.0.x

Browse Source
This commit is contained in:
Clément Fournier
2019-10-07 16:46:28 +02:00
parent 2d74ec4012 5c21dd7933
commit 6a2c87cd94
40 changed files with 614 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pmd-cpp/src/main/java/net/sourceforge/pmd/cpd/CPPTokenizer.java
View File

@ -51,23 +51,24 @@ public class CPPTokenizer extends JavaCCTokenizer {
return test;
}
BufferedReader reader = new BufferedReader(new StringReader(test));
StringBuilder filtered = new StringBuilder(test.length());
String line;
boolean skip = false;
while ((line = reader.readLine()) != null) {
if (skipBlocksStart.equalsIgnoreCase(line.trim())) {
skip = true;
} else if (skip && skipBlocksEnd.equalsIgnoreCase(line.trim())) {
skip = false;
try (BufferedReader reader = new BufferedReader(new StringReader(test))) {
StringBuilder filtered = new StringBuilder(test.length());
String line;
boolean skip = false;
while ((line = reader.readLine()) != null) {
if (skipBlocksStart.equalsIgnoreCase(line.trim())) {
skip = true;
} else if (skip && skipBlocksEnd.equalsIgnoreCase(line.trim())) {
skip = false;
}
if (!skip) {
filtered.append(line);
}
// always add a new line to keep the line-numbering
filtered.append(PMD.EOL);
}
if (!skip) {
filtered.append(line);
}
// always add a new line to keep the line-numbering
filtered.append(PMD.EOL);
return filtered.toString();
}
return filtered.toString();
}
@Override