hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Fix merge (build passes)

Browse Source
This commit is contained in:
Clément Fournier
2020-08-23 16:53:40 +02:00
parent b2c8892d26
commit 9c82dd11ef
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/multifile/ApexMultifileVisitor.java
View File

@ -7,10 +7,8 @@ package net.sourceforge.pmd.lang.apex.multifile;
import java.util.Stack; import java.util.Stack;
import net.sourceforge.pmd.lang.apex.ast.ASTMethod; import net.sourceforge.pmd.lang.apex.ast.ASTMethod;
import net.sourceforge.pmd.lang.apex.ast.ASTUserClass;
import net.sourceforge.pmd.lang.apex.ast.ASTUserClassOrInterface; import net.sourceforge.pmd.lang.apex.ast.ASTUserClassOrInterface;
import net.sourceforge.pmd.lang.apex.ast.ASTUserEnum; import net.sourceforge.pmd.lang.apex.ast.ASTUserEnum;
import net.sourceforge.pmd.lang.apex.ast.ASTUserInterface;
import net.sourceforge.pmd.lang.apex.ast.ASTUserTrigger; import net.sourceforge.pmd.lang.apex.ast.ASTUserTrigger;
import net.sourceforge.pmd.lang.apex.ast.ApexVisitorBase; import net.sourceforge.pmd.lang.apex.ast.ApexVisitorBase;
@ -56,14 +54,4 @@ public class ApexMultifileVisitor extends ApexVisitorBase<Void, Void> {
return data; return data;
} }
@Override
public final Object visit(ASTUserInterface node, Object data) {
return visitTypeDecl(node, data);
}
@Override
public final Object visit(ASTUserClass node, Object data) {
return visitTypeDecl(node, data);
}
} }

14
pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/AbstractNcssCountRule.java
View File

@ -26,6 +26,7 @@ import net.sourceforge.pmd.lang.apex.ast.ASTWhileLoopStatement;
import net.sourceforge.pmd.lang.apex.ast.ApexNode; import net.sourceforge.pmd.lang.apex.ast.ApexNode;
import net.sourceforge.pmd.lang.apex.ast.ApexVisitorBase; import net.sourceforge.pmd.lang.apex.ast.ApexVisitorBase;
import net.sourceforge.pmd.lang.apex.rule.internal.AbstractCounterCheckRule; import net.sourceforge.pmd.lang.apex.rule.internal.AbstractCounterCheckRule;
import net.sourceforge.pmd.lang.ast.Node;
/** /**
* Abstract superclass for NCSS counting methods. Counts tokens according to * Abstract superclass for NCSS counting methods. Counts tokens according to
@ -65,13 +66,12 @@ public abstract class AbstractNcssCountRule<T extends ApexNode<?>> extends Abstr
} }
@Override @Override
protected Integer zero() { protected Integer visitChildren(Node node, Void data) {
return 0; int v = 0;
} for (Node child : node.children()) {
v += child.acceptVisitor(this, data);
@Override }
protected Integer combine(Integer acc, Integer childValue) { return v;
return acc + childValue;
} }
/** /**

10
pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptNode.java
View File

@ -6,11 +6,21 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
import org.mozilla.javascript.ast.AstNode; import org.mozilla.javascript.ast.AstNode;
import net.sourceforge.pmd.annotation.DeprecatedUntil700;
import net.sourceforge.pmd.lang.ast.impl.GenericNode; import net.sourceforge.pmd.lang.ast.impl.GenericNode;
public interface EcmascriptNode<T extends AstNode> extends GenericNode<EcmascriptNode<?>> { public interface EcmascriptNode<T extends AstNode> extends GenericNode<EcmascriptNode<?>> {
/**
* @deprecated See {@link EcmascriptParserVisitor}
*/
@Deprecated
@DeprecatedUntil700
default Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
return acceptVisitor(visitor, data);
}
/** /**
* Get the underlying Rhino AST node. * Get the underlying Rhino AST node.
* @deprecated The underlying Rhino node should not be used directly. * @deprecated The underlying Rhino node should not be used directly.