hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Merge remote-tracking branch 'origin/master' into pmd/7.0.x

Browse Source
This commit is contained in:
Andreas Dangel
2020-01-24 19:18:17 +01:00
parent 127b232f2e 03b8f267e4
commit b02ab00e87
25 changed files with 506 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pmd-cpp/src/main/ant/alljavacc.xml
View File

@ -91,6 +91,23 @@ public class Token implements GenericToken, java.io.Serializable]]></replacevalu
]]></replacevalue>
</replace>
<replaceregexp>
<regexp pattern="class|interface" />
<substitution expression="@Deprecated @net.sourceforge.pmd.annotation.InternalApi \0" />
<fileset dir="${target}/net/sourceforge/pmd/lang/cpp/ast">
<exclude name="AST*.java" />
</fileset>
</replaceregexp>
<replaceregexp>
<regexp pattern="public class ParseException " />
<substitution expression=" /** @deprecated Use superclass {@link net.sourceforge.pmd.lang.ast.ParseException} */
@Deprecated @net.sourceforge.pmd.annotation.InternalApi \0" />
<fileset file="${target}/net/sourceforge/pmd/lang/cpp/ast/ParseException.java"/>
</replaceregexp>
</target>
</project>

3
pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/CppCharStream.java
View File

@ -8,6 +8,7 @@ import java.io.IOException;
import java.io.Reader;
import java.util.regex.Pattern;
import net.sourceforge.pmd.annotation.InternalApi;
import net.sourceforge.pmd.lang.ast.SimpleCharStream;
/**
@ -16,6 +17,8 @@ import net.sourceforge.pmd.lang.ast.SimpleCharStream;
*
* @author Andreas Dangel
*/
@Deprecated
@InternalApi
public class CppCharStream extends SimpleCharStream {
private static final Pattern CONTINUATION = Pattern.compile("\\\\\\n|\\\\\\r\\n");