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

Stop ClassScope from building nodes

Browse Source
This commit is contained in:
Clément Fournier
2020-04-22 00:23:28 +02:00
parent 35c2637405
commit 83189fce77
2 changed files with 59 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaNode.java
View File

@ -24,7 +24,6 @@ public abstract class AbstractJavaNode extends AbstractJjtreeNode<JavaNode> impl
super(id);
}
@Override
public Scope getScope() {
if (scope == null) {

125
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ClassScope.java
View File

@ -21,19 +21,12 @@ import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
import net.sourceforge.pmd.lang.java.ast.ASTExtendsList;
import net.sourceforge.pmd.lang.java.ast.ASTFormalParameter;
import net.sourceforge.pmd.lang.java.ast.ASTFormalParameters;
import net.sourceforge.pmd.lang.java.ast.ASTImplementsList;
import net.sourceforge.pmd.lang.java.ast.ASTLiteral;
import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclarator;
import net.sourceforge.pmd.lang.java.ast.ASTName;
import net.sourceforge.pmd.lang.java.ast.ASTPrimarySuffix;
import net.sourceforge.pmd.lang.java.ast.ASTPrimitiveType;
import net.sourceforge.pmd.lang.java.ast.ASTReferenceType;
import net.sourceforge.pmd.lang.java.ast.ASTType;
import net.sourceforge.pmd.lang.java.ast.ASTTypeParameter;
import net.sourceforge.pmd.lang.java.ast.ASTTypeParameters;
import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId;
import net.sourceforge.pmd.lang.symboltable.Applier;
import net.sourceforge.pmd.lang.symboltable.ImageFinderFunction;
import net.sourceforge.pmd.lang.symboltable.NameDeclaration;
@ -190,9 +183,9 @@ public class ClassScope extends AbstractJavaScope {
final boolean hasAuxclasspath = getEnclosingScope(SourceFileScope.class).hasAuxclasspath();
matchMethodDeclaration(occurrence, methodDeclarations.keySet(), hasAuxclasspath, result);
if (isEnum && "valueOf".equals(occurrence.getImage())) {
result.add(createBuiltInMethodDeclaration("valueOf", "String"));
}
// if (isEnum && "valueOf".equals(occurrence.getImage())) {
// result.add(createBuiltInMethodDeclaration("valueOf", "String"));
// }
if (result.isEmpty()) {
for (ClassNameDeclaration innerClass : getClassDeclarations().keySet()) {
@ -292,62 +285,62 @@ public class ClassScope extends AbstractJavaScope {
* the reference types of each parameter of the method
* @return a method name declaration
*/
private MethodNameDeclaration createBuiltInMethodDeclaration(final String methodName,
final String... parameterTypes) {
ASTMethodDeclaration methodDeclaration = new ASTMethodDeclaration(0);
methodDeclaration.setPublic(true);
methodDeclaration.setScope(this);
ASTMethodDeclarator methodDeclarator = new ASTMethodDeclarator(0);
methodDeclarator.setImage(methodName);
methodDeclarator.setScope(this);
ASTFormalParameters formalParameters = new ASTFormalParameters(0);
formalParameters.setScope(this);
methodDeclaration.addChild(methodDeclarator, 0);
methodDeclarator.setParent(methodDeclaration);
methodDeclarator.addChild(formalParameters, 0);
formalParameters.setParent(methodDeclarator);
/*
* jjtAddChild resizes it's child node list according to known indexes.
* Going backwards makes sure the first time it gets the right size avoiding copies.
*/
for (int i = parameterTypes.length - 1; i >= 0; i--) {
ASTFormalParameter formalParameter = new ASTFormalParameter(0);
formalParameters.addChild(formalParameter, i);
formalParameter.setParent(formalParameters);
ASTVariableDeclaratorId variableDeclaratorId = new ASTVariableDeclaratorId(0);
variableDeclaratorId.setImage("arg" + i);
formalParameter.addChild(variableDeclaratorId, 1);
variableDeclaratorId.setParent(formalParameter);
ASTType type = new ASTType(0);
formalParameter.addChild(type, 0);
type.setParent(formalParameter);
if (PRIMITIVE_TYPES.contains(parameterTypes[i])) {
ASTPrimitiveType primitiveType = new ASTPrimitiveType(0);
primitiveType.setImage(parameterTypes[i]);
type.addChild(primitiveType, 0);
primitiveType.setParent(type);
} else {
ASTReferenceType referenceType = new ASTReferenceType(0);
type.addChild(referenceType, 0);
referenceType.setParent(type);
// TODO : this could actually be a primitive array...
ASTClassOrInterfaceType classOrInterfaceType = new ASTClassOrInterfaceType(0);
classOrInterfaceType.setImage(parameterTypes[i]);
referenceType.addChild(classOrInterfaceType, 0);
classOrInterfaceType.jjtSetParent(referenceType);
}
}
return new MethodNameDeclaration(methodDeclarator);
}
// private MethodNameDeclaration createBuiltInMethodDeclaration(final String methodName,
// final String... parameterTypes) {
// ASTMethodDeclaration methodDeclaration = new ASTMethodDeclaration(0);
// methodDeclaration.setPublic(true);
// methodDeclaration.setScope(this);
//
// ASTMethodDeclarator methodDeclarator = new ASTMethodDeclarator(0);
// methodDeclarator.setImage(methodName);
// methodDeclarator.setScope(this);
//
// ASTFormalParameters formalParameters = new ASTFormalParameters(0);
// formalParameters.setScope(this);
//
// methodDeclaration.addChild(methodDeclarator, 0);
// methodDeclarator.setParent(methodDeclaration);
// methodDeclarator.addChild(formalParameters, 0);
// formalParameters.setParent(methodDeclarator);
//
// /*
// * jjtAddChild resizes it's child node list according to known indexes.
// * Going backwards makes sure the first time it gets the right size avoiding copies.
// */
// for (int i = parameterTypes.length - 1; i >= 0; i--) {
// ASTFormalParameter formalParameter = new ASTFormalParameter(0);
// formalParameters.addChild(formalParameter, i);
// formalParameter.setParent(formalParameters);
//
// ASTVariableDeclaratorId variableDeclaratorId = new ASTVariableDeclaratorId(0);
// variableDeclaratorId.setImage("arg" + i);
// formalParameter.addChild(variableDeclaratorId, 1);
// variableDeclaratorId.setParent(formalParameter);
//
// ASTType type = new ASTType(0);
// formalParameter.addChild(type, 0);
// type.setParent(formalParameter);
//
// if (PRIMITIVE_TYPES.contains(parameterTypes[i])) {
// ASTPrimitiveType primitiveType = new ASTPrimitiveType(0);
// primitiveType.setImage(parameterTypes[i]);
// type.addChild(primitiveType, 0);
// primitiveType.setParent(type);
// } else {
// ASTReferenceType referenceType = new ASTReferenceType(0);
// type.addChild(referenceType, 0);
// referenceType.setParent(type);
//
// // TODO : this could actually be a primitive array...
// ASTClassOrInterfaceType classOrInterfaceType = new ASTClassOrInterfaceType(0);
// classOrInterfaceType.setImage(parameterTypes[i]);
// referenceType.addChild(classOrInterfaceType, 0);
// classOrInterfaceType.jjtSetParent(referenceType);
// }
// }
//
// return new MethodNameDeclaration(methodDeclarator);
// }
/**
* Provide a list of types of the parameters of the given method