Make modelica visitor generic

javacc-wrapper.xml

@@ -500,6 +500,15 @@ public interface" />
             <replacefilter token="default R visit${node-name}(${node-name} node, P data) { for (int i = 0, len = node.getNumChildren(); i &lt; len; i++) node.getChild(i).jjtAccept(this, data); return data; }"
                            value="default R visit${node-name}(${node-name} node, P data) { return visitNode(node, data); }" />
         </replace>
+
+        <replace>
+            <replacefilter token="public Object jjtAccept(${lang-name}ParserVisitor visitor, Object data)"
+                           value="@Override protected &lt;P, R> R accept${lang-name}Visitor(${lang-name}Visitor&lt;? super P, ? extends R> visitor, P data)" />
+
+            <fileset dir="${target-package-dir}">
+                <include name="${ast-prefix}*" />
+            </fileset>
+        </replace>
     </target>
 
 </project>

pmd-modelica/pom.xml

@@ -40,7 +40,7 @@
                         <phase>generate-sources</phase>
                         <configuration>
                             <target>
-                                <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
+                                <ant antfile="${javacc.ant.wrapper}" target="alljavacc-visitor+">
                                     <property name="javacc.jar" value="${javacc.jar}" />
                                     <property name="lang-name" value="Modelica" />
                                     <property name="lang-terse-name" value="modelica" />

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTClassDefinition.java

@@ -68,7 +68,7 @@ public class ASTClassDefinition extends AbstractModelicaNode {
     }
 
     @Override
-    public Object jjtAccept(ModelicaParserVisitor visitor, Object data) {
+    protected <P, R> R acceptModelicaVisitor(ModelicaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 }

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTComponentReference.java

@@ -56,7 +56,7 @@ public final class ASTComponentReference extends AbstractModelicaNode implements
     }
 
     @Override
