Merge branch 'master' into dogfood-6.30.0

This commit is contained in:
Andreas Dangel
2021-02-26 19:26:36 +01:00
258 changed files with 11064 additions and 1732 deletions

View File

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

View File

@ -29,11 +29,15 @@
<delete dir="${target}/net/sourceforge/pmd/lang/ecmascript5/ast" />
<mkdir dir="${target}/net/sourceforge/pmd/lang/ecmascript5/ast" />
<!-- Ensure generated using CharStream interface -->
<javacc static="false"
usercharstream="true"
target="etc/grammar/es5.jj"
outputdirectory="${target}/net/sourceforge/pmd/lang/ecmascript5/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/ecmascript5/ast" />
<arg value="etc/grammar/es5.jj" />
</java>
<replace file="${target}/net/sourceforge/pmd/lang/ecmascript5/ast/Ecmascript5ParserTokenManager.java"
token="class Ecmascript5ParserTokenManager"
value="class Ecmascript5ParserTokenManager extends net.sourceforge.pmd.lang.ast.AbstractTokenManager" />
@ -88,6 +92,11 @@ public class Token implements GenericToken, java.io.Serializable]]></replacevalu
return endColumn;
}
@Override
public int getKind() {
return kind;
}
]]></replacevalue>
</replace>