Merge branch 'master' into pr-4470

This commit is contained in:
Andreas Dangel
2023-05-19 09:46:16 +02:00
263 changed files with 7812 additions and 2976 deletions

View File

@ -34,7 +34,7 @@
<configuration>
<target>
<ant antfile="${javacc.ant.wrapper}" target="alljavacc">
<property name="no-jjtree" value="true"/> <!-- This is a CPD module -->
<property name="no-jjtree" value="true" /> <!-- This is a CPD module -->
<property name="lang-name" value="Cpp" />
<property name="lang-terse-name" value="cpp" />
<property name="javacc.jar" value="${javacc.jar}" />

View File

@ -7,7 +7,7 @@ package net.sourceforge.pmd.cpd;
import java.util.Properties;
import java.util.regex.Pattern;
import net.sourceforge.pmd.cpd.internal.JavaCCTokenizer;
import net.sourceforge.pmd.cpd.impl.JavaCCTokenizer;
import net.sourceforge.pmd.cpd.token.JavaCCTokenFilter;
import net.sourceforge.pmd.cpd.token.TokenFilter;
import net.sourceforge.pmd.lang.TokenManager;