-    public Object jjtAccept(ModelicaParserVisitor visitor, Object data) {
+    protected <P, R> R acceptModelicaVisitor(ModelicaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTDerClassSpecifier.java

@@ -10,7 +10,7 @@ public final class ASTDerClassSpecifier extends AbstractModelicaClassSpecifierNo
     }
 
     @Override
-    public Object jjtAccept(ModelicaParserVisitor visitor, Object data) {
+    protected <P, R> R acceptModelicaVisitor(ModelicaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 }

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTElementList.java

@@ -20,7 +20,7 @@ public class ASTElementList extends AbstractModelicaNode {
     }
 
     @Override
-    public Object jjtAccept(ModelicaParserVisitor visitor, Object data) {
+    protected <P, R> R acceptModelicaVisitor(ModelicaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 }

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTEnumerationShortClassSpecifier.java

@@ -10,7 +10,7 @@ public final class ASTEnumerationShortClassSpecifier extends AbstractModelicaCla
     }
 
     @Override
-    public Object jjtAccept(ModelicaParserVisitor visitor, Object data) {
+    protected <P, R> R acceptModelicaVisitor(ModelicaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 }

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTExtendingLongClassSpecifier.java

@@ -12,7 +12,7 @@ public final class ASTExtendingLongClassSpecifier extends AbstractModelicaClassS
     }
 
     @Override
-    public Object jjtAccept(ModelicaParserVisitor visitor, Object data) {
+    protected <P, R> R acceptModelicaVisitor(ModelicaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTMultipleDefinitionImportClause.java

@@ -25,7 +25,7 @@ public final class ASTMultipleDefinitionImportClause extends AbstractModelicaImp
     }
 
     @Override
-    public Object jjtAccept(ModelicaParserVisitor visitor, Object data) {
+    protected <P, R> R acceptModelicaVisitor(ModelicaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTName.java

@@ -19,7 +19,7 @@ public final class ASTName extends AbstractModelicaNode implements ResolvableMod
     }
 
     @Override
-    public Object jjtAccept(ModelicaParserVisitor visitor, Object data) {
+    protected <P, R> R acceptModelicaVisitor(ModelicaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTRenamingImportClause.java

@@ -19,7 +19,7 @@ public final class ASTRenamingImportClause extends AbstractModelicaImportClause
     }
 
     @Override
-    public Object jjtAccept(ModelicaParserVisitor visitor, Object data) {
+    protected <P, R> R acceptModelicaVisitor(ModelicaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTSimpleLongClassSpecifier.java

@@ -12,7 +12,7 @@ public final class ASTSimpleLongClassSpecifier extends AbstractModelicaClassSpec
     }
 
     @Override
-    public Object jjtAccept(ModelicaParserVisitor visitor, Object data) {
+    protected <P, R> R acceptModelicaVisitor(ModelicaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTSimpleShortClassSpecifier.java

@@ -13,7 +13,7 @@ public final class ASTSimpleShortClassSpecifier extends AbstractModelicaClassSpe
     }
 
     @Override
-    public Object jjtAccept(ModelicaParserVisitor visitor, Object data) {
+    protected <P, R> R acceptModelicaVisitor(ModelicaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTSingleDefinitionImportClause.java

@@ -19,7 +19,7 @@ public class ASTSingleDefinitionImportClause extends AbstractModelicaImportClaus
     }
 
     @Override
-    public Object jjtAccept(ModelicaParserVisitor visitor, Object data) {
+    protected <P, R> R acceptModelicaVisitor(ModelicaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTStoredDefinition.java

@@ -18,7 +18,7 @@ public class ASTStoredDefinition extends AbstractModelicaNode implements RootNod
     }
 
     @Override
-    public Object jjtAccept(ModelicaParserVisitor visitor, Object data) {
+    protected <P, R> R acceptModelicaVisitor(ModelicaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTUnqualifiedImportClause.java

@@ -21,7 +21,7 @@ public final class ASTUnqualifiedImportClause extends AbstractModelicaImportClau
     }
 
     @Override
-    public Object jjtAccept(ModelicaParserVisitor visitor, Object data) {
+    protected <P, R> R acceptModelicaVisitor(ModelicaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTWithinClause.java

@@ -10,7 +10,7 @@ public final class ASTWithinClause extends AbstractModelicaNode {
     }
 
     @Override
-    public Object jjtAccept(ModelicaParserVisitor visitor, Object data) {
+    protected <P, R> R acceptModelicaVisitor(ModelicaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/AbstractModelicaNode.java

@@ -30,8 +30,8 @@ abstract class AbstractModelicaNode extends AbstractJjtreeNode<AbstractModelicaN
         super.setImage(image);
     }
 
-    @Override
+
-    public abstract Object jjtAccept(ModelicaParserVisitor visitor, Object data);
+    protected abstract <P, R> R acceptModelicaVisitor(ModelicaVisitor<? super P, ? extends R> visitor, P data);
 
     @Override
     public String getXPathNodeName() {

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaNode.java

@@ -4,6 +4,8 @@
 
 package net.sourceforge.pmd.lang.modelica.ast;
 
+import net.sourceforge.pmd.annotation.DeprecatedUntil700;
+import net.sourceforge.pmd.lang.ast.AstVisitor;
 import net.sourceforge.pmd.lang.ast.impl.javacc.JjtreeNode;
 import net.sourceforge.pmd.lang.modelica.resolver.ModelicaScope;
 
@@ -12,6 +14,17 @@ import net.sourceforge.pmd.lang.modelica.resolver.ModelicaScope;
  */
 public interface ModelicaNode extends JjtreeNode<ModelicaNode> {
 
+
+    /**
+     * @deprecated Use {@link #acceptVisitor(AstVisitor, Object)}
+     */
+    @DeprecatedUntil700
+    @Deprecated
+    default Object jjtAccept(ModelicaParserVisitor visitor, Object data) {
+        return acceptVisitor(visitor, data);
+    }
+
+
     /**
      * Returns the lexical scope this node is contained in.
      */
@@ -24,5 +37,4 @@ public interface ModelicaNode extends JjtreeNode<ModelicaNode> {
      */
     ModelicaScope getMostSpecificScope();
 
-    Object jjtAccept(ModelicaParserVisitor visitor, Object data);
 }

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaParserVisitor.java

@@ -0,0 +1,25 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.modelica.ast;
+
+import net.sourceforge.pmd.annotation.DeprecatedUntil700;
+import net.sourceforge.pmd.lang.ast.Node;
+
+/**
+ * Backwards-compatibility only.
+ *
+ * @deprecated Use {@link ModelicaVisitor}
+ */
+@Deprecated
+@DeprecatedUntil700
+public interface ModelicaParserVisitor extends ModelicaVisitor<Object, Object> {
+
+    @Override
+    default Object visitNode(Node node, Object param) {
+        node.children().forEach(c -> c.acceptVisitor(this, param));
+        return param;
+    }
+
+}

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaParserVisitorAdapter.java

@@ -4,5 +4,10 @@
 
 package net.sourceforge.pmd.lang.modelica.ast;
 
-public class ModelicaParserVisitorAdapter implements ModelicaParserVisitor {
+import net.sourceforge.pmd.annotation.DeprecatedUntil700;
+
+
+@Deprecated
+@DeprecatedUntil700
+public class ModelicaParserVisitorAdapter extends ModelicaVisitorBase<Object, Object> implements ModelicaParserVisitor {
 }

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaVisitorBase.java

@@ -0,0 +1,14 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.modelica.ast;
+
+import net.sourceforge.pmd.lang.ast.AstVisitorBase;
+
+/**
+ * Base implementation of {@link ModelicaVisitor}.
+ */
+public class ModelicaVisitorBase<P, R> extends AstVisitorBase<P, R> implements ModelicaVisitor<P, R> {
+
+}

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/resolver/ModelicaSymbolFacade.java

@@ -9,6 +9,6 @@ import net.sourceforge.pmd.lang.modelica.ast.ASTStoredDefinition;
 public class ModelicaSymbolFacade {
     public void initializeWith(ASTStoredDefinition node) {
         ScopeAndDeclarationFinder sc = new ScopeAndDeclarationFinder();
-        node.jjtAccept(sc, null);
+        node.acceptVisitor(sc, null);
     }
 }

pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/rule/AbstractModelicaRule.java

@@ -9,7 +9,6 @@ import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.ast.AstProcessingStage;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.modelica.ModelicaLanguageModule;
-import net.sourceforge.pmd.lang.modelica.ast.ModelicaNode;
 import net.sourceforge.pmd.lang.modelica.ast.ModelicaParserVisitor;
 import net.sourceforge.pmd.lang.modelica.internal.ModelicaProcessingStage;
 import net.sourceforge.pmd.lang.rule.AbstractRule;
@@ -25,10 +24,9 @@ public abstract class AbstractModelicaRule extends AbstractRule implements Model
 
     @Override
     public void apply(Node target, RuleContext ctx) {
-        ((ModelicaNode) target).jjtAccept(this, ctx);
+        target.acceptVisitor(this, ctx);
     }
 
-
     @Override
     public boolean dependsOn(AstProcessingStage<?> stage) {
         if (!(stage instanceof ModelicaProcessingStage)) {

pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/resolver/ModelicaResolverTest.java

@@ -46,7 +46,7 @@ public class ModelicaResolverTest {
 
     private ModelicaNode findNodeByClassAndImage(ASTStoredDefinition ast, Class<?> clazz, String image) {
         NodeFinder vis = new NodeFinder(clazz, image);
-        ast.jjtAccept(vis, null);
+        ast.acceptVisitor(vis, null);
         return vis.getResult();
     }