results = new ArrayList<>(benchmarksByName.values());
-
- long[] totalTime = new long[Benchmark.TotalPMD.index + 1];
- long[] totalCount = new long[Benchmark.TotalPMD.index + 1];
-
- for (BenchmarkResult benchmarkResult : results) {
- totalTime[benchmarkResult.type.index] += benchmarkResult.getTime();
- totalCount[benchmarkResult.type.index] += benchmarkResult.getCount();
- if (benchmarkResult.type.index < Benchmark.MeasuredTotal.index) {
- totalTime[Benchmark.MeasuredTotal.index] += benchmarkResult.getTime();
- }
- }
- results.add(new BenchmarkResult(Benchmark.RuleTotal, totalTime[Benchmark.RuleTotal.index], 0));
- results.add(new BenchmarkResult(Benchmark.RuleChainTotal, totalTime[Benchmark.RuleChainTotal.index], 0));
- results.add(new BenchmarkResult(Benchmark.MeasuredTotal, totalTime[Benchmark.MeasuredTotal.index], 0));
- results.add(new BenchmarkResult(Benchmark.NonMeasuredTotal,
- totalTime[Benchmark.TotalPMD.index] - totalTime[Benchmark.MeasuredTotal.index], 0));
- Collections.sort(results);
-
- StringBuilderCR buf = new StringBuilderCR(PMD.EOL);
- boolean writeRuleHeader = true;
- boolean writeRuleChainRuleHeader = true;
- long ruleCount = 0;
- long ruleChainCount = 0;
-
- for (BenchmarkResult benchmarkResult : results) {
- StringBuilder buf2 = new StringBuilder(benchmarkResult.name);
- buf2.append(':');
- while (buf2.length() <= NAME_COLUMN_WIDTH) {
- buf2.append(' ');
- }
- String result = MessageFormat.format("{0,number,0.000}",
- Double.valueOf(benchmarkResult.getTime() / 1000000000.0));
- buf2.append(StringUtils.leftPad(result, VALUE_COLUMN_WIDTH));
- if (benchmarkResult.type.index <= Benchmark.RuleChainRule.index) {
- buf2.append(StringUtils
- .leftPad(MessageFormat.format("{0,number,###,###,###,###,###}", benchmarkResult.getCount()), 20));
- }
- switch (benchmarkResult.type) {
- case Rule:
- if (writeRuleHeader) {
- writeRuleHeader = false;
- buf.appendLn();
- buf.appendLn("---------------------------------<<< Rules >>>---------------------------------");
- buf.appendLn("Rule name Time (secs) # of Evaluations");
- buf.appendLn();
- }
- ruleCount++;
- break;
- case RuleChainRule:
- if (writeRuleChainRuleHeader) {
- writeRuleChainRuleHeader = false;
- buf.appendLn();
- buf.appendLn("----------------------------<<< RuleChain Rules >>>----------------------------");
- buf.appendLn("Rule name Time (secs) # of Visits");
- buf.appendLn();
- }
- ruleChainCount++;
- break;
- case CollectFiles:
- buf.appendLn();
- buf.appendLn("--------------------------------<<< Summary >>>--------------------------------");
- buf.appendLn("Segment Time (secs)");
- buf.appendLn();
- break;
- case MeasuredTotal:
- String s = MessageFormat.format("{0,number,###,###,###,###,###}", ruleCount);
- String t = MessageFormat.format("{0,number,0.000}",
- ruleCount == 0 ? 0 : total(totalTime, Benchmark.Rule, ruleCount));
- buf.appendLn("Rule Average (", s, " rules):", StringUtils.leftPad(t, 37 - s.length()));
- s = MessageFormat.format("{0,number,###,###,###,###,###}", ruleChainCount);
- t = MessageFormat.format("{0,number,0.000}",
- ruleChainCount == 0 ? 0 : total(totalTime, Benchmark.RuleChainRule, ruleChainCount));
- buf.appendLn("RuleChain Average (", s, " rules):", StringUtils.leftPad(t, 32 - s.length()));
-
- buf.appendLn();
- buf.appendLn("-----------------------------<<< Final Summary >>>-----------------------------");
- buf.appendLn("Total Time (secs)");
- buf.appendLn();
- break;
- default:
- // Do nothing
- break;
- }
- buf.appendLn(buf2.toString());
- }
-
- stream.print(buf.toString());
- }
-
- /**
- *
- * @param timeTotals
- * long[]
- * @param index
- * Benchmark
- * @param count
- * long
- * @return double
- */
- private static double total(long[] timeTotals, Benchmark index, long count) {
- return timeTotals[index.index] / 1000000000.0d / count;
- }
-}
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/LanguageVersionHandler.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/LanguageVersionHandler.java
index fada9e28eb..16b0e724ae 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/LanguageVersionHandler.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/LanguageVersionHandler.java
@@ -9,10 +9,10 @@ import java.util.List;
import net.sourceforge.pmd.annotation.Experimental;
import net.sourceforge.pmd.lang.ast.AstProcessingStage;
-import net.sourceforge.pmd.lang.ast.xpath.DefaultASTXPathHandler;
import net.sourceforge.pmd.lang.metrics.LanguageMetricsProvider;
import net.sourceforge.pmd.lang.rule.RuleViolationFactory;
import net.sourceforge.pmd.lang.rule.impl.DefaultRuleViolationFactory;
+import net.sourceforge.pmd.lang.rule.xpath.impl.XPathHandler;
import net.sourceforge.pmd.util.designerbindings.DesignerBindings;
import net.sourceforge.pmd.util.designerbindings.DesignerBindings.DefaultDesignerBindings;
@@ -30,7 +30,7 @@ public interface LanguageVersionHandler {
* Get the XPathHandler.
*/
default XPathHandler getXPathHandler() {
- return new DefaultASTXPathHandler();
+ return XPathHandler.noFunctionDefinitions();
}
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/XPathHandler.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/XPathHandler.java
deleted file mode 100644
index 064a65b215..0000000000
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/XPathHandler.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang;
-
-import org.jaxen.Navigator;
-
-import net.sourceforge.pmd.annotation.InternalApi;
-import net.sourceforge.pmd.lang.xpath.Initializer;
-
-import net.sf.saxon.sxpath.IndependentContext;
-
-/**
- * Interface for performing Language specific XPath handling, such as
- * initialization and navigation.
- */
-@InternalApi
-@Deprecated
-public interface XPathHandler {
-
- /**
- * Initialize. This is intended to be called by {@link Initializer} to
- * perform Language specific initialization.
- */
- void initialize();
-
- /**
- * Initialize. This is intended to be called by {@link Initializer} to
- * perform Language specific initialization for Saxon.
- */
- void initialize(IndependentContext context);
-
- /**
- * Get a Jaxen Navigator for this Language. May return null if
- * there is no Jaxen Navigation for this language.
- *
- * @deprecated Support for Jaxen will be removed come 7.0.0. This isn't used
- * anymore
- */
- @Deprecated
- Navigator getNavigator();
-}
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/AstVisitorBase.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/AstVisitorBase.java
index b2fc648550..08a6f529f0 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/AstVisitorBase.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/AstVisitorBase.java
@@ -7,32 +7,17 @@ package net.sourceforge.pmd.lang.ast;
/**
* Base implementation of {@link AstVisitor}, that performs a top-down
* (preorder) visit and may accumulate a result.
+ *
+ * Note that if you care about the result ({@code }), then you need
+ * to override {@link #visitChildren(Node, Object) visitChildren} to implement
+ * the logic that combines values from children, if any.
*/
public abstract class AstVisitorBase implements AstVisitor {
- /** 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.
- *
- * @param acc Current accumulated value for the previous siblings
- * (or {@link #zero()} if the child is the first child)
- * @param childValue Value for the new child
- *
- * @return New accumulated value to use for the next sibling
- */
- protected R combine(R acc, R childValue) {
- return acc;
- }
-
/**
* Visit the children. By default the data parameter is passed unchanged
- * to all descendants. The {@link #zero() zero} and {@link #combine(Object, Object) combine}
- * functions should be implemented if this is to return something else
- * than null.
+ * to all descendants, and null is returned. Override this method to customize
+ * this behavior.
*
* @param node Node whose children should be visited
* @param data Parameter of the visit
@@ -41,12 +26,10 @@ public abstract class AstVisitorBase implements AstVisitor {
*/
// kept separate from super.visit for clarity
protected R visitChildren(Node node, P data) {
- R result = zero();
for (Node child : node.children()) {
- R r1 = child.acceptVisitor(this, data);
- result = combine(result, r1);
+ child.acceptVisitor(this, data);
}
- return result;
+ return null;
}
@Override
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
index 5170c91a13..d20e8dc8eb 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
@@ -4,22 +4,23 @@
package net.sourceforge.pmd.lang.ast;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
-import org.jaxen.BaseXPath;
-import org.jaxen.JaxenException;
import net.sourceforge.pmd.lang.ast.NodeStream.DescendantNodeStream;
import net.sourceforge.pmd.lang.ast.internal.StreamImpl;
-import net.sourceforge.pmd.lang.ast.xpath.Attribute;
-import net.sourceforge.pmd.lang.ast.xpath.AttributeAxisIterator;
-import net.sourceforge.pmd.lang.ast.xpath.internal.ContextualizedNavigator;
-import net.sourceforge.pmd.lang.ast.xpath.internal.DeprecatedAttrLogger;
-import net.sourceforge.pmd.lang.ast.xpath.internal.DeprecatedAttribute;
+import net.sourceforge.pmd.lang.rule.xpath.Attribute;
+import net.sourceforge.pmd.lang.rule.xpath.DeprecatedAttribute;
+import net.sourceforge.pmd.lang.rule.xpath.XPathVersion;
+import net.sourceforge.pmd.lang.rule.xpath.impl.AttributeAxisIterator;
+import net.sourceforge.pmd.lang.rule.xpath.impl.XPathHandler;
+import net.sourceforge.pmd.lang.rule.xpath.internal.DeprecatedAttrLogger;
+import net.sourceforge.pmd.lang.rule.xpath.internal.SaxonXPathRuleQuery;
import net.sourceforge.pmd.util.DataMap;
import net.sourceforge.pmd.util.DataMap.DataKey;
@@ -215,35 +216,21 @@ public interface Node {
*
* @param xpathString the expression to check
* @return List of all matching nodes. Returns an empty list if none found.
- * @throws JaxenException if the xpath is incorrect or fails altogether
- *
* @deprecated This is very inefficient and should not be used in new code. PMD 7.0.0 will remove
* support for this method.
*/
@Deprecated
- @SuppressWarnings("unchecked")
- default List findChildNodesWithXPath(String xpathString) throws JaxenException {
- return new BaseXPath(xpathString, new ContextualizedNavigator(DeprecatedAttrLogger.createAdHocLogger()))
- .selectNodes(this);
+ default List findChildNodesWithXPath(String xpathString) {
+ return new SaxonXPathRuleQuery(
+ xpathString,
+ XPathVersion.DEFAULT,
+ Collections.emptyMap(),
+ XPathHandler.noFunctionDefinitions(),
+ // since this method will be removed, we don't log anything anymore
+ DeprecatedAttrLogger.noop()
+ ).evaluate(this);
}
- /**
- * Checks whether at least one descendant matches the xpath expression.
- *
- * @param xpathString the expression to check
- * @return true if there is a match
- *
- * @deprecated This is very inefficient and should not be used in new code. PMD 7.0.0 will remove
- * support for this method.
- */
- @Deprecated
- default boolean hasDescendantMatchingXPath(String xpathString) {
- try {
- return !findChildNodesWithXPath(xpathString).isEmpty();
- } catch (final JaxenException e) {
- throw new RuntimeException("XPath expression " + xpathString + " failed: " + e.getLocalizedMessage(), e);
- }
- }
/**
@@ -321,7 +308,8 @@ public interface Node {
/**
- * Returns an iterator enumerating all the attributes that are available from XPath for this node.
+ * Returns an iterator enumerating all the attributes that are available
+ * from XPath for this node.
*
* @return An attribute iterator for this node
*/
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/TextAvailableNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/TextAvailableNode.java
index d24bf1f977..8e9c55c020 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/TextAvailableNode.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/TextAvailableNode.java
@@ -4,7 +4,7 @@
package net.sourceforge.pmd.lang.ast;
-import net.sourceforge.pmd.lang.ast.xpath.NoAttribute;
+import net.sourceforge.pmd.lang.rule.xpath.NoAttribute;
/**
* Refinement of {@link Node} for nodes that can provide the underlying
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrNode.java
index be9147822c..c71bde3868 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrNode.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrNode.java
@@ -36,6 +36,11 @@ import net.sourceforge.pmd.util.DataMap.DataKey;
public abstract class BaseAntlrNode, N extends AntlrNode> implements AntlrNode {
private DataMap> userMap;
+
+ /**
+ * The only node for which this is not overwritten is the root node, for
+ * which by contract, this is -1.
+ */
private int indexInParent = -1;
protected BaseAntlrNode() {
@@ -97,7 +102,7 @@ public abstract class BaseAntlrNode