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

Make generic visitor superclass

Browse Source 
Use raw supertype to avoid conflicts
This commit is contained in:
Clément Fournier
2019-12-17 16:59:19 +01:00
parent 2f37e1c256
commit 86b274c681
16 changed files with 177 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitorAdapter.java
View File

@ -4,6 +4,8 @@
package net.sourceforge.pmd.lang.scala.ast;
import net.sourceforge.pmd.lang.java.ast.impl.BaseGenericVisitor;
import scala.meta.Case;
import scala.meta.Ctor;
import scala.meta.Decl;
@ -33,25 +35,11 @@ import scala.meta.Type;
* @param <R>
* The type of the returned data
*/
public class ScalaParserVisitorAdapter<D, R> implements ScalaParserVisitor<D, R> {
/** Initial value when combining values returned by children. */
protected R zero() {
return null;
}
/** Merge two values of type R, used to combine values returned by children. */
protected R combine(R acc, R r) {
return r;
}
public class ScalaParserVisitorAdapter<D, R> extends BaseGenericVisitor<ScalaNode<?>, R, D> implements ScalaParserVisitor<D, R> {
@Override
public R visit(ScalaNode<?> node, D data) {
R returnValue = zero();
for (int i = 0; i < node.getNumChildren(); ++i) {
returnValue = combine(returnValue, node.getChild(i).accept(this, data));
}
return returnValue;
protected R visitChildAt(ScalaNode<?> node, int idx, D data) {
return node.getChild(idx).accept(this, data);
}
@Override

4
pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRule.java
View File

@ -186,8 +186,8 @@ public class ScalaRule extends AbstractRule implements ScalaParserVisitor<RuleCo
@Override
public RuleContext visit(ScalaNode<?> node, RuleContext data) {
for (int i = 0; i < node.jjtGetNumChildren(); ++i) {
node.jjtGetChild(i).accept(this, data);
for (int i = 0; i < node.getNumChildren(); ++i) {
node.getChild(i).accept(this, data);
}
return data;
}