Merge branch 'master' into pr-2963-update

This commit is contained in:
Andreas Dangel
2021-01-21 11:43:01 +01:00
208 changed files with 6404 additions and 998 deletions

View File

@ -7,7 +7,7 @@
<parent>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd</artifactId>
<version>6.30.0-SNAPSHOT</version>
<version>6.31.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

View File

@ -29,11 +29,15 @@
<delete dir="${target}/net/sourceforge/pmd/lang/matlab/ast" />
<mkdir dir="${target}/net/sourceforge/pmd/lang/matlab/ast" />
<!-- Ensure generated using CharStream interface -->
<javacc static="false"
usercharstream="true"
target="etc/grammar/matlab.jj"
outputdirectory="${target}/net/sourceforge/pmd/lang/matlab/ast"
javacchome="${javacc-home.path}" />
<java fork="true"
classname="javacc"
classpath="${javacc-home.path}/javacc.jar">
<sysproperty key="file.encoding" value="UTF-8" />
<arg value="-STATIC:false" />
<arg value="-USER_CHAR_STREAM:true" />
<arg value="-OUTPUT_DIRECTORY:${target}/net/sourceforge/pmd/lang/matlab/ast" />
<arg value="etc/grammar/matlab.jj" />
</java>
<replace file="${target}/net/sourceforge/pmd/lang/matlab/ast/MatlabParserTokenManager.java"
token="class MatlabParserTokenManager"
value="class MatlabParserTokenManager extends net.sourceforge.pmd.lang.ast.AbstractTokenManager" />