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

Fix #3698 - Error resolving Symbol Table

Browse Source
This commit is contained in:
Clément Fournier
2022-01-15 15:44:01 +01:00
parent 72c4bbb31d
commit f838b183bf
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/NameFinder.java
View File

@ -59,10 +59,12 @@ public class NameFinder {
if (node instanceof ASTPrimarySuffix) { if (node instanceof ASTPrimarySuffix) {
ASTPrimarySuffix suffix = (ASTPrimarySuffix) node; ASTPrimarySuffix suffix = (ASTPrimarySuffix) node;
if (suffix.isArguments()) { if (suffix.isArguments()) {
if (!names.isEmpty()) {
JavaNameOccurrence occurrence = names.get(names.size() - 1); JavaNameOccurrence occurrence = names.get(names.size() - 1);
occurrence.setIsMethodOrConstructorInvocation(); occurrence.setIsMethodOrConstructorInvocation();
ASTArguments args = (ASTArguments) ((ASTPrimarySuffix) node).getChild(0); ASTArguments args = (ASTArguments) ((ASTPrimarySuffix) node).getChild(0);
occurrence.setArgumentCount(args.size()); occurrence.setArgumentCount(args.size());
}
} else if (suffix.getNumChildren() == 1 && suffix.getChild(0) instanceof ASTMemberSelector) { } else if (suffix.getNumChildren() == 1 && suffix.getChild(0) instanceof ASTMemberSelector) {
ASTMemberSelector member = (ASTMemberSelector) suffix.getChild(0); ASTMemberSelector member = (ASTMemberSelector) suffix.getChild(0);
if (member.getNumChildren() == 1 && member.getChild(0) instanceof ASTMethodReference) { if (member.getNumChildren() == 1 && member.getChild(0) instanceof ASTMethodReference) {

16
pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/ScopeAndDeclarationFinderTest.java
View File

@ -16,6 +16,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit; import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit;
import net.sourceforge.pmd.lang.java.ast.ASTLambdaExpression; import net.sourceforge.pmd.lang.java.ast.ASTLambdaExpression;
import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclarator; import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclarator;
import net.sourceforge.pmd.lang.java.ast.ASTPrimaryExpression;
import net.sourceforge.pmd.lang.symboltable.NameDeclaration; import net.sourceforge.pmd.lang.symboltable.NameDeclaration;
public class ScopeAndDeclarationFinderTest extends BaseNonParserTest { public class ScopeAndDeclarationFinderTest extends BaseNonParserTest {
@ -72,4 +73,19 @@ public class ScopeAndDeclarationFinderTest extends BaseNonParserTest {
ClassScope scope2 = methods.get(1).getScope().getEnclosingScope(ClassScope.class); ClassScope scope2 = methods.get(1).getScope().getEnclosingScope(ClassScope.class);
Assert.assertSame(scope1, scope2); Assert.assertSame(scope1, scope2);
} }
@Test
public void testSuperCtor() {
// #3698 -- test that parsing does not throw (this executes the symbol pass)
ASTCompilationUnit acu = parseCode("class Foo { Object rs; class Inner { \n"
+ " Inner(Object phase) {\n"
+ " (rs.deferredAttr).super(AttrMode.SPECULATIVE, msym, phase);\n"
+ " } } }");
ASTClassOrInterfaceDeclaration inner = acu.getFirstDescendantOfType(ASTClassOrInterfaceDeclaration.class)
.getFirstDescendantOfType(ASTClassOrInterfaceDeclaration.class);
Assert.assertEquals(5, inner.findDescendantsOfType(ASTPrimaryExpression.class).size());
}
} }