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

Fix failing tests

Browse Source
This commit is contained in:
Clément Fournier
2024-04-28 20:10:22 +02:00
parent 9a25d90c76
commit b70521874a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
javacc-wrapper.xml
View File

@ -113,7 +113,7 @@
<mkdir dir="${target-package-dir}" /> <mkdir dir="${target-package-dir}" />
<condition property="option-token-manager-uses-parser"> <condition property="option-token-manager-uses-parser">
<resourcecontains resource="${grammar-file}" substring="TOKEN_MANAGER_USES_PARSER"/> <resourcecontains resource="${grammar-file}" substring="TOKEN_MANAGER_USES_PARSER = true"/>
</condition> </condition>
</target> </target>
@ -471,8 +471,10 @@ public final class ${token-constants-name} \{${line.separator}
<target name="constants-files-token-manager-uses-parser" if="option-token-manager-uses-parser"> <target name="constants-files-token-manager-uses-parser" if="option-token-manager-uses-parser">
<echo level="info">Option TOKEN_MANAGER_USES_PARSER is enabled</echo> <echo level="info">Option TOKEN_MANAGER_USES_PARSER is enabled</echo>
<replaceregexp flags="g"> <replaceregexp flags="g">
<regexp pattern="return new ${tokenmgr-name}\(cs\);" /> <regexp pattern="return new ${tokenmgr-name}\(cs\);" />
<!-- TODO this implementation does not work as the first token is skipped, since it is fetched by the parser itself. -->
<substitution expression="return new ${parser-name}(cs).token_source;" /> <substitution expression="return new ${parser-name}(cs).token_source;" />
<file name="${token-constants-file}" /> <file name="${token-constants-file}" />
</replaceregexp> </replaceregexp>

1
pmd-java/etc/grammar/Java.jjt
View File

@ -300,7 +300,6 @@ options {
MULTI = true; MULTI = true;
VISITOR = true; VISITOR = true;
NODE_PACKAGE="net.sourceforge.pmd.lang.java.ast"; NODE_PACKAGE="net.sourceforge.pmd.lang.java.ast";
TOKEN_MANAGER_USES_PARSER = true;
// disable the calculation of expected tokens when a parse error occurs // disable the calculation of expected tokens when a parse error occurs
// depending on the possible allowed next tokens, this // depending on the possible allowed next tokens, this

3
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/SyntacticJavaTokenizerFactory.java
View File

@ -30,7 +30,7 @@ public final class SyntacticJavaTokenizerFactory {
@Deprecated @Deprecated
public static TokenManager<JavaccToken> createTokenizer(CharStream cs) { public static TokenManager<JavaccToken> createTokenizer(CharStream cs) {
final List<JavaccToken> tokenList = new ArrayList<>(); final List<JavaccToken> tokenList = new ArrayList<>();
JavaParserImplTokenManager tokenManager = new JavaParserImplTokenManager(null, cs) { JavaParserImplTokenManager tokenManager = new JavaParserImplTokenManager(cs) {
@Override @Override
public JavaccToken getNextToken() { public JavaccToken getNextToken() {
JavaccToken token = super.getNextToken(); JavaccToken token = super.getNextToken();
@ -41,7 +41,6 @@ public final class SyntacticJavaTokenizerFactory {
LanguageVersion latestVersion = JavaLanguageModule.getInstance().getLatestVersion(); LanguageVersion latestVersion = JavaLanguageModule.getInstance().getLatestVersion();
JavaParserImpl parser = new JavaParserImpl(tokenManager); JavaParserImpl parser = new JavaParserImpl(tokenManager);
tokenManager.parser = parser;
parser.setJdkVersion(JavaLanguageProperties.getInternalJdkVersion(latestVersion)); parser.setJdkVersion(JavaLanguageProperties.getInternalJdkVersion(latestVersion));
parser.setPreview(JavaLanguageProperties.isPreviewEnabled(latestVersion)); parser.setPreview(JavaLanguageProperties.isPreviewEnabled(latestVersion));