buildVisitor(RuleContext ruleCtx);
+ public abstract AstVisitor buildVisitor();
}
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrGeneratedParserBase.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrGeneratedParserBase.java
new file mode 100644
index 0000000000..5571c21e70
--- /dev/null
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrGeneratedParserBase.java
@@ -0,0 +1,87 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.ast.impl.antlr4;
+
+import org.antlr.v4.runtime.Parser;
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.RuleContext;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
+import org.antlr.v4.runtime.tree.ErrorNode;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+import net.sourceforge.pmd.lang.ast.Node;
+
+/**
+ * This is the base class for antlr generated parsers. The implementation
+ * of PMD's {@link net.sourceforge.pmd.lang.Parser} interface is {@link AntlrBaseParser}.
+ *
+ * This class must implement the two abstract methods to create terminals
+ * and error nodes that implement {@code }. The inner nodes implement PMD
+ * interfaces, and manipulation methods that the {@link Parser} superclass
+ * uses are redirected to the underlying antlr {@link ParserRuleContext} (the
+ * protected overloads here).
+ *
+ * This is not enough in general to make the generated parser compilable,
+ * so an ant script does some cleanup at the end.
+ *
+ *
Additionally this must have a {@link AntlrNameDictionary} static final field,
+ * which stores the XPath names of the generated nodes (and terminals).
+ *
+ *
Additional members can be added to a parser with {@code @parser::members { ... }}
+ * in the g4 file.
+ */
+public abstract class AntlrGeneratedParserBase> extends Parser {
+
+ public AntlrGeneratedParserBase(TokenStream input) {
+ super(input);
+ }
+
+
+ @Override
+ public TerminalNode createTerminalNode(ParserRuleContext parent, Token t) {
+ return createPmdTerminal(parent, t).asAntlrNode();
+ }
+
+ @Override
+ public ErrorNode createErrorNode(ParserRuleContext parent, Token t) {
+ return createPmdError(parent, t).asAntlrNode();
+ }
+
+ // Those two need to return a node that implements eg SwiftNode
+
+ public abstract BaseAntlrTerminalNode createPmdTerminal(ParserRuleContext parent, Token t);
+
+ public abstract BaseAntlrErrorNode createPmdError(ParserRuleContext parent, Token t);
+
+
+ protected Node asPmdNode(RuleContext ctx) {
+ return ((BaseAntlrNode.AntlrToPmdParseTreeAdapter) ctx).getPmdNode();
+ }
+
+ // Necessary API to build the trees
+
+ protected void enterRule(BaseAntlrInnerNode ptree, int state, int alt) {
+ enterRule(ptree.asAntlrNode(), state, alt);
+ }
+
+ protected void enterOuterAlt(BaseAntlrInnerNode localctx, int altNum) {
+ enterOuterAlt(localctx.asAntlrNode(), altNum);
+ }
+
+ protected void pushNewRecursionContext(BaseAntlrInnerNode localctx, int state, int ruleIndex) {
+ pushNewRecursionContext(localctx.asAntlrNode(), state, ruleIndex);
+ }
+
+ protected void enterRecursionRule(BaseAntlrInnerNode localctx, int state, int ruleIndex, int precedence) {
+ enterRecursionRule(localctx.asAntlrNode(), state, ruleIndex, precedence);
+
+ }
+
+ protected boolean sempred(BaseAntlrInnerNode localctx, int ruleIndex, int predIndex) {
+ return sempred(localctx.asAntlrNode(), ruleIndex, predIndex);
+ }
+
+}
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrNameDictionary.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrNameDictionary.java
new file mode 100644
index 0000000000..1ca4c4f953
--- /dev/null
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrNameDictionary.java
@@ -0,0 +1,219 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.ast.impl.antlr4;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.Vocabulary;
+import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+/**
+ * Stores the XPath name of antlr terminals. I found no simple way to
+ * give names to punctuation (we could add a lexer rule, but it may
+ * conflict with other tokens). So their names are hardcoded here.
+ *
+ * Terminal names start with {@code "T-"} in XPath to avoid conflicts
+ * with other stuff.
+ */
+public class AntlrNameDictionary {
+
+ private final String[] terminalXPathNames;
+ private final String[] terminalImages;
+ private final String[] nonTermXpathNames;
+ private final Vocabulary vocabulary;
+
+ public AntlrNameDictionary(Vocabulary vocab, String[] ruleNames) {
+ this.vocabulary = vocab;
+
+ nonTermXpathNames = new String[ruleNames.length];
+ for (int i = 0; i < nonTermXpathNames.length; i++) {
+ nonTermXpathNames[i] = StringUtils.capitalize(ruleNames[i]);
+ }
+ Set seen = new HashSet<>();
+ Collections.addAll(seen, ruleNames);
+
+ // terminal names
+ terminalXPathNames = new String[vocab.getMaxTokenType()];
+ terminalXPathNames[0] = "Invalid"; // See Token.INVALID_TYPE
+
+ terminalImages = new String[vocab.getMaxTokenType()];
+ terminalImages[0] = null;
+
+ for (int i = Token.MIN_USER_TOKEN_TYPE; i < terminalXPathNames.length; i++) {
+ String name = vocab.getSymbolicName(i);
+ String literalName = vocab.getLiteralName(i);
+
+ if (literalName != null) {
+ // cleanup literal name, Antlr surrounds the image with single quotes
+ literalName = literalName.substring(1, literalName.length() - 1);
+ terminalImages[i] = literalName;
+ }
+
+ if (name == null && literalName != null) {
+ name = literalName;
+ if (!name.matches("[a-zA-Z][\\w_-]+")) { // not alphanum
+ name = nonAlphaNumName(name);
+ } // otherwise something like "final"
+ }
+
+
+ assert name != null : "Token of kind " + i + " has no XPath name (literal " + vocab.getLiteralName(i) + ")";
+
+ String finalName = "T-" + name;
+
+ assert finalName.matches("[a-zA-Z][\\w_-]+") : "Not a valid XPath name " + finalName;
+ assert seen.add(finalName) : "Duplicate XPath name " + finalName;
+
+ terminalXPathNames[i] = finalName;
+ }
+
+
+ assert Stream.of(terminalXPathNames).distinct().count() == terminalXPathNames.length
+ : "Duplicate names in " + Arrays.toString(terminalXPathNames);
+ }
+
+ public Vocabulary getVocabulary() {
+ return vocabulary;
+ }
+
+ /**
+ * Override this to customize the XPath name of tokes with no symbolic
+ * name and with an image that is non-alphanumeric. Return null to give
+ * up. The default just gives some name to common punctuation. Remember
+ * that the same token may mean several things in different contexts, so
+ * eg using {@code "not"} as the name of {@code "!"} is too specific.
+ */
+ protected @Nullable String nonAlphaNumName(String name) {
+ switch (name) {
+ case "!": return "bang";
+ case "!!": return "double-bang";
+
+ case "?": return "question";
+ case "??": return "double-question";
+ case "?:": return "elvis";
+ case "?.": return "question-dot";
+
+ case ":": return "colon";
+ case ";": return "semi";
+ case ",": return "comma";
+
+ case "(": return "lparen";
+ case ")": return "rparen";
+ case "[": return "lbracket";
+ case "]": return "rbracket";
+ case "{": return "lbrace";
+ case "}": return "rbrace";
+
+ case "_": return "underscore";
+
+ case ".": return "dot";
+ case "..": return "double-dot";
+ case "...": return "ellipsis";
+
+ case "@": return "at-symbol";
+ case "$": return "dollar";
+
+ case "\\": return "backslash";
+ case "/": return "slash";
+ case "//": return "double-slash";
+ case "`": return "backtick";
+ case "'": return "squote";
+ case "\"": return "dquote";
+ case "\"\"\"": return "triple-quote";
+
+ case ">": return "gt";
+ case ">=": return "ge";
+ case "<": return "lt";
+ case "<=": return "le";
+
+ case ">>": return "double-gt";
+ case "<<": return "double-lt";
+ case ">>>": return "triple-gt";
+ case "<<<": return "triple-lt";
+
+ case "=": return "eq";
+ case "==": return "double-eq";
+ case "===": return "triple-eq";
+ case "!=": return "not-eq";
+
+ case "&": return "amp";
+ case "&&": return "double-amp";
+ case "|": return "pipe";
+ case "||": return "double-pipe";
+
+ case "*": return "star";
+ case "**": return "double-star";
+
+ case "+": return "plus";
+ case "++": return "double-plus";
+ case "-": return "minus";
+ case "--": return "double-minus";
+
+ case "->": return "rarrow";
+ case "<-": return "larrow";
+
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Gets the xpath name of a terminal node with a given {@link Token#getType()}.
+ *
+ * @throws IllegalArgumentException If the index is invalid
+ */
+ public @NonNull String getXPathNameOfToken(int tokenType) {
+ if (tokenType >= 0 && tokenType < terminalXPathNames.length) {
+ return terminalXPathNames[tokenType];
+ }
+
+ if (tokenType == Token.EOF) {
+ return "EOF";
+ }
+
+ throw new IllegalArgumentException("I don't know token type " + tokenType);
+ }
+
+ /**
+ * Returns the constant image of the given token (a shared string),
+ * or null if the token has none. This is a memory optimization to
+ * avoid creating a new string for tokens with constant images. Antlr
+ * does not do this by itself sadly.
+ */
+ public @Nullable String getConstantImageOfToken(Token token) {
+ int tokenType = token.getType();
+ if (tokenType >= 0 && tokenType < terminalXPathNames.length) {
+ return terminalImages[tokenType];
+ } else if (token.getStartIndex() == token.getStopIndex()) {
+ return "";
+ }
+ return null;
+ }
+
+ /**
+ * Gets the xpath name of an inner node with a given {@link ParserRuleContext#getRuleIndex()}.
+ *
+ * @throws IndexOutOfBoundsException If the index is invalid
+ */
+ public @NonNull String getXPathNameOfRule(int idx) {
+ return nonTermXpathNames[idx];
+ }
+
+ public int getMaxRuleIndex() {
+ return nonTermXpathNames.length;
+ }
+
+ public int getMaxTokenType() {
+ return vocabulary.getMaxTokenType();
+ }
+}
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrNode.java
index 840495b068..e3f81f77a9 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrNode.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrNode.java
@@ -4,37 +4,11 @@
package net.sourceforge.pmd.lang.ast.impl.antlr4;
-import org.antlr.v4.runtime.tree.ParseTree;
-
-import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.lang.ast.NodeStream;
+import net.sourceforge.pmd.lang.ast.impl.GenericNode;
/**
- * Base interface for all Antlr-based implementation of Node interface.
- *
- * Initially all the methods implemented here will be no-op due to scope limitations
+ * Base interface for all Antlr-based implementation of the Node interface.
*/
-public interface AntlrNode extends Node, ParseTree {
-
-
- @Override
- AntlrNode getChild(int index);
-
-
- @Override
- AntlrNode getParent();
-
-
- @Override
- @SuppressWarnings("unchecked")
- default NodeStream children() {
- return (NodeStream) Node.super.children();
- }
-
- @Override
- default int getIndexInParent() {
- // FIXME, relied on by node streams
- throw new UnsupportedOperationException("Out of scope for antlr current implementations");
- }
+public interface AntlrNode> extends GenericNode {
}
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrRuleChainVisitor.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrRuleChainVisitor.java
index 720d1db0db..ed5d7fa710 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrRuleChainVisitor.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrRuleChainVisitor.java
@@ -4,24 +4,19 @@
package net.sourceforge.pmd.lang.ast.impl.antlr4;
+import java.util.Collections;
import java.util.List;
import net.sourceforge.pmd.Rule;
import net.sourceforge.pmd.RuleContext;
import net.sourceforge.pmd.lang.ast.Node;
import net.sourceforge.pmd.lang.rule.AbstractRuleChainVisitor;
-import net.sourceforge.pmd.lang.rule.XPathRule;
public class AntlrRuleChainVisitor extends AbstractRuleChainVisitor {
@Override
protected void visit(Rule rule, Node node, RuleContext ctx) {
- if (rule instanceof AntlrBaseRule) {
- AntlrBaseRule rule1 = (AntlrBaseRule) rule;
- ((AntlrBaseNode) node).accept(rule1.buildVisitor(ctx));
- } else {
- ((XPathRule) rule).evaluate(node, ctx);
- }
+ rule.apply(Collections.singletonList(node), ctx);
}
@Override
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrToken.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrToken.java
index e990fa1ada..cb60813252 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrToken.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrToken.java
@@ -4,6 +4,9 @@
package net.sourceforge.pmd.lang.ast.impl.antlr4;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import org.antlr.v4.runtime.Lexer;
import org.antlr.v4.runtime.Token;
@@ -14,14 +17,23 @@ import net.sourceforge.pmd.lang.ast.GenericToken;
*/
public class AntlrToken implements GenericToken {
+ private static final Pattern NEWLINE_PATTERN =
+ // \R on java 8+
+ Pattern.compile("\\u000D\\u000A|[\\u000A\\u000B\\u000C\\u000D\\u0085\\u2028\\u2029]");
+
private final Token token;
private final AntlrToken previousComment;
AntlrToken next;
+ private String text;
+
+ private int endline;
+ private int endcolumn;
+
/**
* Constructor
*
- * @param token The antlr token implementation
+ * @param token The antlr token implementation
* @param previousComment The previous comment
*/
public AntlrToken(final Token token, final AntlrToken previousComment) {
@@ -41,7 +53,10 @@ public class AntlrToken implements GenericToken {
@Override
public String getImage() {
- return token.getText();
+ if (text == null) {
+ text = token.getText();
+ }
+ return text;
}
@Override
@@ -55,18 +70,71 @@ public class AntlrToken implements GenericToken {
}
@Override
- public int getEndLine() {
- return token.getLine();
+ public int getBeginColumn() {
+ int charPos = token.getCharPositionInLine() + 1;
+ assert charPos > 0;
+ return charPos;
}
+
@Override
- public int getBeginColumn() {
- return token.getCharPositionInLine();
+ public int getEndLine() {
+ if (endline == 0) {
+ computeEndCoords();
+ assert endline > 0;
+ }
+ return endline;
}
@Override
public int getEndColumn() {
- return token.getCharPositionInLine() + token.getStopIndex() - token.getStartIndex();
+ if (endcolumn == 0) {
+ computeEndCoords();
+ assert endcolumn > 0;
+ }
+ return endcolumn;
+ }
+
+ private void computeEndCoords() {
+ String image = getImage();
+ if (image.length() == 1) {
+ // fast path for single char tokens
+ if (image.charAt(0) != '\n') {
+ this.endline = getBeginLine();
+ this.endcolumn = getBeginColumn() + 1;
+ return;
+ }
+ }
+
+ Matcher matcher = NEWLINE_PATTERN.matcher(image);
+ int numNls = 0;
+ int lastOffset = 0;
+ int lastLineLen = -1;
+ while (matcher.find()) {
+ // continue
+ numNls++;
+ if (lastLineLen < 0) {
+ // first iteration, line may not be completely in the image
+ lastLineLen = token.getCharPositionInLine() + matcher.end();
+ } else {
+ lastLineLen = matcher.end() - lastOffset;
+ }
+ lastOffset = matcher.end();
+ }
+
+ if (numNls == 0) {
+ // single line token
+ this.endline = this.getBeginLine();
+ int length = 1 + token.getStopIndex() - token.getStartIndex();
+ this.endcolumn = token.getCharPositionInLine() + length + 1;
+ } else if (lastOffset < image.length()) {
+ this.endline = this.getBeginLine() + numNls;
+ this.endcolumn = image.length() - lastOffset + 1;
+ } else {
+ // ends with a newline, the newline is considered part of the previous line
+ this.endline = this.getBeginLine() + numNls - 1;
+ this.endcolumn = lastLineLen + 1;
+ }
}
public int getKind() {
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrErrorNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrErrorNode.java
new file mode 100644
index 0000000000..33babb7eac
--- /dev/null
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrErrorNode.java
@@ -0,0 +1,31 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.ast.impl.antlr4;
+
+import org.antlr.v4.runtime.Token;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+public abstract class BaseAntlrErrorNode> extends BaseAntlrTerminalNode {
+
+ protected BaseAntlrErrorNode(Token symbol) {
+ super(symbol, true);
+ }
+
+ @Override
+ protected final AntlrErrorPmdAdapter asAntlrNode() {
+ return (AntlrErrorPmdAdapter) super.asAntlrNode();
+ }
+
+
+ @Override
+ public @NonNull String getText() {
+ return getFirstAntlrToken().getText();
+ }
+
+ @Override
+ public final String getXPathNodeName() {
+ return "Error";
+ }
+}
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrInnerNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrInnerNode.java
new file mode 100644
index 0000000000..4daab3ed6e
--- /dev/null
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrInnerNode.java
@@ -0,0 +1,154 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.ast.impl.antlr4;
+
+import java.util.List;
+
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.RuleContext;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.ParseTreeListener;
+import org.antlr.v4.runtime.tree.ParseTreeVisitor;
+import org.antlr.v4.runtime.tree.RuleNode;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+import net.sourceforge.pmd.lang.ast.impl.antlr4.BaseAntlrInnerNode.PmdAsAntlrInnerNode;
+
+/**
+ * Base class for the inner nodes (corresponds to {@link ParserRuleContext}).
+ * Use the {@code contextSuperClass} option to set this in the antlr g4 file,
+ * eg {@code options { contextSuperClass = SwiftInnerNode; }}.
+ */
+public abstract class BaseAntlrInnerNode> extends BaseAntlrNode, N> {
+
+ public RecognitionException exception;
+
+ private final PmdAsAntlrInnerNode antlrNode;
+
+ protected BaseAntlrInnerNode() {
+ antlrNode = new PmdAsAntlrInnerNode<>(this);
+ }
+
+ protected BaseAntlrInnerNode(ParserRuleContext parent, int invokingStateNumber) {
+ antlrNode = new PmdAsAntlrInnerNode<>(this, (PmdAsAntlrInnerNode) parent, invokingStateNumber);
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public N getChild(int index) {
+ if (0 <= index && index < getNumChildren()) {
+ N pmdNode = (N) antlrNode.getChild(index).getPmdNode();
+ assert pmdNode.getIndexInParent() == index;
+ return pmdNode;
+ }
+ throw new IndexOutOfBoundsException("Index " + index + ", numChildren " + getNumChildren());
+ }
+
+ @Override
+ public int getNumChildren() {
+ return antlrNode.getChildCount();
+ }
+
+ @Override
+ protected PmdAsAntlrInnerNode asAntlrNode() {
+ return antlrNode;
+ }
+
+ protected abstract int getRuleIndex();
+
+
+ @Override
+ public Token getFirstAntlrToken() {
+ return asAntlrNode().start;
+ }
+
+ @Override
+ public Token getLastAntlrToken() {
+ return asAntlrNode().stop;
+ }
+
+ protected > T getRuleContext(Class klass, int idx) {
+ return children(klass).get(idx);
+ }
+
+ protected > List getRuleContexts(Class klass) {
+ return children(klass).toList();
+ }
+
+ protected TerminalNode getToken(int kind, int idx) {
+ @SuppressWarnings("rawtypes")
+ BaseAntlrTerminalNode pmdWrapper =
+ children(BaseAntlrTerminalNode.class)
+ .filter(it -> it.getTokenKind() == kind)
+ .get(idx);
+ return pmdWrapper != null ? pmdWrapper.asAntlrNode() : null;
+ }
+
+ protected void copyFrom(BaseAntlrInnerNode other) {
+ asAntlrNode().copyFrom(other.asAntlrNode());
+ }
+
+
+ public void enterRule(ParseTreeListener listener) {
+ // default does nothing
+ }
+
+
+ public void exitRule(ParseTreeListener listener) {
+ // default does nothing
+ }
+
+ protected static class PmdAsAntlrInnerNode> extends ParserRuleContext implements RuleNode, AntlrToPmdParseTreeAdapter {
+
+ private final BaseAntlrInnerNode pmdNode;
+
+ PmdAsAntlrInnerNode(BaseAntlrInnerNode node) {
+ this.pmdNode = node;
+ }
+
+ PmdAsAntlrInnerNode(BaseAntlrInnerNode node, PmdAsAntlrInnerNode parent, int invokingStateNumber) {
+ super(parent, invokingStateNumber);
+ this.pmdNode = node;
+ }
+
+ @Override
+ public BaseAntlrInnerNode getPmdNode() {
+ return pmdNode;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public PmdAsAntlrInnerNode getParent() {
+ return (PmdAsAntlrInnerNode) super.getParent();
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public AntlrToPmdParseTreeAdapter getChild(int i) {
+ return (AntlrToPmdParseTreeAdapter) super.getChild(i);
+ }
+
+ @Override
+ public T addAnyChild(T t) {
+ assert t instanceof AntlrToPmdParseTreeAdapter;
+ BaseAntlrNode pmdNode = ((AntlrToPmdParseTreeAdapter) t).getPmdNode();
+ pmdNode.setIndexInParent(getChildCount());
+ return super.addAnyChild(t);
+ }
+
+ @Override
+ public void setParent(RuleContext parent) {
+ assert parent instanceof PmdAsAntlrInnerNode;
+ super.setParent(parent);
+ }
+
+ @Override
+ public T accept(ParseTreeVisitor visitor) {
+ throw new UnsupportedOperationException("Cannot visit the underlying antlr nodes");
+ }
+ }
+}
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
new file mode 100644
index 0000000000..be9147822c
--- /dev/null
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrNode.java
@@ -0,0 +1,123 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.ast.impl.antlr4;
+
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.tree.ErrorNode;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+import net.sourceforge.pmd.lang.ast.impl.GenericNode;
+import net.sourceforge.pmd.lang.ast.impl.antlr4.BaseAntlrNode.AntlrToPmdParseTreeAdapter;
+import net.sourceforge.pmd.util.DataMap;
+import net.sourceforge.pmd.util.DataMap.DataKey;
+
+/**
+ * Base class for an antlr node. This implements the PMD interfaces only,
+ * not the antlr ones. It wraps an antlr node (they are linked both ways).
+ * Antlr primarily distinguishes {@link ParserRuleContext} for inner nodes,
+ * {@link TerminalNode} for nodes that wrap tokens (and can have no children),
+ * and {@link ErrorNode}, a subtype of {@link TerminalNode}. These each have
+ * a base class here, which refines the type of the underlying antlr node:
+ * {@link BaseAntlrInnerNode}, {@link BaseAntlrTerminalNode} and {@link BaseAntlrErrorNode}.
+ * These must be implemented in each language module with a class that also
+ * implements {@code }.
+ *
+ * During tree construction, the antlr runtime does its thing with the
+ * underlying antlr nodes. The PMD nodes are just wrappers around those,
+ * that respect the contract of {@link GenericNode}.
+ *
+ * @param Type of the underlying antlr node
+ * @param Public interface (eg SwiftNode)
+ */
+public abstract class BaseAntlrNode, N extends AntlrNode> implements AntlrNode {
+
+ private DataMap> userMap;
+ private int indexInParent = -1;
+
+ protected BaseAntlrNode() {
+ // protected
+ }
+
+ /**
+ * Recurses over the text of all terminal descendants to build the
+ * text of this node (without spaces). This is extremely inefficient
+ * and should not be used to write rules. The antlr impl doesn't even
+ * use a single stringbuilder.
+ *
+ * @deprecated Some rules depend on it and have not been rewritten
+ */
+ @Deprecated
+ public String joinTokenText() {
+ return asAntlrNode().getText();
+ }
+
+ // these are an implementation detail, meant as a crutch while some
+ // rules depend on it
+ // Should be made protected
+
+ public abstract Token getFirstAntlrToken();
+
+ public abstract Token getLastAntlrToken();
+
+ void setIndexInParent(int indexInParent) {
+ this.indexInParent = indexInParent;
+ }
+
+ @Override
+ public N getParent() {
+ AntlrToPmdParseTreeAdapter parent = asAntlrNode().getParent();
+ return parent == null ? null : (N) parent.getPmdNode();
+ }
+
+ @Override
+ public int getBeginLine() {
+ return getFirstAntlrToken().getLine(); // This goes from 1 to n
+ }
+
+ @Override
+ public int getEndLine() {
+ // FIXME this is not the end line if the stop token spans several lines
+ return getLastAntlrToken().getLine();
+ }
+
+ @Override
+ public int getBeginColumn() {
+ return getFirstAntlrToken().getCharPositionInLine() + 1;
+ }
+
+ @Override
+ public int getEndColumn() {
+ Token tok = getLastAntlrToken();
+ return tok.getCharPositionInLine() + tok.getStopIndex() - tok.getStartIndex() + 1;
+ }
+
+ @Override
+ public int getIndexInParent() {
+ assert indexInParent >= 0 : "Index not set";
+ return indexInParent;
+ }
+
+ @Override
+ public DataMap> getUserMap() {
+ if (userMap == null) {
+ userMap = DataMap.newDataMap();
+ }
+ return userMap;
+ }
+
+ protected abstract A asAntlrNode();
+
+
+ protected interface AntlrToPmdParseTreeAdapter> extends ParseTree {
+
+ BaseAntlrNode getPmdNode();
+
+
+ @Override
+ AntlrToPmdParseTreeAdapter getParent();
+ }
+}
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrTerminalNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrTerminalNode.java
new file mode 100644
index 0000000000..8b265ff528
--- /dev/null
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrTerminalNode.java
@@ -0,0 +1,112 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.ast.impl.antlr4;
+
+import org.antlr.v4.runtime.RuleContext;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.tree.ErrorNode;
+import org.antlr.v4.runtime.tree.ParseTreeVisitor;
+import org.antlr.v4.runtime.tree.TerminalNode;
+import org.antlr.v4.runtime.tree.TerminalNodeImpl;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+import net.sourceforge.pmd.lang.ast.impl.antlr4.BaseAntlrTerminalNode.AntlrTerminalPmdAdapter;
+
+/**
+ * Base class for terminal nodes (they wrap a {@link TerminalNode}).
+ */
+public abstract class BaseAntlrTerminalNode>
+ extends BaseAntlrNode, N> {
+
+ private final AntlrTerminalPmdAdapter antlrNode;
+
+ protected BaseAntlrTerminalNode(Token symbol) {
+ this(symbol, false);
+ }
+
+ BaseAntlrTerminalNode(Token symbol, boolean isError) {
+ if (isError) {
+ this.antlrNode = new AntlrErrorPmdAdapter<>(this, symbol);
+ } else {
+ this.antlrNode = new AntlrTerminalPmdAdapter<>(this, symbol);
+ }
+ }
+
+ /**
+ * Returns the text of the token.
+ *
+ * @implNote This should use {@link AntlrNameDictionary#getConstantImageOfToken(Token)},
+ * or default to {@link Token#getText()}
+ */
+ public abstract @NonNull String getText();
+
+ @Override
+ protected AntlrTerminalPmdAdapter asAntlrNode() {
+ return antlrNode;
+ }
+
+ @Override
+ public Token getFirstAntlrToken() {
+ return antlrNode.symbol;
+ }
+
+ @Override
+ public Token getLastAntlrToken() {
+ return antlrNode.symbol;
+ }
+
+ @Override
+ public int getNumChildren() {
+ return 0;
+ }
+
+ protected int getTokenKind() {
+ return antlrNode.symbol.getTokenIndex();
+ }
+
+ @Override
+ public N getChild(int index) {
+ throw new IndexOutOfBoundsException("Index " + index + " for terminal node");
+ }
+
+ protected static class AntlrTerminalPmdAdapter> extends TerminalNodeImpl implements AntlrToPmdParseTreeAdapter {
+
+ private final BaseAntlrTerminalNode pmdNode;
+
+ public AntlrTerminalPmdAdapter(BaseAntlrTerminalNode pmdNode, Token symbol) {
+ super(symbol);
+ this.pmdNode = pmdNode;
+ }
+
+ @Override
+ public AntlrToPmdParseTreeAdapter getParent() {
+ return (AntlrToPmdParseTreeAdapter) super.getParent();
+ }
+
+ @Override
+ public void setParent(RuleContext parent) {
+ assert parent instanceof BaseAntlrNode.AntlrToPmdParseTreeAdapter;
+ super.setParent(parent);
+ }
+
+ @Override
+ public BaseAntlrNode getPmdNode() {
+ return pmdNode;
+ }
+ }
+
+ protected static class AntlrErrorPmdAdapter> extends AntlrTerminalPmdAdapter implements ErrorNode {
+
+ public AntlrErrorPmdAdapter(BaseAntlrTerminalNode pmdNode, Token symbol) {
+ super(pmdNode, symbol);
+ }
+
+ @Override
+ public T accept(ParseTreeVisitor visitor) {
+ return visitor.visitErrorNode(this);
+ }
+ }
+
+}
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/PmdAntlrErrorNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/PmdAntlrErrorNode.java
deleted file mode 100644
index 348927eefb..0000000000
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/PmdAntlrErrorNode.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.ast.impl.antlr4;
-
-import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.tree.ErrorNode;
-import org.antlr.v4.runtime.tree.ParseTreeVisitor;
-
-public class PmdAntlrErrorNode extends PmdAntlrTerminalNode implements AntlrNode, ErrorNode {
-
- public PmdAntlrErrorNode(Token t) {
- super(t);
- }
-
- @Override
- public String getXPathNodeName() {
- return "Error";
- }
-
- @Override
- public T accept(ParseTreeVisitor visitor) {
- return visitor.visitErrorNode(this);
- }
-}
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/PmdAntlrParserBase.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/PmdAntlrParserBase.java
deleted file mode 100644
index 78ced80c9d..0000000000
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/PmdAntlrParserBase.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.ast.impl.antlr4;
-
-import org.antlr.v4.runtime.Parser;
-import org.antlr.v4.runtime.ParserRuleContext;
-import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.TokenStream;
-import org.antlr.v4.runtime.tree.ErrorNode;
-import org.antlr.v4.runtime.tree.TerminalNode;
-
-public abstract class PmdAntlrParserBase extends Parser {
-
- public PmdAntlrParserBase(TokenStream input) {
- super(input);
- }
-
- @Override
- public TerminalNode createTerminalNode(ParserRuleContext parent, Token t) {
- return new PmdAntlrTerminalNode(t);
- }
-
- @Override
- public ErrorNode createErrorNode(ParserRuleContext parent, Token t) {
- return new PmdAntlrErrorNode(t);
- }
-}
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/PmdAntlrTerminalNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/PmdAntlrTerminalNode.java
deleted file mode 100644
index 95122c0665..0000000000
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/PmdAntlrTerminalNode.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.ast.impl.antlr4;
-
-import org.antlr.v4.runtime.RuleContext;
-import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.tree.TerminalNodeImpl;
-
-import net.sourceforge.pmd.util.DataMap;
-import net.sourceforge.pmd.util.DataMap.DataKey;
-
-/**
- * @author Clément Fournier
- */
-public class PmdAntlrTerminalNode extends TerminalNodeImpl implements AntlrNode {
-
- private final DataMap> userData = DataMap.newDataMap();
-
- public PmdAntlrTerminalNode(Token t) {
- super(t);
- }
-
- @Override
- public AntlrNode getChild(int i) {
- return null;
- }
-
- @Override
- public int getNumChildren() {
- return 0;
- }
-
- @Override
- public String getXPathNodeName() {
- return "Token" + getSymbol().getType(); // TODO
- }
-
- @Override
- public AntlrNode getParent() {
- return (AntlrNode) super.getParent();
- }
-
-
- @Override
- public void setParent(RuleContext parent) {
- assert parent instanceof AntlrNode : "Parent should be a parent";
- super.setParent(parent);
- }
-
-
- // FIXME these coordinates are not accurate
-
-
- @Override
- public int getBeginLine() {
- return getSymbol().getLine();
- }
-
- @Override
- public int getBeginColumn() {
- return getSymbol().getCharPositionInLine() + 1;
- }
-
- @Override
- public int getEndLine() {
- return getBeginLine();
- }
-
- @Override
- public int getEndColumn() {
- return getBeginColumn() + getSymbol().getText().length();
- }
-
- @Override
- public DataMap> getUserMap() {
- return userData;
- }
-}
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/internal/RuleChainAnalyzer.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/internal/RuleChainAnalyzer.java
index 9c9bcdb855..e093c07dd7 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/internal/RuleChainAnalyzer.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/internal/RuleChainAnalyzer.java
@@ -66,17 +66,16 @@ public class RuleChainAnalyzer extends SaxonExprVisitor {
if (rootElement != null && !rootElementReplaced) {
if (result instanceof PathExpression) {
PathExpression newPath = (PathExpression) result;
- if (newPath.getStepExpression() instanceof FilterExpression) {
+ Expression step = newPath.getStepExpression();
+ if (step instanceof FilterExpression) {
FilterExpression filterExpression = (FilterExpression) newPath.getStepExpression();
result = new FilterExpression(new AxisExpression(Axis.SELF, null), filterExpression.getFilter());
rootElementReplaced = true;
- } else if (newPath.getStepExpression() instanceof AxisExpression) {
+ } else if (step instanceof AxisExpression) {
if (newPath.getStartExpression() instanceof RootExpression) {
result = new AxisExpression(Axis.SELF, null);
- } else {
- result = new PathExpression(newPath.getStartExpression(), new AxisExpression(Axis.SELF, null));
+ rootElementReplaced = true;
}
- rootElementReplaced = true;
}
} else {
result = new AxisExpression(Axis.DESCENDANT_OR_SELF, null);
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/ClasspathClassLoader.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/ClasspathClassLoader.java
index e9b31a13cb..6c8148e274 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/ClasspathClassLoader.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/ClasspathClassLoader.java
@@ -62,7 +62,7 @@ public class ClasspathClassLoader extends URLClassLoader {
throw new IllegalArgumentException("classpath argument cannot be null");
}
final List urls = new ArrayList<>();
- if (classpath.startsWith("file://")) {
+ if (classpath.startsWith("file:")) {
// Treat as file URL
addFileURLs(urls, new URL(classpath));
} else {
@@ -87,7 +87,7 @@ public class ClasspathClassLoader extends URLClassLoader {
while ((line = in.readLine()) != null) {
LOG.log(Level.FINE, "Read classpath entry line: <{0}>", line);
line = line.trim();
- if (line.length() > 0) {
+ if (line.length() > 0 && line.charAt(0) != '#') {
LOG.log(Level.FINE, "Adding classpath entry: <{0}>", line);
urls.add(createURLFromPath(line));
}
@@ -97,7 +97,7 @@ public class ClasspathClassLoader extends URLClassLoader {
private static URL createURLFromPath(String path) throws MalformedURLException {
File file = new File(path);
- return file.getAbsoluteFile().toURI().toURL();
+ return file.getAbsoluteFile().toURI().normalize().toURL();
}
@Override
diff --git a/pmd-core/src/main/resources/rulesets/releases/6250.xml b/pmd-core/src/main/resources/rulesets/releases/6250.xml
index db652d271d..3dc5b862e2 100644
--- a/pmd-core/src/main/resources/rulesets/releases/6250.xml
+++ b/pmd-core/src/main/resources/rulesets/releases/6250.xml
@@ -9,5 +9,6 @@ This ruleset contains links to rules that are new in PMD v6.25.0
+
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/ConfigurationTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/ConfigurationTest.java
index f1251cd25e..b88e95d8a9 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/ConfigurationTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/ConfigurationTest.java
@@ -12,10 +12,13 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.Properties;
+import org.junit.Assert;
import org.junit.Test;
import net.sourceforge.pmd.cache.FileAnalysisCache;
@@ -59,6 +62,50 @@ public class ConfigurationTest {
configuration.getClassLoader());
}
+ @Test
+ public void auxClasspathWithRelativeFileEmpty() throws IOException {
+ String relativeFilePath = "src/test/resources/net/sourceforge/pmd/cli/auxclasspath-empty.cp";
+ PMDConfiguration configuration = new PMDConfiguration();
+ configuration.prependClasspath("file:" + relativeFilePath);
+ URL[] urls = ((ClasspathClassLoader) configuration.getClassLoader()).getURLs();
+ Assert.assertEquals(0, urls.length);
+ }
+
+ @Test
+ public void auxClasspathWithRelativeFileEmpty2() throws IOException {
+ String relativeFilePath = "./src/test/resources/net/sourceforge/pmd/cli/auxclasspath-empty.cp";
+ PMDConfiguration configuration = new PMDConfiguration();
+ configuration.prependClasspath("file:" + relativeFilePath);
+ URL[] urls = ((ClasspathClassLoader) configuration.getClassLoader()).getURLs();
+ Assert.assertEquals(0, urls.length);
+ }
+
+ @Test
+ public void auxClasspathWithRelativeFile() throws IOException, URISyntaxException {
+ final String FILE_SCHEME = "file";
+
+ String currentWorkingDirectory = new File("").getAbsoluteFile().toURI().getPath();
+ String relativeFilePath = "src/test/resources/net/sourceforge/pmd/cli/auxclasspath.cp";
+ PMDConfiguration configuration = new PMDConfiguration();
+ configuration.prependClasspath("file:" + relativeFilePath);
+ URL[] urls = ((ClasspathClassLoader) configuration.getClassLoader()).getURLs();
+ URI[] uris = new URI[urls.length];
+ for (int i = 0; i < urls.length; i++) {
+ uris[i] = urls[i].toURI();
+ }
+ URI[] expectedUris = new URI[] {
+ new URI(FILE_SCHEME, null, currentWorkingDirectory + "lib1.jar", null),
+ new URI(FILE_SCHEME, null, currentWorkingDirectory + "other/directory/lib2.jar", null),
+ new URI(FILE_SCHEME, null, new File("/home/jondoe/libs/lib3.jar").getAbsoluteFile().toURI().getPath(), null),
+ new URI(FILE_SCHEME, null, currentWorkingDirectory + "classes", null),
+ new URI(FILE_SCHEME, null, currentWorkingDirectory + "classes2", null),
+ new URI(FILE_SCHEME, null, new File("/home/jondoe/classes").getAbsoluteFile().toURI().getPath(), null),
+ new URI(FILE_SCHEME, null, currentWorkingDirectory, null),
+ new URI(FILE_SCHEME, null, currentWorkingDirectory + "relative source dir/bar", null),
+ };
+ Assert.assertArrayEquals(expectedUris, uris);
+ }
+
@Test
public void testRuleSets() {
PMDConfiguration configuration = new PMDConfiguration();
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/cpd/MarkTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/MarkTest.java
index 5e0b0ed42c..0afa0144b8 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/cpd/MarkTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/MarkTest.java
@@ -40,8 +40,8 @@ public class MarkTest {
final int beginLine = 1;
final int beginColumn = 2;
final int endColumn = 3;
- final TokenEntry token = new TokenEntry("public", "/var/Foo.java", 1, beginColumn, 0);
- final TokenEntry endToken = new TokenEntry("}", "/var/Foo.java", 5, 0, endColumn);
+ final TokenEntry token = new TokenEntry("public", "/var/Foo.java", 1, beginColumn, beginColumn + "public".length());
+ final TokenEntry endToken = new TokenEntry("}", "/var/Foo.java", 5, endColumn - 1, endColumn);
final Mark mark = new Mark(token);
final int lineCount = 10;
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/cpd/SourceCodeTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/SourceCodeTest.java
index ff3579450e..c672da6ee9 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/cpd/SourceCodeTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/SourceCodeTest.java
@@ -7,11 +7,9 @@ package net.sourceforge.pmd.cpd;
import static org.junit.Assert.assertEquals;
import java.io.File;
-import java.util.ArrayList;
import org.junit.Test;
-import net.sourceforge.pmd.PMD;
import net.sourceforge.pmd.cpd.SourceCode.FileCodeLoader;
public class SourceCodeTest {
@@ -20,21 +18,16 @@ public class SourceCodeTest {
private static final String SAMPLE_CODE = "Line 1\n" + "Line 2\n" + "Line 3\n" + "Line 4\n";
@Test
- public void testSimple() throws Exception {
- Tokenizer tokenizer = new AbstractTokenizer() {
- {
- this.stringToken = new ArrayList<>();
- this.ignorableCharacter = new ArrayList<>();
- this.ignorableStmt = new ArrayList<>();
- }
- };
+ public void testSlice() {
SourceCode sourceCode = new SourceCode(new SourceCode.StringCodeLoader(SAMPLE_CODE, "Foo.java"));
assertEquals("Foo.java", sourceCode.getFileName());
- tokenizer.tokenize(sourceCode, new Tokens());
assertEquals("Line 1", sourceCode.getSlice(1, 1));
assertEquals("Line 2", sourceCode.getSlice(2, 2));
- assertEquals("Line 1" + PMD.EOL + "Line 2", sourceCode.getSlice(1, 2));
+ assertEquals("Line 1\nLine 2", sourceCode.getSlice(1, 2));
+
+ sourceCode.getCodeBuffer(); // load into soft reference, must not change behavior
+ assertEquals("Line 1\nLine 2", sourceCode.getSlice(1, 2));
}
@Test
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQueryTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQueryTest.java
index 93b7d4e3a3..4bd83a6fc8 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQueryTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQueryTest.java
@@ -195,4 +195,18 @@ public class SaxonXPathRuleQueryTest {
query.setXPath(xpath);
return query;
}
+
+ @Test
+ public void ruleChainWithUnions() {
+ SaxonXPathRuleQuery query = createQuery("(//ForStatement | //WhileStatement | //DoStatement)//AssignmentOperator");
+ List ruleChainVisits = query.getRuleChainVisits();
+ Assert.assertEquals(0, ruleChainVisits.size());
+ }
+
+ @Test
+ public void ruleChainWithUnionsAndFilter() {
+ SaxonXPathRuleQuery query = createQuery("(//ForStatement | //WhileStatement | //DoStatement)//AssignmentOperator[@Image='foo']");
+ List ruleChainVisits = query.getRuleChainVisits();
+ Assert.assertEquals(0, ruleChainVisits.size());
+ }
}
diff --git a/pmd-core/src/test/resources/net/sourceforge/pmd/cli/auxclasspath-empty.cp b/pmd-core/src/test/resources/net/sourceforge/pmd/cli/auxclasspath-empty.cp
new file mode 100644
index 0000000000..39eeac6911
--- /dev/null
+++ b/pmd-core/src/test/resources/net/sourceforge/pmd/cli/auxclasspath-empty.cp
@@ -0,0 +1,4 @@
+# this file is deliberately empty
+# comments start with #
+
+# empty lines are ignored
diff --git a/pmd-core/src/test/resources/net/sourceforge/pmd/cli/auxclasspath.cp b/pmd-core/src/test/resources/net/sourceforge/pmd/cli/auxclasspath.cp
new file mode 100644
index 0000000000..852cdf0bce
--- /dev/null
+++ b/pmd-core/src/test/resources/net/sourceforge/pmd/cli/auxclasspath.cp
@@ -0,0 +1,13 @@
+# relative paths here should be resolved relative to the current working directory - not relative to this file
+lib1.jar
+other/directory/lib2.jar
+# absolute paths work as well
+/home/jondoe/libs/lib3.jar
+# also directories are possible
+classes
+classes2/
+/home/jondoe/classes
+# relative current directory
+.
+# a test with a space in the uri
+relative source dir/bar
diff --git a/pmd-cpp/etc/grammar/Cpp.jj b/pmd-cpp/etc/grammar/Cpp.jj
index 340b2c315b..450f772c41 100644
--- a/pmd-cpp/etc/grammar/Cpp.jj
+++ b/pmd-cpp/etc/grammar/Cpp.jj
@@ -191,40 +191,30 @@ TOKEN :
| < FINALLY: "finally" >
}
-TOKEN [IGNORE_CASE] :
+TOKEN:
{
- < OCTALINT : "0" (["'", "0"-"7"])* >
-| < OCTALLONG : "l" >
-| < UNSIGNED_OCTALINT : "u" >
-| < UNSIGNED_OCTALLONG : ("ul" | "lu") >
+ < #DECIMALDIGIT: ["0"-"9"] >
+| < #OCTALDIGIT: ["0"-"7"] >
+| < #HEXDIGIT: ["a"-"f", "A"-"F", "0"-"9"] >
+| < #INT_SUFFIX: ["u", "U", "l", "L"] | "uL" | "Ul" | "UL" | "ul" | "lu" | "Lu" | "lU" | "LU" >
-| < #DECIMALDIGIT : ["'", "0"-"9"] >
+| < ZERO: "0" >
+| < OCTAL_INT_LITERAL: "0" ("'" | )+ ()? >
+| < DECIMAL_INT_LITERAL: ["1"-"9"] ("'" | )* ()? >
+| < HEXADECIMAL_INT_LITERAL: "0" ["x", "X"] ("'" | )+ ()? >
-| < DECIMALINT : ["1"-"9"] ()* >
-| < DECIMALLONG : ["u","l"] >
-| < UNSIGNED_DECIMALINT : "u" >
-| < UNSIGNED_DECIMALLONG : ("ul" | "lu") >
+// like DECIMALINT but may start with 0
+| < #INT_IN_FLOAT: ["0"-"9"] ("'" | )* >
+| < #EXP_PART: ["e", "E"] (["-","+"])? >
-
-| < HEXADECIMALINT : "0x" ( | ["a"-"f"])+ >
-| < HEXADECIMALLONG : (["u","l"])? >
-| < UNSIGNED_HEXADECIMALINT : "u" >
-| < UNSIGNED_HEXADECIMALLONG : ("ul" | "lu") >
-
-
-| < FLOATONE : (["0"-"9"]()* "."
- | "." ()+
- | ["0"-"9"]()* "." ()+)
- ("e" (["-","+"])? ()+)? (["f","l"])? >
-
-| < FLOATTWO : ["0"-"9"]()* "e" (["-","+"])? ()+ (["f","l"])? >
+| < FLOAT_LITERAL : ("." ( ()?)? | ) (["f", "l", "F", "L"])? >
}
TOKEN :
{
< #CHRPREF : >
| < CHARACTER :
- "'" ( ( ~["'","\\","\r","\n"] ) | ( "\\" ( ~["\n","\r"] ) ) )* "'" >
+ "'" ( ( ~["'","\\","\r","\n"] ) | ( "\\" ( ~["\n","\r"] ) ) )+ "'" >
| < #STRPREF : ("L" | "u" | "U" | "u8")? >
| < STRING :
@@ -289,7 +279,58 @@ rstringbody:
TOKEN :
{
- < ID : ["$", "a"-"z","A"-"Z", "_"] (["a"-"z","A"-"Z","0"-"9","_","$"])* >
+// https://en.cppreference.com/w/cpp/language/identifiers#Unicode_characters_in_identifiers
+
+ < ID : ()* >
+
+| < #UNICODE_ESCAPE: "\\" ( "u" | "U" ) >
+| < #HEXDIGIT_4: >
+| < #ID_CHAR: | [
+ "a"-"z", "A"-"Z", "0"-"9", "_", "$",
+ "\u00a8", "\u00aa", "\u00ad", "\u00af",
+ "\u00b2"-"\u00b5", "\u00b7"-"\u00ba",
+ "\u00b7"-"\u00ba", "\u00bc"-"\u00be",
+ "\u00c0"-"\u00d6", "\u00d8"-"\u00f6",
+ "\u00f8"-"\u167f", "\u1681"-"\u180d",
+ "\u180f"-"\u1fff", "\u200b"-"\u200d",
+ "\u202a"-"\u202e", "\u203f"-"\u2040",
+ "\u2054", "\u2060"-"\u218f",
+ "\u2460"-"\u24ff", "\u2776"-"\u2793",
+ "\u2c00"-"\u2dff", "\u2e80"-"\u2fff",
+ "\u3004"-"\u3007", "\u3021"-"\u302f",
+ "\u3031"-"\ud7ff", "\uf900"-"\ufd3d",
+ "\ufd40"-"\ufdcf", "\ufdf0"-"\ufe44",
+ "\ufe47"-"\ufffd"
+ // the standard also allows code points in planes 1 through e,
+ // but javacc doesn't support supplementary characters
+ ] >
+// this production is the same as the above,
+// with some ranges subtracted
+| < #ID_START_CHAR: | [
+ "a"-"z", "A"-"Z", "_", "$",
+ "\u00a8", "\u00aa", "\u00ad", "\u00af",
+ "\u00b2"-"\u00b5", "\u00b7"-"\u00ba",
+ "\u00b7"-"\u00ba", "\u00bc"-"\u00be",
+ "\u00c0"-"\u00d6", "\u00d8"-"\u00f6",
+ // subtracted u+0300-u+036f from u+00f8-u+167f
+ "\u00f8"-"\u02ff", "\u0370"-"\u167f",
+ "\u1681"-"\u180d",
+ // subtracted u+1dc0-u+1dff from u+180f-u+1fff
+ "\u180f"-"\u1dbf", "\u1e00"-"\u1fff",
+ "\u200b"-"\u200d",
+ "\u202a"-"\u202e", "\u203f"-"\u2040",
+ "\u2054",
+ // subtracted u+20d0-u+20ff from u+2060-u+218f
+ "\u2060"-"\u20cf", "\u2100"-"\u218f",
+ "\u2460"-"\u24ff", "\u2776"-"\u2793",
+ "\u2c00"-"\u2dff", "\u2e80"-"\u2fff",
+ "\u3004"-"\u3007", "\u3021"-"\u302f",
+ "\u3031"-"\ud7ff", "\uf900"-"\ufd3d",
+ "\ufd40"-"\ufdcf",
+ // subtracted u+fe20-u+fe2f from u+fdf0-u+fe44
+ "\ufdf0"-"\ufe1f", "\ufe30"-"\ufe44",
+ "\ufe47"-"\ufffd"
+ ] >
}
@@ -706,8 +747,8 @@ void member_declaration() :
void member_declarator_list(boolean isTypedef) :
{}
{
- member_declarator(isTypedef) ("=" )?
- ("," member_declarator(isTypedef) ("=" )?)*
+ member_declarator(isTypedef) ("=" assignment_expression())?
+ ("," member_declarator(isTypedef) ("=" assignment_expression())?)*
}
void member_declarator(boolean isTypedef) :
@@ -861,7 +902,7 @@ Scope function_direct_declarator(boolean isTypedef) :
"(" (parameter_list())? ")"
(LOOKAHEAD(2) type_qualifier())?
(exception_spec())?
- (LOOKAHEAD("=") "=" )?
+ ("=" )?
{
if (closeReqd)
@@ -1450,23 +1491,14 @@ void expression_list() :
void constant() :
{}
-{
- |
- |
- |
- |
- |
-
- |
- |
- |
- |
- |
- |
+{
+
+ |
+ |
+ |
+ |
|
- |
- |
| "true"
| "false"
}
diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml
index 8102b0ede4..7a2f195f27 100644
--- a/pmd-cpp/pom.xml
+++ b/pmd-cpp/pom.xml
@@ -82,10 +82,21 @@
junit
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
net.sourceforge.pmd
pmd-test
test
+
+ net.sourceforge.pmd
+ pmd-lang-test
+ test
+
+
diff --git a/pmd-cpp/src/test/java/net/sourceforge/pmd/cpd/CPPTokenizerContinuationTest.java b/pmd-cpp/src/test/java/net/sourceforge/pmd/cpd/CPPTokenizerContinuationTest.java
deleted file mode 100644
index 9a97edf3b4..0000000000
--- a/pmd-cpp/src/test/java/net/sourceforge/pmd/cpd/CPPTokenizerContinuationTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.cpd;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-
-import net.sourceforge.pmd.PMD;
-import net.sourceforge.pmd.cpd.SourceCode.StringCodeLoader;
-import net.sourceforge.pmd.lang.TokenManager;
-import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken;
-
-public class CPPTokenizerContinuationTest {
-
- @Test
- public void parseWithContinuation() throws Exception {
- String code = load("cpp_with_continuation.cpp");
- Tokens tokens = parse(code);
- if (tokens.size() < 52) {
- printTokens(tokens);
- fail("Not enough tokens - probably parsing error. Tokens: " + tokens.size());
- }
-
- assertEquals("static", findByLine(8, tokens).get(0).toString());
- assertEquals("int", findByLine(8, tokens).get(1).toString());
-
- // special case, if the continuation is *within* a token
- // see also test #testContinuationIntraToken
- TokenEntry tokenEntry = findByLine(8, tokens).get(2);
- assertEquals("ab", tokenEntry.toString());
-
- assertEquals("int", findByLine(12, tokens).get(0).toString());
- assertEquals("main", findByLine(12, tokens).get(1).toString());
- assertEquals("(", findByLine(12, tokens).get(2).toString());
- assertEquals(")", findByLine(12, tokens).get(3).toString());
- assertEquals("{", findByLine(13, tokens).get(0).toString());
- assertEquals("\"world!\\n\"", findByLine(16, tokens).get(0).toString());
- assertEquals("\"3 Hello, \\world!\\n\"", findByLine(22, tokens).get(4).toString());
- assertEquals("}", findByLine(29, tokens).get(0).toString());
- }
-
- /**
- * Verifies the begin/end of a token. Uses the underlying JavaCC Token and
- * not TokenEntry.
- */
- @Test
- public void parseWithContinuationCppTokenManager() throws Exception {
- String code = load("cpp_with_continuation.cpp");
- TokenManager tokenManager = new CPPTokenizer().getLexerForSource(new SourceCode(new StringCodeLoader(code)));
- List tokens = new ArrayList<>();
-
- JavaccToken token = tokenManager.getNextToken();
- while (!token.getImage().isEmpty()) {
- tokens.add(token);
- token = tokenManager.getNextToken();
- }
-
- assertEquals(51, tokens.size());
-
- assertToken(tokens.get(2), "ab", 8, 12, 9, 2);
- assertToken(tokens.get(22), "\"2 Hello, world!\\n\"", 18, 16, 19, 10);
- }
-
-
- private void assertToken(JavaccToken token, String image, int beginLine, int beginColumn, int endLine, int endColumn) {
- assertEquals(image, token.getImage());
- assertEquals(beginLine, token.getBeginLine());
- assertEquals(beginColumn, token.getBeginColumn());
- assertEquals(endLine, token.getEndLine());
- assertEquals(endColumn, token.getEndColumn());
- }
-
- @Test
- public void testContinuationIntraToken() throws Exception {
- Tokens tokens = parse(load("cpp_continuation_intra_token.cpp"));
- assertEquals(7, tokens.size());
- }
-
- @Test
- public void testContinuationInterToken() throws Exception {
- Tokens tokens = parse(load("cpp_continuation_inter_token.cpp"));
- assertEquals(17, tokens.size());
- }
-
- private void printTokens(Tokens tokens) {
- for (TokenEntry entry : tokens.getTokens()) {
- System.out.printf("%02d: %s%s", entry.getBeginLine(), entry.toString(), PMD.EOL);
- }
- }
-
- private List findByLine(int line, Tokens tokens) {
- List result = new ArrayList<>();
- for (TokenEntry entry : tokens.getTokens()) {
- if (entry.getBeginLine() == line) {
- result.add(entry);
- }
- }
- if (result.isEmpty()) {
- fail("No tokens at line " + line + " found");
- }
- return result;
- }
-
- private String load(String name) throws Exception {
- return IOUtils.toString(CPPTokenizerContinuationTest.class
- .getResourceAsStream("cpp/" + name), StandardCharsets.UTF_8);
- }
-
- private Tokens parse(String code) throws IOException {
- CPPTokenizer tokenizer = new CPPTokenizer();
- tokenizer.setProperties(new Properties());
- Tokens tokens = new Tokens();
- tokenizer.tokenize(new SourceCode(new StringCodeLoader(code)), tokens);
- return tokens;
- }
-}
diff --git a/pmd-cpp/src/test/java/net/sourceforge/pmd/cpd/CPPTokenizerTest.java b/pmd-cpp/src/test/java/net/sourceforge/pmd/cpd/CPPTokenizerTest.java
index d684d3956a..e055090c13 100644
--- a/pmd-cpp/src/test/java/net/sourceforge/pmd/cpd/CPPTokenizerTest.java
+++ b/pmd-cpp/src/test/java/net/sourceforge/pmd/cpd/CPPTokenizerTest.java
@@ -5,277 +5,144 @@
package net.sourceforge.pmd.cpd;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
import java.util.Properties;
-import org.apache.commons.io.IOUtils;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import net.sourceforge.pmd.PMD;
-import net.sourceforge.pmd.lang.ast.TokenMgrError;
+import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
-public class CPPTokenizerTest {
+public class CPPTokenizerTest extends CpdTextComparisonTest {
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
+ public CPPTokenizerTest() {
+ super(".cpp");
+ }
+
+ @Override
+ protected String getResourcePrefix() {
+ return "../lang/cpp/cpd/testdata";
+ }
+
+ @Override
+ public Tokenizer newTokenizer(Properties props) {
+ CPPTokenizer tok = new CPPTokenizer();
+ tok.setProperties(props);
+ return tok;
+ }
+
+ @Override
+ public Properties defaultProperties() {
+ return dontSkipBlocks();
+ }
@Test
public void testUTFwithBOM() {
- Tokens tokens = parse("\ufeffint start()\n{ int ret = 1;\nreturn ret;\n}\n");
- assertNotSame(TokenEntry.getEOF(), tokens.getTokens().get(0));
+ Tokenizer tokenizer = newTokenizer(dontSkipBlocks());
+ Tokens tokens = tokenize(tokenizer, "\ufeffint start()\n{ int ret = 1;\nreturn ret;\n}\n");
assertEquals(15, tokens.size());
}
@Test
- public void testUnicodeSupport() {
- String code = "\ufeff" + "#include \n" + "#include \n" + "\n" + "// example\n" + "\n"
- + "int main()\n" + "{\n" + " std::string text(\"ąęćśźńó\");\n" + " std::cout << text;\n"
- + " return 0;\n" + "}\n";
- Tokens tokens = parse(code);
- assertNotSame(TokenEntry.getEOF(), tokens.getTokens().get(0));
- assertEquals(24, tokens.size());
+ public void testContinuation() {
+ doTest("continuation");
+ }
+
+ @Test
+ public void testContinuationInIdent() {
+ doTest("continuation_intra_token");
+ }
+
+ @Test
+ public void testContinuationBetweenTokens() {
+ doTest("continuation_inter_token");
+ }
+
+ @Test
+ public void testUnicodeStringSupport() {
+ doTest("unicodeStrings");
}
@Test
public void testIgnoreBetweenSpecialComments() {
- String code = "#include \n" + "#include \n" + "\n" + "// CPD-OFF\n"
- + "int main()\n" + "{\n" + " std::string text(\"ąęćśźńó\");\n" + " std::cout << text;\n"
- + " return 0;\n" + "// CPD-ON\n" + "}\n";
- Tokens tokens = parse(code);
- assertNotSame(TokenEntry.getEOF(), tokens.getTokens().get(0));
- assertEquals(2, tokens.size()); // "}" + EOF
+ doTest("specialComments");
}
@Test
public void testMultiLineMacros() {
- Tokens tokens = parse(TEST1);
- assertEquals(7, tokens.size());
+ doTest("multilineMacros");
}
@Test
- public void testDollarSignInIdentifier() {
- parse(TEST2);
+ public void testIdentifierValidChars() {
+ doTest("identifierChars");
}
@Test
- public void testDollarSignStartingIdentifier() {
- parse(TEST3);
+ public void testWrongUnicodeInIdentifier() {
+ expectTokenMgrError(" void main() { int ⚜ = __; }");
}
@Test
- public void testWideCharacters() {
- parse(TEST4);
+ public void testTokenizerWithSkipBlocks() {
+ doTest("simpleSkipBlocks", "_skipDefault", skipBlocks());
}
@Test
- public void testTokenizerWithSkipBlocks() throws Exception {
- String test = IOUtils.toString(CPPTokenizerTest.class.getResourceAsStream("cpp/cpp_with_asm.cpp"), StandardCharsets.UTF_8);
- Tokens tokens = parse(test, true, new Tokens());
- assertEquals(19, tokens.size());
+ public void testTokenizerWithSkipBlocksPattern() {
+ doTest("simpleSkipBlocks", "_skipDebug", skipBlocks("#if debug|#endif"));
}
@Test
- public void testTokenizerWithSkipBlocksPattern() throws Exception {
- String test = IOUtils.toString(CPPTokenizerTest.class.getResourceAsStream("cpp/cpp_with_asm.cpp"), StandardCharsets.UTF_8);
- Tokens tokens = new Tokens();
- try {
- parse(test, true, "#if debug|#endif", tokens);
- } catch (TokenMgrError ignored) {
- // ignored
- }
- assertEquals(31, tokens.size());
+ public void testTokenizerWithoutSkipBlocks() {
+ doTest("simpleSkipBlocks", "_noSkip", dontSkipBlocks());
}
@Test
- public void testTokenizerWithoutSkipBlocks() throws Exception {
- String test = IOUtils.toString(CPPTokenizerTest.class.getResourceAsStream("cpp/cpp_with_asm.cpp"), StandardCharsets.UTF_8);
- Tokens tokens = new Tokens();
- try {
- parse(test, false, tokens);
- } catch (TokenMgrError ignored) {
- // ignored
- }
- assertEquals(37, tokens.size());
+ public void testAsm() {
+ // ASM code containing the '@' character
+ doTest("asm", "", dontSkipBlocks());
}
@Test
- // ASM code containing the '@' character
- public void testAsmWithAtSign() {
- Tokens tokens = parse(TEST7);
- assertEquals(22, tokens.size());
+ public void testPreprocessingDirectives() {
+ doTest("preprocessorDirectives");
}
@Test
- public void testEOLCommentInPreprocessingDirective() {
- parse("#define LSTFVLES_CPP //*" + PMD.EOL);
+ public void testLiterals() {
+ doTest("literals");
}
@Test
- public void testEmptyCharacter() {
- Tokens tokens = parse("std::wstring wsMessage( sMessage.length(), L'');" + PMD.EOL);
- assertEquals(15, tokens.size());
+ public void testLexicalErrorFilename() {
+ expectTokenMgrError(sourceText("issue-1559"), dontSkipBlocks());
}
+
@Test
- public void testHexCharacter() {
- Tokens tokens = parse("if (*pbuf == '\\0x05')" + PMD.EOL);
- assertEquals(8, tokens.size());
+ public void testRawStringLiterals() {
+ doTest("issue-1784");
}
- @Test
- public void testWhiteSpaceEscape() {
- Tokens tokens = parse("szPath = m_sdcacheDir + _T(\"\\ oMedia\");" + PMD.EOL);
- assertEquals(10, tokens.size());
+
+ private static Properties skipBlocks(String skipPattern) {
+ return properties(true, skipPattern);
}
- @Test
- public void testRawStringLiteral() {
- String code = "const char* const KDefaultConfig = R\"(\n" + " [Sinks.1]\n" + " Destination=Console\n"
- + " AutoFlush=true\n"
- + " Format=\"[%TimeStamp%] %ThreadId% %QueryIdHigh% %QueryIdLow% %LoggerFile%:%Line% (%Severity%) - %Message%\"\n"
- + " Filter=\"%Severity% >= WRN\"\n" + ")\";\n";
- Tokens tokens = parse(code);
- assertTrue(TokenEntry.getEOF() != tokens.getTokens().get(0));
- assertEquals(9, tokens.size());
+ private static Properties skipBlocks() {
+ return skipBlocks(null);
}
- @Test
- public void testLexicalErrorFilename() throws Exception {
- Properties properties = new Properties();
- properties.setProperty(Tokenizer.OPTION_SKIP_BLOCKS, Boolean.toString(false));
- String test = IOUtils.toString(CPPTokenizerTest.class.getResourceAsStream("cpp/issue-1559.cpp"), StandardCharsets.UTF_8);
- SourceCode code = new SourceCode(new SourceCode.StringCodeLoader(test, "issue-1559.cpp"));
- CPPTokenizer tokenizer = new CPPTokenizer();
- tokenizer.setProperties(properties);
-
- expectedException.expect(TokenMgrError.class);
- expectedException.expectMessage("Lexical error in file issue-1559.cpp at");
- tokenizer.tokenize(code, new Tokens());
+ private static Properties dontSkipBlocks() {
+ return properties(false, null);
}
- public void testStringPrefix(String code, String expToken, int tokenIndex, int expNoTokens) {
- final Tokens tokens = parse(code);
- final TokenEntry token = tokens.getTokens().get(tokenIndex);
- assertEquals(expNoTokens, tokens.size());
- assertEquals(expToken, token.toString());
- }
-
- public void testCharacterPrefix(String code, String expToken) {
- testStringPrefix(code, expToken, 3, 6);
- }
-
- public void testStringPrefix(String code, String expToken) {
- testStringPrefix(code, expToken, 5, 8);
- }
-
- @Test
- public void testCharacterPrefixNoPrefix() {
- testCharacterPrefix("char a = '\\x30';", "'\\x30'");
- }
-
- @Test
- public void testCharacterPrefixWideCharacter() {
- testCharacterPrefix("wchar_t b = L'\\xFFEF';", "L'\\xFFEF'");
- }
-
- @Test
- public void testCharacterPrefixChar16() {
- testCharacterPrefix("char16_t c = u'\\u00F6';", "u'\\u00F6'");
- }
-
- @Test
- public void testCharacterPrefixChar32() {
- testCharacterPrefix("char32_t d = U'\\U0010FFFF';", "U'\\U0010FFFF'");
- }
-
- @Test
- public void testStringPrefixNoPrefix() {
- testStringPrefix("char A[] = \"Hello\\x0A\";", "\"Hello\\x0A\"");
- }
-
- @Test
- public void testStringPrefixWideString() {
- testStringPrefix("wchar_t B[] = L\"Hell\\xF6\\x0A\";", "L\"Hell\\xF6\\x0A\"");
- }
-
- @Test
- public void testStringPrefixChar16() {
- testStringPrefix("char16_t C[] = u\"Hell\\u00F6\";", "u\"Hell\\u00F6\"");
- }
-
- @Test
- public void testStringPrefixChar32() {
- testStringPrefix("char32_t D[] = U\"Hell\\U000000F6\\U0010FFFF\";", "U\"Hell\\U000000F6\\U0010FFFF\"");
- }
-
- @Test
- public void testStringPrefixUtf8() {
- testStringPrefix("auto E[] = u8\"\\u00F6\\U0010FFFF\";", "u8\"\\u00F6\\U0010FFFF\"");
- }
-
- @Test
- public void testRawStringLiterals() throws IOException {
- final String code = IOUtils.toString(CPPTokenizerTest.class.getResourceAsStream("cpp/issue-1784.cpp"), StandardCharsets.UTF_8);
- Tokens tokens = parse(code);
- assertTrue(TokenEntry.getEOF() != tokens.getTokens().get(0));
- assertEquals(16, tokens.size());
- }
-
- @Test
- public void testDigitSeparators() {
- final String code = "auto integer_literal = 1'000'000;" + PMD.EOL
- + "auto floating_point_literal = 0.000'015'3;" + PMD.EOL
- + "auto hex_literal = 0x0F00'abcd'6f3d;" + PMD.EOL
- + "auto silly_example = 1'0'0'000'00;";
- Tokens tokens = parse(code);
- assertTrue(TokenEntry.getEOF() != tokens.getTokens().get(0));
- assertEquals("1'000'000", tokens.getTokens().get(3).toString());
- assertEquals(21, tokens.size());
- }
-
- private Tokens parse(String snippet) {
- try {
- return parse(snippet, false, new Tokens());
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private Tokens parse(String snippet, boolean skipBlocks, Tokens tokens) throws IOException {
- return parse(snippet, skipBlocks, null, tokens);
- }
-
- private Tokens parse(String snippet, boolean skipBlocks, String skipPattern, Tokens tokens) throws IOException {
+ private static Properties properties(boolean skipBlocks, String skipPattern) {
Properties properties = new Properties();
properties.setProperty(Tokenizer.OPTION_SKIP_BLOCKS, Boolean.toString(skipBlocks));
if (skipPattern != null) {
properties.setProperty(Tokenizer.OPTION_SKIP_BLOCKS_PATTERN, skipPattern);
}
-
- CPPTokenizer tokenizer = new CPPTokenizer();
- tokenizer.setProperties(properties);
-
- SourceCode code = new SourceCode(new SourceCode.StringCodeLoader(snippet));
- tokenizer.tokenize(code, tokens);
- return tokens;
+ return properties;
}
-
- private static final String TEST1 = "#define FOO a +\\" + PMD.EOL + " b +\\" + PMD.EOL
- + " c +\\" + PMD.EOL + " d +\\" + PMD.EOL + " e +\\" + PMD.EOL
- + " f +\\" + PMD.EOL + " g" + PMD.EOL + " void main() {}";
-
- private static final String TEST2 = " void main() { int x$y = 42; }";
-
- private static final String TEST3 = " void main() { int $x = 42; }";
-
- private static final String TEST4 = " void main() { char x = L'a'; }";
-
- private static final String TEST7 = "asm void eSPI_boot()" + PMD.EOL + "{" + PMD.EOL + " // setup stack pointer"
- + PMD.EOL + " lis r1, _stack_addr@h" + PMD.EOL + " ori r1, r1, _stack_addr@l" + PMD.EOL + "}";
}
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/asm.cpp b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/asm.cpp
new file mode 100644
index 0000000000..549e7ac740
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/asm.cpp
@@ -0,0 +1,36 @@
+asm void eSPI_boot()
+{
+ // setup stack pointer
+
+ lis r1, _stack_addr@h
+ ori r1, r1, _stack_addr@l
+}
+
+int main() {
+}
+
+#if DEBUG
+int foobar() {
+}
+#endif
+
+#if 0
+static void my_memset(void *dest,int fill_value,int count)
+{
+ __asm __volatile__(
+ "cld\n"
+ "mov %ecx, %ebx\n"
+ "shr 2,%ecx\n"
+ "rep "
+ "stosl\n"
+ "mov %ebx,%ecx\n"
+ " // line 157 mentioned above"
+ :
+ : "c" (count), "a" (fill_value), "D" (dest)
+ : "cc","%ebx" );
+}
+#endif
+
+
+int otherMethod() {
+}
\ No newline at end of file
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/asm.txt b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/asm.txt
new file mode 100644
index 0000000000..6de07f4db0
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/asm.txt
@@ -0,0 +1,114 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [asm] 1 4
+ [void] 5 9
+ [eSPI_boot] 10 19
+ [(] 19 20
+ [)] 20 21
+L2
+ [{] 1 2
+L5
+ [lis] 3 6
+ [r1] 7 9
+ [,] 9 10
+ [_stack_addr] 11 22
+ [@] 22 23
+ [h] 23 24
+L6
+ [ori] 3 6
+ [r1] 7 9
+ [,] 9 10
+ [r1] 11 13
+ [,] 13 14
+ [_stack_addr] 15 26
+ [@] 26 27
+ [l] 27 28
+L7
+ [}] 1 2
+L9
+ [int] 1 4
+ [main] 5 9
+ [(] 9 10
+ [)] 10 11
+ [{] 12 13
+L10
+ [}] 1 2
+L13
+ [int] 1 4
+ [foobar] 5 11
+ [(] 11 12
+ [)] 12 13
+ [{] 14 15
+L14
+ [}] 1 2
+L18
+ [static] 1 7
+ [void] 8 12
+ [my_memset] 13 22
+ [(] 22 23
+ [void] 23 27
+ [*] 28 29
+ [dest] 29 33
+ [,] 33 34
+ [int] 34 37
+ [fill_value] 38 48
+ [,] 48 49
+ [int] 49 52
+ [count] 53 58
+ [)] 58 59
+L19
+ [{] 1 2
+L20
+ [__asm] 5 10
+ [__volatile__] 11 23
+ [(] 23 24
+L21
+ ["cld\\n"] 10 17
+L22
+ ["mov %ecx, %ebx\\n"] 10 28
+L23
+ ["shr 2,%ecx\\n"] 10 24
+L24
+ ["rep "] 10 16
+L25
+ ["stosl\\n"] 10 19
+L26
+ ["mov %ebx,%ecx\\n"] 10 27
+L27
+ [" // line 157 mentioned above"] 10 41
+L28
+ [:] 10 11
+L29
+ [:] 10 11
+ ["c"] 12 15
+ [(] 16 17
+ [count] 17 22
+ [)] 22 23
+ [,] 23 24
+ ["a"] 25 28
+ [(] 29 30
+ [fill_value] 30 40
+ [)] 40 41
+ [,] 41 42
+ ["D"] 43 46
+ [(] 47 48
+ [dest] 48 52
+ [)] 52 53
+L30
+ [:] 10 11
+ ["cc"] 12 16
+ [,] 16 17
+ ["%ebx"] 17 23
+ [)] 24 25
+ [;] 25 26
+L31
+ [}] 1 2
+L35
+ [int] 1 4
+ [otherMethod] 5 16
+ [(] 16 17
+ [)] 17 18
+ [{] 19 20
+L36
+ [}] 1 2
+EOF
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/cpd/cpp/cpp_with_continuation.cpp b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/continuation.cpp
similarity index 100%
rename from pmd-cpp/src/test/resources/net/sourceforge/pmd/cpd/cpp/cpp_with_continuation.cpp
rename to pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/continuation.cpp
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/continuation.txt b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/continuation.txt
new file mode 100644
index 0000000000..616ca27009
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/continuation.txt
@@ -0,0 +1,68 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L8
+ [static] 1 7
+ [int] 8 11
+ [ab] 12 2
+L9
+ [=] 3 4
+ [5] 5 6
+ [;] 6 7
+L12
+ [int] 1 4
+ [main] 5 9
+ [(] 9 10
+ [)] 10 11
+L13
+ [{] 1 2
+L15
+ [std] 3 6
+ [::] 6 8
+ [cout] 8 12
+ [<<] 13 15
+ ["1 Hello, "] 16 27
+L16
+ ["world!\\n"] 16 26
+ [;] 26 27
+L18
+ [std] 3 6
+ [::] 6 8
+ [cout] 8 12
+ [<<] 13 15
+ ["2 Hello, world!\\n"] 16 10
+L19
+ [;] 10 11
+L22
+ [std] 3 6
+ [::] 6 8
+ [cout] 8 12
+ [<<] 13 15
+ ["3 Hello, \\world!\\n"] 16 10
+L23
+ [;] 10 11
+L25
+ [std] 3 6
+ [::] 6 8
+ [cout] 8 12
+ [<<] 13 15
+ ["4 Hello, "] 16 27
+L26
+ ["world!\\n"] 15 25
+ [;] 25 26
+L27
+ [std] 3 6
+ [::] 6 8
+ [cout] 8 12
+ [<<] 13 15
+ ["ab="] 16 21
+ [<<] 22 24
+ [ab] 25 27
+ [<<] 28 30
+ ["\\n"] 31 35
+ [;] 35 36
+L28
+ [return] 3 9
+ [0] 10 11
+ [;] 11 12
+L29
+ [}] 1 2
+EOF
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/cpd/cpp/cpp_continuation_inter_token.cpp b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/continuation_inter_token.cpp
similarity index 100%
rename from pmd-cpp/src/test/resources/net/sourceforge/pmd/cpd/cpp/cpp_continuation_inter_token.cpp
rename to pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/continuation_inter_token.cpp
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/continuation_inter_token.txt b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/continuation_inter_token.txt
new file mode 100644
index 0000000000..30c915c3f7
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/continuation_inter_token.txt
@@ -0,0 +1,24 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L3
+ [int] 1 4
+ [main] 5 9
+ [(] 9 10
+ [)] 10 11
+L4
+ [{] 1 2
+L5
+ [std] 4 7
+ [::] 7 9
+ [cout] 9 13
+ [<<] 14 16
+ ["Hello, "] 17 26
+L6
+ ["world!\\n"] 17 27
+ [;] 27 28
+L7
+ [return] 4 10
+ [0] 11 12
+ [;] 12 13
+L8
+ [}] 1 2
+EOF
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/cpd/cpp/cpp_continuation_intra_token.cpp b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/continuation_intra_token.cpp
similarity index 100%
rename from pmd-cpp/src/test/resources/net/sourceforge/pmd/cpd/cpp/cpp_continuation_intra_token.cpp
rename to pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/continuation_intra_token.cpp
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/continuation_intra_token.txt b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/continuation_intra_token.txt
new file mode 100644
index 0000000000..abc147ce72
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/continuation_intra_token.txt
@@ -0,0 +1,13 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [void] 1 1
+L5
+ [main] 2 1
+L10
+ [(] 1 2
+ [)] 2 2
+L12
+ [{] 2 2
+L14
+ [}] 2 2
+EOF
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/identifierChars.cpp b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/identifierChars.cpp
new file mode 100644
index 0000000000..696a52e5da
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/identifierChars.cpp
@@ -0,0 +1,7 @@
+ void main() {
+ int x$y = 42;
+ int $yx = 42;
+ int 県 = µweiß42;
+ int ❶ = __;
+ int a\u0048; // unicode escape
+ }
\ No newline at end of file
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/identifierChars.txt b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/identifierChars.txt
new file mode 100644
index 0000000000..9916694f63
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/identifierChars.txt
@@ -0,0 +1,38 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [void] 2 6
+ [main] 7 11
+ [(] 11 12
+ [)] 12 13
+ [{] 14 15
+L2
+ [int] 5 8
+ [x$y] 9 12
+ [=] 13 14
+ [42] 15 17
+ [;] 17 18
+L3
+ [int] 5 8
+ [$yx] 9 12
+ [=] 13 14
+ [42] 15 17
+ [;] 17 18
+L4
+ [int] 5 8
+ [県] 9 10
+ [=] 11 12
+ [µweiß42] 13 20
+ [;] 20 21
+L5
+ [int] 5 8
+ [❶] 9 10
+ [=] 11 12
+ [__] 13 15
+ [;] 15 16
+L6
+ [int] 5 8
+ [a\\u0048] 9 16
+ [;] 16 17
+L7
+ [}] 2 3
+EOF
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/cpd/cpp/issue-1559.cpp b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/issue-1559.cpp
similarity index 100%
rename from pmd-cpp/src/test/resources/net/sourceforge/pmd/cpd/cpp/issue-1559.cpp
rename to pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/issue-1559.cpp
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/cpd/cpp/issue-1784.cpp b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/issue-1784.cpp
similarity index 100%
rename from pmd-cpp/src/test/resources/net/sourceforge/pmd/cpd/cpp/issue-1784.cpp
rename to pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/issue-1784.cpp
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/issue-1784.txt b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/issue-1784.txt
new file mode 100644
index 0000000000..be5d5e1ddc
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/issue-1784.txt
@@ -0,0 +1,25 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [namespace] 1 10
+ [ABC] 11 14
+L2
+ [{] 1 2
+L3
+ [namespace] 3 12
+ [DEF] 13 16
+L4
+ [{] 3 4
+L7
+ [const] 5 10
+ [char] 11 15
+ [*] 15 16
+ [perPixelQml] 17 28
+ [=] 29 30
+ [R"QML(\n )NOTTHEND";\n)QML"] 31 6
+L9
+ [;] 6 7
+L10
+ [}] 3 4
+L11
+ [}] 1 2
+EOF
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/literals.cpp b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/literals.cpp
new file mode 100644
index 0000000000..9f0d38b06f
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/literals.cpp
@@ -0,0 +1,40 @@
+ void main() {
+ char x = L'a'; // wide chars
+ x = '\0x05'; // hex
+ // x = L''; // empty character is an error
+
+ print("\ oMedia"); // whitespace escape
+
+
+ // char prefixes
+ char16_t c = u'\u00F6';
+ wchar_t b = L'\xFFEF';
+ char a = '\x30';
+ char32_t d = U'\U0010FFFF';
+
+ // string prefixes
+ char A[] = "Hello\x0A";
+ wchar_t B[] = L"Hell\xF6\x0A";
+ char16_t C[] = u"Hell\u00F6";
+ char32_t D[] = U"Hell\U000000F6\U0010FFFF";
+ auto E[] = u8"\u00F6\U0010FFFF";
+
+
+
+ char* rawString = R"(
+ [Sinks.1]
+ Destination=Console
+ AutoFlush=true
+ Format="[%TimeStamp%] %ThreadId% %QueryIdHigh% %QueryIdLow% %LoggerFile%:%Line% (%Severity%) - %Message%"
+ Filter="%Severity% >= WRN"
+ )";
+
+
+
+ // digit separators
+ auto integer_literal = 1'000''000;
+ auto floating_point_literal = 0.000'015'3;
+ auto hex_literal = 0x0F00'abcd'6f3d;
+ auto silly_example = 1'0'0'000'00;
+
+}
\ No newline at end of file
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/literals.txt b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/literals.txt
new file mode 100644
index 0000000000..3a0185425f
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/literals.txt
@@ -0,0 +1,123 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [void] 2 6
+ [main] 7 11
+ [(] 11 12
+ [)] 12 13
+ [{] 14 15
+L2
+ [char] 5 9
+ [x] 10 11
+ [=] 12 13
+ [L'a'] 14 18
+ [;] 18 19
+L3
+ [x] 5 6
+ [=] 7 8
+ ['\\0x05'] 9 16
+ [;] 16 17
+L6
+ [print] 5 10
+ [(] 10 11
+ ["\\ oMedia"] 11 24
+ [)] 24 25
+ [;] 25 26
+L10
+ [char16_t] 5 13
+ [c] 14 15
+ [=] 16 17
+ [u'\\u00F6'] 18 27
+ [;] 27 28
+L11
+ [wchar_t] 5 12
+ [b] 13 14
+ [=] 15 16
+ [L'\\xFFEF'] 17 26
+ [;] 26 27
+L12
+ [char] 5 9
+ [a] 10 11
+ [=] 12 13
+ ['\\x30'] 15 21
+ [;] 21 22
+L13
+ [char32_t] 5 13
+ [d] 14 15
+ [=] 16 17
+ [U'\\U0010FFFF'] 18 31
+ [;] 31 32
+L16
+ [char] 5 9
+ [A] 10 11
+ [\[] 11 12
+ [\]] 12 13
+ [=] 14 15
+ ["Hello\\x0A"] 16 27
+ [;] 27 28
+L17
+ [wchar_t] 5 12
+ [B] 13 14
+ [\[] 14 15
+ [\]] 15 16
+ [=] 17 18
+ [L"Hell\\xF6\\x0A"] 19 34
+ [;] 34 35
+L18
+ [char16_t] 5 13
+ [C] 14 15
+ [\[] 15 16
+ [\]] 16 17
+ [=] 18 19
+ [u"Hell\\u00F6"] 20 33
+ [;] 33 34
+L19
+ [char32_t] 5 13
+ [D] 14 15
+ [\[] 15 16
+ [\]] 16 17
+ [=] 18 19
+ [U"Hell\\U000000F6\\U0010FFFF"] 20 47
+ [;] 47 48
+L20
+ [auto] 5 9
+ [E] 10 11
+ [\[] 11 12
+ [\]] 12 13
+ [=] 14 15
+ [u8"\\u00F6\\U0010FFFF"] 16 36
+ [;] 36 37
+L24
+ [char] 5 9
+ [*] 9 10
+ [rawString] 11 20
+ [=] 21 22
+ [R"(\n \[Sinks.1\]\n [ 23 7
+L30
+ [;] 7 8
+L35
+ [auto] 5 9
+ [integer_literal] 10 25
+ [=] 26 27
+ [1'000''000] 28 38
+ [;] 38 39
+L36
+ [auto] 5 9
+ [floating_point_literal] 10 32
+ [=] 33 34
+ [0.000'015'3] 35 46
+ [;] 46 47
+L37
+ [auto] 5 9
+ [hex_literal] 10 21
+ [=] 22 23
+ [0x0F00'abcd'6f3d] 24 40
+ [;] 40 41
+L38
+ [auto] 5 9
+ [silly_example] 10 23
+ [=] 24 25
+ [1'0'0'000'00] 26 38
+ [;] 38 39
+L40
+ [}] 1 2
+EOF
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/multilineMacros.cpp b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/multilineMacros.cpp
new file mode 100644
index 0000000000..0b6c240d99
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/multilineMacros.cpp
@@ -0,0 +1,8 @@
+#define FOO a +\
+ b +\
+ c +\
+ d +\
+ e +\
+ f +\
+ g
+ void main() {}
\ No newline at end of file
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/multilineMacros.txt b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/multilineMacros.txt
new file mode 100644
index 0000000000..8fd1dc5134
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/multilineMacros.txt
@@ -0,0 +1,9 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L8
+ [void] 2 6
+ [main] 7 11
+ [(] 11 12
+ [)] 12 13
+ [{] 14 15
+ [}] 15 16
+EOF
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/preprocessorDirectives.cpp b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/preprocessorDirectives.cpp
new file mode 100644
index 0000000000..2cebb6493e
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/preprocessorDirectives.cpp
@@ -0,0 +1,2 @@
+#define LSTFVLES_CPP //*
+// EOL comment in the directive
\ No newline at end of file
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/preprocessorDirectives.txt b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/preprocessorDirectives.txt
new file mode 100644
index 0000000000..49ab402048
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/preprocessorDirectives.txt
@@ -0,0 +1,2 @@
+ [Image] or [Truncated image[ Bcol Ecol
+EOF
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/cpd/cpp/cpp_with_asm.cpp b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/simpleSkipBlocks.cpp
similarity index 87%
rename from pmd-cpp/src/test/resources/net/sourceforge/pmd/cpd/cpp/cpp_with_asm.cpp
rename to pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/simpleSkipBlocks.cpp
index 93361b4de6..40691867fc 100644
--- a/pmd-cpp/src/test/resources/net/sourceforge/pmd/cpd/cpp/cpp_with_asm.cpp
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/simpleSkipBlocks.cpp
@@ -16,8 +16,8 @@ static void my_memset(void *dest,int fill_value,int count)
"rep "
"stosl\n"
"mov %ebx,%ecx\n"
- " // line 157 mentioned above
- :
+ " // line 157 mentioned above"
+ :
: "c" (count), "a" (fill_value), "D" (dest)
: "cc","%ebx" );
}
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/simpleSkipBlocks_noSkip.txt b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/simpleSkipBlocks_noSkip.txt
new file mode 100644
index 0000000000..9105fa25e2
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/simpleSkipBlocks_noSkip.txt
@@ -0,0 +1,88 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [int] 1 4
+ [main] 5 9
+ [(] 9 10
+ [)] 10 11
+ [{] 12 13
+L2
+ [}] 1 2
+L5
+ [int] 1 4
+ [foobar] 5 11
+ [(] 11 12
+ [)] 12 13
+ [{] 14 15
+L6
+ [}] 1 2
+L10
+ [static] 1 7
+ [void] 8 12
+ [my_memset] 13 22
+ [(] 22 23
+ [void] 23 27
+ [*] 28 29
+ [dest] 29 33
+ [,] 33 34
+ [int] 34 37
+ [fill_value] 38 48
+ [,] 48 49
+ [int] 49 52
+ [count] 53 58
+ [)] 58 59
+L11
+ [{] 1 2
+L12
+ [__asm] 5 10
+ [__volatile__] 11 23
+ [(] 23 24
+L13
+ ["cld\\n"] 10 17
+L14
+ ["mov %ecx, %ebx\\n"] 10 28
+L15
+ ["shr 2,%ecx\\n"] 10 24
+L16
+ ["rep "] 10 16
+L17
+ ["stosl\\n"] 10 19
+L18
+ ["mov %ebx,%ecx\\n"] 10 27
+L19
+ [" // line 157 mentioned above"] 10 41
+L20
+ [:] 10 11
+L21
+ [:] 10 11
+ ["c"] 12 15
+ [(] 16 17
+ [count] 17 22
+ [)] 22 23
+ [,] 23 24
+ ["a"] 25 28
+ [(] 29 30
+ [fill_value] 30 40
+ [)] 40 41
+ [,] 41 42
+ ["D"] 43 46
+ [(] 47 48
+ [dest] 48 52
+ [)] 52 53
+L22
+ [:] 10 11
+ ["cc"] 12 16
+ [,] 16 17
+ ["%ebx"] 17 23
+ [)] 24 25
+ [;] 25 26
+L23
+ [}] 1 2
+L27
+ [int] 1 4
+ [otherMethod] 5 16
+ [(] 16 17
+ [)] 17 18
+ [{] 19 20
+L28
+ [}] 1 2
+EOF
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/simpleSkipBlocks_skipDebug.txt b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/simpleSkipBlocks_skipDebug.txt
new file mode 100644
index 0000000000..ccdebae7a0
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/simpleSkipBlocks_skipDebug.txt
@@ -0,0 +1,80 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [int] 1 4
+ [main] 5 9
+ [(] 9 10
+ [)] 10 11
+ [{] 12 13
+L2
+ [}] 1 2
+L10
+ [static] 1 7
+ [void] 8 12
+ [my_memset] 13 22
+ [(] 22 23
+ [void] 23 27
+ [*] 28 29
+ [dest] 29 33
+ [,] 33 34
+ [int] 34 37
+ [fill_value] 38 48
+ [,] 48 49
+ [int] 49 52
+ [count] 53 58
+ [)] 58 59
+L11
+ [{] 1 2
+L12
+ [__asm] 5 10
+ [__volatile__] 11 23
+ [(] 23 24
+L13
+ ["cld\\n"] 10 17
+L14
+ ["mov %ecx, %ebx\\n"] 10 28
+L15
+ ["shr 2,%ecx\\n"] 10 24
+L16
+ ["rep "] 10 16
+L17
+ ["stosl\\n"] 10 19
+L18
+ ["mov %ebx,%ecx\\n"] 10 27
+L19
+ [" // line 157 mentioned above"] 10 41
+L20
+ [:] 10 11
+L21
+ [:] 10 11
+ ["c"] 12 15
+ [(] 16 17
+ [count] 17 22
+ [)] 22 23
+ [,] 23 24
+ ["a"] 25 28
+ [(] 29 30
+ [fill_value] 30 40
+ [)] 40 41
+ [,] 41 42
+ ["D"] 43 46
+ [(] 47 48
+ [dest] 48 52
+ [)] 52 53
+L22
+ [:] 10 11
+ ["cc"] 12 16
+ [,] 16 17
+ ["%ebx"] 17 23
+ [)] 24 25
+ [;] 25 26
+L23
+ [}] 1 2
+L27
+ [int] 1 4
+ [otherMethod] 5 16
+ [(] 16 17
+ [)] 17 18
+ [{] 19 20
+L28
+ [}] 1 2
+EOF
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/simpleSkipBlocks_skipDefault.txt b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/simpleSkipBlocks_skipDefault.txt
new file mode 100644
index 0000000000..d8cd8a6373
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/simpleSkipBlocks_skipDefault.txt
@@ -0,0 +1,26 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [int] 1 4
+ [main] 5 9
+ [(] 9 10
+ [)] 10 11
+ [{] 12 13
+L2
+ [}] 1 2
+L5
+ [int] 1 4
+ [foobar] 5 11
+ [(] 11 12
+ [)] 12 13
+ [{] 14 15
+L6
+ [}] 1 2
+L27
+ [int] 1 4
+ [otherMethod] 5 16
+ [(] 16 17
+ [)] 17 18
+ [{] 19 20
+L28
+ [}] 1 2
+EOF
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/specialComments.cpp b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/specialComments.cpp
new file mode 100644
index 0000000000..174385240d
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/specialComments.cpp
@@ -0,0 +1,11 @@
+#include
+#include
+
+// CPD-OFF
+int main()
+{
+ std::string text("ąęćśźńó");
+ std::cout << text;
+ return 0;
+// CPD-ON
+}
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/specialComments.txt b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/specialComments.txt
new file mode 100644
index 0000000000..c6fe074514
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/specialComments.txt
@@ -0,0 +1,4 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L11
+ [}] 1 2
+EOF
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/unicodeStrings.cpp b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/unicodeStrings.cpp
new file mode 100644
index 0000000000..badbd5465c
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/unicodeStrings.cpp
@@ -0,0 +1,11 @@
+#include
+#include
+
+// example
+
+int main()
+{
+ std::string text("ąęćśźńó");
+ std::cout << text;
+ return 0;
+}
diff --git a/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/unicodeStrings.txt b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/unicodeStrings.txt
new file mode 100644
index 0000000000..39f38aa76d
--- /dev/null
+++ b/pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/unicodeStrings.txt
@@ -0,0 +1,31 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L6
+ [int] 1 4
+ [main] 5 9
+ [(] 9 10
+ [)] 10 11
+L7
+ [{] 1 2
+L8
+ [std] 5 8
+ [::] 8 10
+ [string] 10 16
+ [text] 17 21
+ [(] 21 22
+ ["ąęćśźńó"] 22 31
+ [)] 31 32
+ [;] 32 33
+L9
+ [std] 5 8
+ [::] 8 10
+ [cout] 10 14
+ [<<] 15 17
+ [text] 18 22
+ [;] 22 23
+L10
+ [return] 5 11
+ [0] 12 13
+ [;] 13 14
+L11
+ [}] 1 2
+EOF
diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml
index 17f71d4e62..7e11e43d1d 100644
--- a/pmd-cs/pom.xml
+++ b/pmd-cs/pom.xml
@@ -45,10 +45,20 @@
junit
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
net.sourceforge.pmd
pmd-test
test
+
+ net.sourceforge.pmd
+ pmd-lang-test
+ test
+
diff --git a/pmd-cs/src/test/java/net/sourceforge/pmd/cpd/CsTokenizerTest.java b/pmd-cs/src/test/java/net/sourceforge/pmd/cpd/CsTokenizerTest.java
index 7121f2131e..0828c4cc24 100644
--- a/pmd-cs/src/test/java/net/sourceforge/pmd/cpd/CsTokenizerTest.java
+++ b/pmd-cs/src/test/java/net/sourceforge/pmd/cpd/CsTokenizerTest.java
@@ -1,191 +1,97 @@
-/**
+/*
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.cpd;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import java.util.Properties;
-import java.util.List;
-
-import org.junit.Before;
import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
import net.sourceforge.pmd.lang.ast.TokenMgrError;
-public class CsTokenizerTest {
+public class CsTokenizerTest extends CpdTextComparisonTest {
- private CsTokenizer tokenizer;
+ @org.junit.Rule
+ public ExpectedException ex = ExpectedException.none();
- private Tokens tokens;
+ public CsTokenizerTest() {
+ super(".cs");
+ }
- @Before
- public void init() {
- tokenizer = new CsTokenizer();
- tokens = new Tokens();
- TokenEntry.clearImages();
+ @Override
+ protected String getResourcePrefix() {
+ return "../lang/cs/cpd/testdata";
+ }
+
+ @Override
+ public Tokenizer newTokenizer(Properties properties) {
+ CsTokenizer tok = new CsTokenizer();
+ tok.setProperties(properties);
+ return tok;
}
@Test
public void testSimpleClass() {
- tokenizer.tokenize(toSourceCode("class Foo {}"), tokens);
- assertEquals(5, tokens.size());
- }
-
- @Test
- public void testSimpleClassDuplicatedTokens() {
- tokenizer.tokenize(toSourceCode("class Foo { class Foo { } }"), tokens);
- assertEquals(9, tokens.size());
- List tokenList = tokens.getTokens();
- assertEquals(tokenList.get(0).getIdentifier(), tokenList.get(3).getIdentifier());
- assertEquals(tokenList.get(1).getIdentifier(), tokenList.get(4).getIdentifier());
- assertEquals(tokenList.get(2).getIdentifier(), tokenList.get(5).getIdentifier());
- assertEquals(tokenList.get(6).getIdentifier(), tokenList.get(7).getIdentifier());
+ doTest("simpleClass");
}
@Test
public void testSimpleClassMethodMultipleLines() {
- tokenizer.tokenize(toSourceCode("class Foo {\n" + " public String foo(int a) {\n" + " int i = a;\n"
- + " return \"x\" + a;\n" + " }\n" + "}"), tokens);
- assertEquals(24, tokens.size());
- List tokenList = tokens.getTokens();
- assertEquals(1, tokenList.get(0).getBeginLine());
- assertEquals(2, tokenList.get(4).getBeginLine());
- assertEquals(3, tokenList.get(11).getBeginLine());
+ doTest("simpleClassMethodMultipleLines");
}
@Test
public void testStrings() {
- tokenizer.tokenize(toSourceCode("String s =\"aaa \\\"b\\n\";"), tokens);
- assertEquals(6, tokens.size());
+ doTest("strings");
}
- @Test(expected = TokenMgrError.class)
+ @Test
public void testOpenString() {
- tokenizer.tokenize(toSourceCode("String s =\"aaa \\\"b\\"), tokens);
+ ex.expect(TokenMgrError.class);
+ doTest("unlexable_string");
}
@Test
public void testCommentsIgnored1() {
- tokenizer.tokenize(toSourceCode("class Foo { /* class * ** X */ }"), tokens);
- assertEquals(5, tokens.size());
- }
-
- @Test
- public void testCommentsIgnored2() {
- tokenizer.tokenize(toSourceCode("class Foo { // class X /* aaa */ \n }"), tokens);
- assertEquals(5, tokens.size());
+ doTest("comments");
}
@Test
public void testIgnoreBetweenSpecialComments() {
- tokenizer
- .tokenize(
- toSourceCode("// CPD-OFF\n" + "class Foo {\n" + " void bar() {\n" + " int a = 1 >> 2; \n"
- + " a += 1; \n" + " a++; \n" + " a /= 3e2; \n" + " float f = -3.1; \n"
- + " f *= 2; \n" + " bool b = ! (f == 2.0 || f >= 1.0 && f <= 2.0) \n"
- + " }\n" + "// CPD-ON\n" + "}"),
- tokens);
- assertEquals(2, tokens.size()); // "}" + EOF
+ doTest("specialComments");
}
@Test
- public void testCommentsIgnored3() {
- tokenizer.tokenize(toSourceCode("class Foo { /// class X /* aaa */ \n }"), tokens);
- assertEquals(5, tokens.size());
+ public void testOperators() {
+ doTest("operatorsAndStuff");
}
- @Test
- public void testMoreTokens() {
- tokenizer
- .tokenize(
- toSourceCode("class Foo {\n" + " void bar() {\n" + " int a = 1 >> 2; \n" + " a += 1; \n"
- + " a++; \n" + " a /= 3e2; \n" + " float f = -3.1; \n" + " f *= 2; \n"
- + " bool b = ! (f == 2.0 || f >= 1.0 && f <= 2.0) \n" + " }\n" + "}"),
- tokens);
- assertEquals(57, tokens.size());
- }
-
- @Test
- public void testLineNumberAfterMultilineComment() {
- tokenizer
- .tokenize(
- toSourceCode("/* This is a multiline comment \n" + " * \n" + " * Lorem ipsum dolor sit amet, \n"
- + " * consectetur adipiscing elit \n" + " */\n" + "\n" + "class Foo {\n" + "\n" + "}"),
- tokens);
- assertEquals(5, tokens.size());
- assertEquals(7, tokens.getTokens().get(0).getBeginLine());
- }
@Test
public void testLineNumberAfterMultilineString() {
- tokenizer.tokenize(toSourceCode(
- "class Foo {\n" + " void bar() {\n" + " String query = \n" + " @\"SELECT foo, bar\n"
- + " FROM table \n" + " WHERE id = 42\"; \n" + " }\n" + "}"),
- tokens);
- assertEquals(16, tokens.size());
- assertEquals(8, tokens.getTokens().get(14).getBeginLine());
+ doTest("strings");
}
@Test
public void testDoNotIgnoreUsingDirectives() {
- tokenizer.setIgnoreUsings(false);
- tokenizer.tokenize(toSourceCode("using System.Text;\n"), tokens);
- assertEquals(6, tokens.size());
- assertEquals("using", tokens.getTokens().get(0).toString());
+ doTest("usingDirectives");
}
@Test
public void testIgnoreUsingDirectives() {
- tokenizer.setIgnoreUsings(true);
- tokenizer.tokenize(toSourceCode("using System.Text;\n"), tokens);
- assertEquals(1, tokens.size());
- assertNotEquals("using", tokens.getTokens().get(0).toString());
- assertEquals(TokenEntry.EOF, tokens.getTokens().get(0));
+ doTest("usingDirectives", "_ignored", ignoreUsings());
}
- @Test
- public void testStatementsAfterUsingDirectivesAreNotIgnored() {
- tokenizer.setIgnoreUsings(true);
- tokenizer.tokenize(toSourceCode(
- "using System;\n"
- + "public class MyClass {\n"
- + "}\n"),
- tokens);
- assertEquals(6, tokens.size());
+ private Properties ignoreUsings() {
+ return properties(true);
}
- @Test
- public void testUsingStatementsAreNotIgnored() {
- tokenizer.setIgnoreUsings(true);
- tokenizer.tokenize(toSourceCode(
- "using (Font font1 = new Font(\"Arial\", 10.0f)) {\n" + " byte charset = font1.GdiCharSet;\n" + "}\n"),
- tokens);
- assertEquals("using", tokens.getTokens().get(0).toString());
- }
-
- @Test
- public void testUsingVarStatementsAreNotIgnored() {
- tokenizer.setIgnoreUsings(true);
- tokenizer.tokenize(toSourceCode(
- "using var font1 = new Font(\"Arial\", 10.0f);\n" + " byte charset = font1.GdiCharSet;\n"),
- tokens);
- assertEquals("using", tokens.getTokens().get(0).toString());
- }
-
- @Test
- public void testInterpolatedVerbatimStrings() {
- tokenizer.setIgnoreUsings(true);
- tokenizer.tokenize(toSourceCode(
- "var test = $@\"test\";\n"
- + "var test2 = @$\"test\";"),
- tokens
- );
- assertEquals(15, tokens.size());
- }
-
- private SourceCode toSourceCode(String source) {
- return new SourceCode(new SourceCode.StringCodeLoader(source));
+ private Properties properties(boolean ignoreUsings) {
+ Properties properties = new Properties();
+ properties.setProperty(Tokenizer.IGNORE_USINGS, Boolean.toString(ignoreUsings));
+ return properties;
}
}
diff --git a/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/comments.cs b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/comments.cs
new file mode 100644
index 0000000000..1757cf2afd
--- /dev/null
+++ b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/comments.cs
@@ -0,0 +1,6 @@
+class Foo { /// class X
+ /* aaa
+
+ dedejde
+ */
+ }
\ No newline at end of file
diff --git a/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/comments.txt b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/comments.txt
new file mode 100644
index 0000000000..7ab6aaca6b
--- /dev/null
+++ b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/comments.txt
@@ -0,0 +1,8 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [class] 1 6
+ [Foo] 7 10
+ [{] 11 12
+L6
+ [}] 2 3
+EOF
diff --git a/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/operatorsAndStuff.cs b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/operatorsAndStuff.cs
new file mode 100644
index 0000000000..b94f5972de
--- /dev/null
+++ b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/operatorsAndStuff.cs
@@ -0,0 +1,11 @@
+class Foo {
+ void bar() {
+ int a = 1 >> 2;
+ a += 1;
+ a++;
+ a /= 3e2;
+ float f = -3.1;
+ f *= 2;
+ bool b = ! (f == 2.0 || f >= 1.0 && f <= 2.0)
+ }
+}
\ No newline at end of file
diff --git a/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/operatorsAndStuff.txt b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/operatorsAndStuff.txt
new file mode 100644
index 0000000000..30e95711f3
--- /dev/null
+++ b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/operatorsAndStuff.txt
@@ -0,0 +1,69 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [class] 1 6
+ [Foo] 7 10
+ [{] 11 12
+L2
+ [void] 3 7
+ [bar] 8 11
+ [(] 11 12
+ [)] 12 13
+ [{] 14 15
+L3
+ [int] 5 8
+ [a] 9 10
+ [=] 11 12
+ [1] 13 14
+ [>] 15 16
+ [>] 16 17
+ [2] 18 19
+ [;] 19 20
+L4
+ [a] 5 6
+ [+=] 7 9
+ [1] 10 11
+ [;] 11 12
+L5
+ [a] 5 6
+ [++] 6 8
+ [;] 8 9
+L6
+ [a] 5 6
+ [/=] 7 9
+ [3e2] 10 13
+ [;] 13 14
+L7
+ [float] 5 10
+ [f] 11 12
+ [=] 13 14
+ [-] 15 16
+ [3.1] 16 19
+ [;] 19 20
+L8
+ [f] 5 6
+ [*=] 7 9
+ [2] 10 11
+ [;] 11 12
+L9
+ [bool] 5 9
+ [b] 10 11
+ [=] 12 13
+ [!] 14 15
+ [(] 16 17
+ [f] 17 18
+ [==] 19 21
+ [2.0] 22 25
+ [||] 26 28
+ [f] 29 30
+ [>=] 31 33
+ [1.0] 34 37
+ [&&] 38 40
+ [f] 41 42
+ [<=] 43 45
+ [2.0] 46 49
+ [)] 49 50
+L10
+ [}] 3 4
+L11
+ [}] 1 2
+EOF
diff --git a/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/simpleClass.cs b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/simpleClass.cs
new file mode 100644
index 0000000000..c3c54739d9
--- /dev/null
+++ b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/simpleClass.cs
@@ -0,0 +1 @@
+class Foo { class Foo { } }
\ No newline at end of file
diff --git a/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/simpleClass.txt b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/simpleClass.txt
new file mode 100644
index 0000000000..bbe7ed6f13
--- /dev/null
+++ b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/simpleClass.txt
@@ -0,0 +1,11 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [class] 1 6
+ [Foo] 7 10
+ [{] 11 12
+ [class] 13 18
+ [Foo] 19 22
+ [{] 23 24
+ [}] 25 26
+ [}] 27 28
+EOF
diff --git a/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/simpleClassMethodMultipleLines.cs b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/simpleClassMethodMultipleLines.cs
new file mode 100644
index 0000000000..38b1f8995c
--- /dev/null
+++ b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/simpleClassMethodMultipleLines.cs
@@ -0,0 +1,6 @@
+class Foo {
+ public String foo(int a) {
+ int i = a;
+ return "x" + a;
+ }
+}
\ No newline at end of file
diff --git a/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/simpleClassMethodMultipleLines.txt b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/simpleClassMethodMultipleLines.txt
new file mode 100644
index 0000000000..32b6877fa3
--- /dev/null
+++ b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/simpleClassMethodMultipleLines.txt
@@ -0,0 +1,31 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [class] 1 6
+ [Foo] 7 10
+ [{] 11 12
+L2
+ [public] 3 9
+ [String] 10 16
+ [foo] 17 20
+ [(] 20 21
+ [int] 21 24
+ [a] 25 26
+ [)] 26 27
+ [{] 28 29
+L3
+ [int] 5 8
+ [i] 9 10
+ [=] 11 12
+ [a] 13 14
+ [;] 14 15
+L4
+ [return] 5 11
+ ["x"] 12 15
+ [+] 16 17
+ [a] 18 19
+ [;] 19 20
+L5
+ [}] 3 4
+L6
+ [}] 1 2
+EOF
diff --git a/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/specialComments.cs b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/specialComments.cs
new file mode 100644
index 0000000000..cde6ce90eb
--- /dev/null
+++ b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/specialComments.cs
@@ -0,0 +1,13 @@
+// CPD-OFF
+class Foo {
+ void bar() {
+ int a = 1 >> 2;
+ a += 1;
+ a++;
+ a /= 3e2;
+ float f = -3.1;
+ f *= 2;
+ bool b = ! (f == 2.0 || f >= 1.0 && f <= 2.0)
+ }
+// CPD-ON
+}
\ No newline at end of file
diff --git a/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/specialComments.txt b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/specialComments.txt
new file mode 100644
index 0000000000..e1b70d0ec0
--- /dev/null
+++ b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/specialComments.txt
@@ -0,0 +1,4 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L13
+ [}] 1 2
+EOF
diff --git a/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/strings.cs b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/strings.cs
new file mode 100644
index 0000000000..1d6e607016
--- /dev/null
+++ b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/strings.cs
@@ -0,0 +1,12 @@
+class Foo {
+ void bar() {
+
+ var test = $@"test";
+ var test2 = @$"test";
+
+ String query =
+ @"SELECT foo, bar
+ FROM table
+ WHERE id = 42";
+ }
+}
\ No newline at end of file
diff --git a/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/strings.txt b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/strings.txt
new file mode 100644
index 0000000000..738e3933b7
--- /dev/null
+++ b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/strings.txt
@@ -0,0 +1,40 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [class] 1 6
+ [Foo] 7 10
+ [{] 11 12
+L2
+ [void] 3 7
+ [bar] 8 11
+ [(] 11 12
+ [)] 12 13
+ [{] 14 15
+L4
+ [var] 5 8
+ [test] 9 13
+ [=] 14 15
+ [$@"] 16 19
+ [test] 19 23
+ ["] 23 24
+ [;] 24 25
+L5
+ [var] 5 8
+ [test2] 9 14
+ [=] 15 16
+ [@$"] 17 20
+ [test] 20 24
+ ["] 24 25
+ [;] 25 26
+L7
+ [String] 5 11
+ [query] 12 17
+ [=] 18 19
+L8
+ [@"SELECT foo, bar\n FROM t[ 7 24
+L10
+ [;] 24 25
+L11
+ [}] 3 4
+L12
+ [}] 1 2
+EOF
diff --git a/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/unlexable_string.cs b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/unlexable_string.cs
new file mode 100644
index 0000000000..ce0b72f2bc
--- /dev/null
+++ b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/unlexable_string.cs
@@ -0,0 +1,3 @@
+
+// this literal is not closed
+String s ="aaa \"b\
\ No newline at end of file
diff --git a/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/usingDirectives.cs b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/usingDirectives.cs
new file mode 100644
index 0000000000..c2e193c1d3
--- /dev/null
+++ b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/usingDirectives.cs
@@ -0,0 +1,16 @@
+using System.Text; // ignored
+using System; // ignored
+
+// rest is not ignored
+public class MyClass {
+
+ void foo() {
+ using (Font font1 = new Font("Arial", 10.0f)) {
+ byte charset = font1.GdiCharSet;
+ }
+
+ using var font1 = new Font("Arial", 10.0f);
+ byte charset = font1.GdiCharSet;
+ }
+
+}
diff --git a/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/usingDirectives.txt b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/usingDirectives.txt
new file mode 100644
index 0000000000..69732da21b
--- /dev/null
+++ b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/usingDirectives.txt
@@ -0,0 +1,73 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [using] 1 6
+ [System] 7 13
+ [.] 13 14
+ [Text] 14 18
+ [;] 18 19
+L2
+ [using] 1 6
+ [System] 7 13
+ [;] 13 14
+L5
+ [public] 1 7
+ [class] 8 13
+ [MyClass] 14 21
+ [{] 22 23
+L7
+ [void] 5 9
+ [foo] 10 13
+ [(] 13 14
+ [)] 14 15
+ [{] 16 17
+L8
+ [using] 9 14
+ [(] 15 16
+ [Font] 16 20
+ [font1] 21 26
+ [=] 27 28
+ [new] 29 32
+ [Font] 33 37
+ [(] 37 38
+ ["Arial"] 38 45
+ [,] 45 46
+ [10.0f] 47 52
+ [)] 52 53
+ [)] 53 54
+ [{] 55 56
+L9
+ [byte] 11 15
+ [charset] 16 23
+ [=] 24 25
+ [font1] 26 31
+ [.] 31 32
+ [GdiCharSet] 32 42
+ [;] 42 43
+L10
+ [}] 9 10
+L12
+ [using] 9 14
+ [var] 15 18
+ [font1] 19 24
+ [=] 25 26
+ [new] 27 30
+ [Font] 31 35
+ [(] 35 36
+ ["Arial"] 36 43
+ [,] 43 44
+ [10.0f] 45 50
+ [)] 50 51
+ [;] 51 52
+L13
+ [byte] 9 13
+ [charset] 14 21
+ [=] 22 23
+ [font1] 24 29
+ [.] 29 30
+ [GdiCharSet] 30 40
+ [;] 40 41
+L14
+ [}] 5 6
+L16
+ [}] 1 2
+EOF
diff --git a/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/usingDirectives_ignored.txt b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/usingDirectives_ignored.txt
new file mode 100644
index 0000000000..3f84b0f9f2
--- /dev/null
+++ b/pmd-cs/src/test/resources/net/sourceforge/pmd/lang/cs/cpd/testdata/usingDirectives_ignored.txt
@@ -0,0 +1,63 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L5
+ [public] 1 7
+ [class] 8 13
+ [MyClass] 14 21
+ [{] 22 23
+L7
+ [void] 5 9
+ [foo] 10 13
+ [(] 13 14
+ [)] 14 15
+ [{] 16 17
+L8
+ [using] 9 14
+ [(] 15 16
+ [Font] 16 20
+ [font1] 21 26
+ [=] 27 28
+ [new] 29 32
+ [Font] 33 37
+ [(] 37 38
+ ["Arial"] 38 45
+ [,] 45 46
+ [10.0f] 47 52
+ [)] 52 53
+ [)] 53 54
+ [{] 55 56
+L9
+ [byte] 11 15
+ [charset] 16 23
+ [=] 24 25
+ [font1] 26 31
+ [.] 31 32
+ [GdiCharSet] 32 42
+ [;] 42 43
+L10
+ [}] 9 10
+L12
+ [using] 9 14
+ [var] 15 18
+ [font1] 19 24
+ [=] 25 26
+ [new] 27 30
+ [Font] 31 35
+ [(] 35 36
+ ["Arial"] 36 43
+ [,] 43 44
+ [10.0f] 45 50
+ [)] 50 51
+ [;] 51 52
+L13
+ [byte] 9 13
+ [charset] 14 21
+ [=] 22 23
+ [font1] 24 29
+ [.] 29 30
+ [GdiCharSet] 30 40
+ [;] 40 41
+L14
+ [}] 5 6
+L16
+ [}] 1 2
+EOF
diff --git a/pmd-dart/pom.xml b/pmd-dart/pom.xml
index ab58a56167..50d4cb3d2f 100644
--- a/pmd-dart/pom.xml
+++ b/pmd-dart/pom.xml
@@ -49,10 +49,20 @@
junit
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
net.sourceforge.pmd
pmd-test
test
+
+ net.sourceforge.pmd
+ pmd-lang-test
+ test
+
diff --git a/pmd-dart/src/test/java/net/sourceforge/pmd/cpd/DartTokenizerTest.java b/pmd-dart/src/test/java/net/sourceforge/pmd/cpd/DartTokenizerTest.java
index dc1e125322..26382e6212 100644
--- a/pmd-dart/src/test/java/net/sourceforge/pmd/cpd/DartTokenizerTest.java
+++ b/pmd-dart/src/test/java/net/sourceforge/pmd/cpd/DartTokenizerTest.java
@@ -1,65 +1,85 @@
-/**
+/*
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.cpd;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.Properties;
-import org.apache.commons.io.IOUtils;
-import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import net.sourceforge.pmd.testframework.AbstractTokenizerTest;
+import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
-@RunWith(Parameterized.class)
-public class DartTokenizerTest extends AbstractTokenizerTest {
+public class DartTokenizerTest extends CpdTextComparisonTest {
- private final String filename;
- private final int nExpectedTokens;
-
- public DartTokenizerTest(String filename, int nExpectedTokens) {
- this.filename = filename;
- this.nExpectedTokens = nExpectedTokens;
- }
-
- @Parameterized.Parameters
- public static Collection data() {
- return Arrays.asList(
- new Object[] { "comment.dart", 5 },
- new Object[] { "escape_sequences.dart", 13 },
- new Object[] { "escaped_backslash.dart", 14 },
- new Object[] { "escaped_string.dart", 17 },
- new Object[] { "increment.dart", 185 },
- new Object[] { "imports.dart", 1 },
- new Object[] { "regex.dart", 13 },
- new Object[] { "regex2.dart", 13 },
- new Object[] { "regex3.dart", 13 },
- new Object[] { "string_with_backslashes.dart", 9 },
- new Object[] { "string_multiline.dart", 13 }
- );
- }
-
- @Before
- @Override
- public void buildTokenizer() throws IOException {
- this.tokenizer = new DartTokenizer();
- this.sourceCode = new SourceCode(new SourceCode.StringCodeLoader(this.getSampleCode(), this.filename));
+ public DartTokenizerTest() {
+ super(".dart");
}
@Override
- public String getSampleCode() throws IOException {
- return IOUtils.toString(DartTokenizer.class.getResourceAsStream(this.filename), StandardCharsets.UTF_8);
+ public Tokenizer newTokenizer(Properties properties) {
+ return new DartTokenizer();
+ }
+
+
+ @Test
+ public void testComment() {
+ doTest("comment");
}
@Test
- public void tokenizeTest() throws IOException {
- this.expectedTokenCount = nExpectedTokens;
- super.tokenizeTest();
+ public void testEscapeSequences() {
+ doTest("escape_sequences");
}
+
+ @Test
+ public void testEscapedBackslash() {
+ doTest("escaped_backslash");
+ }
+
+ @Test
+ public void testEscapedString() {
+ doTest("escaped_string");
+ }
+
+
+ @Test
+ public void testIncrement() {
+ doTest("increment");
+ }
+
+
+ @Test
+ public void testImports() {
+ doTest("imports");
+ }
+
+
+
+ @Test
+ public void testRegex() {
+ doTest("regex");
+ }
+
+
+ @Test
+ public void testRegex2() {
+ doTest("regex2");
+ }
+
+ @Test
+ public void testRegex3() {
+ doTest("regex3");
+ }
+
+ @Test
+ public void testStringWithBackslashes() {
+ doTest("string_with_backslashes");
+ }
+
+ @Test
+ public void testMultiline() {
+ doTest("string_multiline");
+ }
+
}
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/comment.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/comment.dart
similarity index 100%
rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/comment.dart
rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/comment.dart
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/comment.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/comment.txt
new file mode 100644
index 0000000000..0ffae05d93
--- /dev/null
+++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/comment.txt
@@ -0,0 +1,7 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L3
+ [var] 1 4
+ [x] 5 6
+ [=] 7 8
+ [0] 9 10
+EOF
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/escape_sequences.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/escape_sequences.dart
similarity index 100%
rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/escape_sequences.dart
rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/escape_sequences.dart
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/escape_sequences.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/escape_sequences.txt
new file mode 100644
index 0000000000..77851f2bc6
--- /dev/null
+++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/escape_sequences.txt
@@ -0,0 +1,17 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [var] 1 4
+ [newline] 5 12
+ [=] 13 14
+ ['\\n'] 15 19
+L2
+ [var] 1 4
+ [dollar] 5 11
+ [=] 12 13
+ ['$'] 14 17
+L3
+ [var] 1 4
+ [escaped_dollar] 5 19
+ [=] 20 21
+ ["\\$"] 22 26
+EOF
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/escaped_backslash.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/escaped_backslash.dart
similarity index 100%
rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/escaped_backslash.dart
rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/escaped_backslash.dart
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/escaped_backslash.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/escaped_backslash.txt
new file mode 100644
index 0000000000..b5b13f53c3
--- /dev/null
+++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/escaped_backslash.txt
@@ -0,0 +1,17 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [var] 1 4
+ [separator] 5 14
+ [=] 15 16
+ ['\\\\'] 17 21
+L2
+ [var] 1 4
+ [separators] 5 15
+ [=] 16 17
+ [const] 18 23
+ [\[] 24 25
+ ['/'] 25 28
+ [,] 28 29
+ ['\\\\'] 30 34
+ [\]] 34 35
+EOF
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/escaped_string.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/escaped_string.dart
similarity index 100%
rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/escaped_string.dart
rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/escaped_string.dart
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/escaped_string.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/escaped_string.txt
new file mode 100644
index 0000000000..4ed1d06c7f
--- /dev/null
+++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/escaped_string.txt
@@ -0,0 +1,22 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [var] 1 4
+ [a] 5 6
+ [=] 7 8
+ ["a"] 9 12
+L2
+ [var] 1 4
+ [b] 5 6
+ [=] 7 8
+ ["b"] 9 12
+L3
+ [var] 1 4
+ [c] 5 6
+ [=] 7 8
+ ["c"] 9 12
+L4
+ [var] 1 4
+ [x] 5 6
+ [=] 7 8
+ ["$a(b: $b, c: \\"$c\\")"] 9 31
+EOF
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/imports.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/imports.dart
similarity index 100%
rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/imports.dart
rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/imports.dart
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/imports.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/imports.txt
new file mode 100644
index 0000000000..49ab402048
--- /dev/null
+++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/imports.txt
@@ -0,0 +1,2 @@
+ [Image] or [Truncated image[ Bcol Ecol
+EOF
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/increment.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/increment.dart
similarity index 100%
rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/increment.dart
rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/increment.dart
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/increment.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/increment.txt
new file mode 100644
index 0000000000..3a9c53e1d3
--- /dev/null
+++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/increment.txt
@@ -0,0 +1,207 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L3
+ [var] 1 4
+ [x] 5 6
+ [=] 7 8
+ [0] 9 10
+L5
+ [void] 1 5
+ [increment1] 6 16
+ [(] 16 17
+ [)] 17 18
+ [{] 19 20
+ [x] 21 22
+ [+=] 23 25
+ [1] 26 27
+ [}] 29 30
+L6
+ [void] 1 5
+ [increment2] 6 16
+ [(] 16 17
+ [)] 17 18
+ [{] 19 20
+ [x] 21 22
+ [+=] 23 25
+ [1] 26 27
+ [}] 29 30
+L7
+ [void] 1 5
+ [increment3] 6 16
+ [(] 16 17
+ [)] 17 18
+ [{] 19 20
+ [x] 21 22
+ [+=] 23 25
+ [1] 26 27
+ [}] 29 30
+L8
+ [void] 1 5
+ [increment4] 6 16
+ [(] 16 17
+ [)] 17 18
+ [{] 19 20
+ [x] 21 22
+ [+=] 23 25
+ [1] 26 27
+ [}] 29 30
+L9
+ [void] 1 5
+ [increment5] 6 16
+ [(] 16 17
+ [)] 17 18
+ [{] 19 20
+ [x] 21 22
+ [+=] 23 25
+ [1] 26 27
+ [}] 29 30
+L10
+ [void] 1 5
+ [increment6] 6 16
+ [(] 16 17
+ [)] 17 18
+ [{] 19 20
+ [x] 21 22
+ [+=] 23 25
+ [1] 26 27
+ [}] 29 30
+L11
+ [void] 1 5
+ [increment7] 6 16
+ [(] 16 17
+ [)] 17 18
+ [{] 19 20
+ [x] 21 22
+ [+=] 23 25
+ [1] 26 27
+ [}] 29 30
+L12
+ [void] 1 5
+ [increment8] 6 16
+ [(] 16 17
+ [)] 17 18
+ [{] 19 20
+ [x] 21 22
+ [+=] 23 25
+ [1] 26 27
+ [}] 29 30
+L13
+ [void] 1 5
+ [increment9] 6 16
+ [(] 16 17
+ [)] 17 18
+ [{] 19 20
+ [x] 21 22
+ [+=] 23 25
+ [1] 26 27
+ [}] 29 30
+L14
+ [void] 1 5
+ [increment10] 6 17
+ [(] 17 18
+ [)] 18 19
+ [{] 20 21
+ [x] 22 23
+ [+=] 24 26
+ [1] 27 28
+ [}] 30 31
+L15
+ [void] 1 5
+ [increment11] 6 17
+ [(] 17 18
+ [)] 18 19
+ [{] 20 21
+ [x] 22 23
+ [+=] 24 26
+ [1] 27 28
+ [}] 30 31
+L16
+ [void] 1 5
+ [increment12] 6 17
+ [(] 17 18
+ [)] 18 19
+ [{] 20 21
+ [x] 22 23
+ [+=] 24 26
+ [1] 27 28
+ [}] 30 31
+L17
+ [void] 1 5
+ [increment13] 6 17
+ [(] 17 18
+ [)] 18 19
+ [{] 20 21
+ [x] 22 23
+ [+=] 24 26
+ [1] 27 28
+ [}] 30 31
+L18
+ [void] 1 5
+ [increment14] 6 17
+ [(] 17 18
+ [)] 18 19
+ [{] 20 21
+ [x] 22 23
+ [+=] 24 26
+ [1] 27 28
+ [}] 30 31
+L19
+ [void] 1 5
+ [increment15] 6 17
+ [(] 17 18
+ [)] 18 19
+ [{] 20 21
+ [x] 22 23
+ [+=] 24 26
+ [1] 27 28
+ [}] 30 31
+L20
+ [void] 1 5
+ [increment16] 6 17
+ [(] 17 18
+ [)] 18 19
+ [{] 20 21
+ [x] 22 23
+ [+=] 24 26
+ [1] 27 28
+ [}] 30 31
+L21
+ [void] 1 5
+ [increment17] 6 17
+ [(] 17 18
+ [)] 18 19
+ [{] 20 21
+ [x] 22 23
+ [+=] 24 26
+ [1] 27 28
+ [}] 30 31
+L22
+ [void] 1 5
+ [increment18] 6 17
+ [(] 17 18
+ [)] 18 19
+ [{] 20 21
+ [x] 22 23
+ [+=] 24 26
+ [1] 27 28
+ [}] 30 31
+L23
+ [void] 1 5
+ [increment19] 6 17
+ [(] 17 18
+ [)] 18 19
+ [{] 20 21
+ [x] 22 23
+ [+=] 24 26
+ [1] 27 28
+ [}] 30 31
+L24
+ [void] 1 5
+ [increment20] 6 17
+ [(] 17 18
+ [)] 18 19
+ [{] 20 21
+ [x] 22 23
+ [+=] 24 26
+ [1] 27 28
+ [}] 30 31
+EOF
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/regex.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/regex.dart
similarity index 100%
rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/regex.dart
rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/regex.dart
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/regex.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/regex.txt
new file mode 100644
index 0000000000..282bbb7bdf
--- /dev/null
+++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/regex.txt
@@ -0,0 +1,17 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [class] 1 6
+ [MyClass] 7 14
+ [{] 15 16
+L2
+ [final] 3 8
+ [regex] 9 14
+ [=] 15 16
+ [new] 17 20
+ [RegExp] 21 27
+ [(] 27 28
+ [r'^--(\[a-zA-Z\\-_0-9\]+)(=(.*))?$[ 28 60
+ [)] 60 61
+L3
+ [}] 1 2
+EOF
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/regex2.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/regex2.dart
similarity index 100%
rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/regex2.dart
rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/regex2.dart
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/regex2.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/regex2.txt
new file mode 100644
index 0000000000..8fe461d9bd
--- /dev/null
+++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/regex2.txt
@@ -0,0 +1,17 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [class] 1 6
+ [MyClass] 7 14
+ [{] 15 16
+L2
+ [final] 3 8
+ [regex] 9 14
+ [=] 15 16
+ [new] 17 20
+ [RegExp] 21 27
+ [(] 27 28
+ [r"(^\[a-zA-Z\]\[-+.a-zA-Z\\d\]*://[ 28 65
+ [)] 65 66
+L3
+ [}] 1 2
+EOF
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/regex3.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/regex3.dart
similarity index 100%
rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/regex3.dart
rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/regex3.dart
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/regex3.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/regex3.txt
new file mode 100644
index 0000000000..cde3cb0f31
--- /dev/null
+++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/regex3.txt
@@ -0,0 +1,17 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [class] 1 6
+ [MyClass] 7 14
+ [{] 15 16
+L2
+ [final] 3 8
+ [regex] 9 14
+ [=] 15 16
+ [new] 17 20
+ [RegExp] 21 27
+ [(] 27 28
+ [r'''\[ \\t\\r\\n"'\\\\/\]'''] 28 49
+ [)] 49 50
+L3
+ [}] 1 2
+EOF
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/string_multiline.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/string_multiline.dart
similarity index 100%
rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/string_multiline.dart
rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/string_multiline.dart
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/string_multiline.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/string_multiline.txt
new file mode 100644
index 0000000000..ee8d2dcc3e
--- /dev/null
+++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/string_multiline.txt
@@ -0,0 +1,18 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [class] 1 6
+ [MyClass] 7 14
+ [{] 15 16
+L2
+ [var] 5 8
+ [s1] 9 11
+ [=] 12 13
+ ['''\nYou can create\nmulti-line st[ 14 4
+L7
+ [var] 5 8
+ [s2] 9 11
+ [=] 12 13
+ ["""This is also a\nmulti-line stri[ 14 22
+L9
+ [}] 1 2
+EOF
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/string_with_backslashes.dart b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/string_with_backslashes.dart
similarity index 100%
rename from pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/string_with_backslashes.dart
rename to pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/string_with_backslashes.dart
diff --git a/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/string_with_backslashes.txt b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/string_with_backslashes.txt
new file mode 100644
index 0000000000..3f23356016
--- /dev/null
+++ b/pmd-dart/src/test/resources/net/sourceforge/pmd/cpd/testdata/string_with_backslashes.txt
@@ -0,0 +1,13 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [class] 1 6
+ [MyClass] 7 14
+ [{] 15 16
+L2
+ [final] 3 8
+ [stringWithBackslashes] 9 30
+ [=] 31 32
+ ["Escaping\\ spaces\\ should work"] 33 64
+L3
+ [}] 1 2
+EOF
diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml
index 2e65034e59..5af6f49541 100644
--- a/pmd-fortran/pom.xml
+++ b/pmd-fortran/pom.xml
@@ -39,10 +39,20 @@
junit
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
net.sourceforge.pmd
pmd-test
test
+
+ net.sourceforge.pmd
+ pmd-lang-test
+ test
+
diff --git a/pmd-fortran/src/test/java/net/sourceforge/pmd/cpd/FortranTokenizerTest.java b/pmd-fortran/src/test/java/net/sourceforge/pmd/cpd/FortranTokenizerTest.java
index 6058ffe1b0..f143b6339a 100644
--- a/pmd-fortran/src/test/java/net/sourceforge/pmd/cpd/FortranTokenizerTest.java
+++ b/pmd-fortran/src/test/java/net/sourceforge/pmd/cpd/FortranTokenizerTest.java
@@ -4,36 +4,34 @@
package net.sourceforge.pmd.cpd;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
+import java.util.Properties;
-import org.apache.commons.io.IOUtils;
-import org.junit.Before;
import org.junit.Test;
-import net.sourceforge.pmd.testframework.AbstractTokenizerTest;
+import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
/**
* @author rpelisse
*
*/
-public class FortranTokenizerTest extends AbstractTokenizerTest {
+public class FortranTokenizerTest extends CpdTextComparisonTest {
- @Before
- @Override
- public void buildTokenizer() throws IOException {
- this.tokenizer = new FortranTokenizer();
- this.sourceCode = new SourceCode(new SourceCode.StringCodeLoader(this.getSampleCode(), "sample.for"));
+ public FortranTokenizerTest() {
+ super(".for");
}
@Override
- public String getSampleCode() throws IOException {
- return IOUtils.toString(FortranTokenizerTest.class.getResourceAsStream("sample.for"), StandardCharsets.UTF_8);
+ protected String getResourcePrefix() {
+ return "../lang/fortran/cpd/testdata";
+ }
+
+ @Override
+ public Tokenizer newTokenizer(Properties properties) {
+ return new FortranTokenizer();
}
@Test
- public void tokenizeTest() throws IOException {
- this.expectedTokenCount = 434;
- super.tokenizeTest();
+ public void testSample() {
+ doTest("sample");
}
}
diff --git a/pmd-fortran/src/test/resources/net/sourceforge/pmd/cpd/sample.for b/pmd-fortran/src/test/resources/net/sourceforge/pmd/lang/fortran/cpd/testdata/sample.for
similarity index 100%
rename from pmd-fortran/src/test/resources/net/sourceforge/pmd/cpd/sample.for
rename to pmd-fortran/src/test/resources/net/sourceforge/pmd/lang/fortran/cpd/testdata/sample.for
diff --git a/pmd-fortran/src/test/resources/net/sourceforge/pmd/lang/fortran/cpd/testdata/sample.txt b/pmd-fortran/src/test/resources/net/sourceforge/pmd/lang/fortran/cpd/testdata/sample.txt
new file mode 100644
index 0000000000..8776a93786
--- /dev/null
+++ b/pmd-fortran/src/test/resources/net/sourceforge/pmd/lang/fortran/cpd/testdata/sample.txt
@@ -0,0 +1,566 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [options/extend_source] 8 29
+L2
+ [program] 8 15
+ [tp3] 16 19
+L3
+ [implicit] 8 16
+ [none] 17 21
+L5
+ [! ce programme va demander la sais[ 1 88
+L6
+ [!parties de la chaine en plusieurs[ 1 93
+L7
+ [!sous programme correspondant.] 1 31
+L9
+ [character*60] 8 20
+ [commande] 21 29
+L10
+ [integer*4] 8 17
+ [ios] 18 21
+L11
+ [1] 8 9
+ [compteur] 18 26
+L12
+ [1] 8 9
+ [sortie] 18 24
+L13
+ [1] 8 9
+ [errone] 18 24
+L14
+ [1] 8 9
+ [conf] 18 22
+L15
+ [1] 8 9
+ [position_espace] 18 33
+L16
+ [1] 8 9
+ [debut_mot] 18 27
+L17
+ [1] 8 9
+ [fin_mot] 18 25
+L18
+ [1] 8 9
+ [nb_mots] 18 25
+L19
+ [1] 8 9
+ [nb_mots_max] 18 29
+L20
+ [1] 8 9
+ [fin_chaine] 18 28
+L21
+ [1] 8 9
+ [trouver_fin] 18 29
+L22
+ [1] 8 9
+ [num_caractere] 18 31
+L23
+ [1] 8 9
+ [action] 18 24
+L24
+ [1] 8 9
+ [premiere_lettre] 18 33
+L25
+ [1] 8 9
+ [derniere_lettre] 18 33
+L26
+ [1] 8 9
+ [intervalle_maj_min] 18 36
+L27
+ [1] 8 9
+ [apres_maj] 18 27
+L28
+ [1] 8 9
+ [taille_colonne] 18 32
+L29
+ [1] 8 9
+ [taille_ligne] 18 30
+L30
+ [1] 8 9
+ [lignes_desc] 18 29
+L32
+ [parameter] 8 17
+ [nb_mots_max] 18 29
+ [=] 30 31
+ [9] 32 33
+ [ !une saisie correcte ne contient [ 35 90
+L33
+ [!elle en contient 9, alors la sais[ 1 60
+L34
+ [parameter] 8 17
+ [errone] 18 24
+ [=] 25 26
+ [1] 27 28
+L35
+ [parameter] 8 17
+ [sortie] 18 24
+ [=] 25 26
+ [-] 27 28
+ [1] 29 30
+L36
+ [parameter] 8 17
+ [action] 18 24
+ [=] 25 26
+ [1] 27 28
+ [ !il s'agit du 1er mot de la chain[ 31 79
+L37
+ [parameter] 8 17
+ [premiere_lettre] 18 33
+ [=] 34 35
+ [1] 36 37
+ [ !correspond a la 1ere lettre d'un[ 40 77
+L38
+ [parameter] 8 17
+ [derniere_lettre] 18 33
+ [=] 34 35
+ [18] 36 38
+ [ !correspond a la derniere lettre [ 41 82
+L39
+ [parameter] 8 17
+ [intervalle_maj_min] 18 36
+ [=] 37 38
+ [32] 39 41
+ [ !nombre separant un meme caracter[ 44 78
+L40
+ [!minuscule de son majuscule] 1 28
+L41
+ [parameter] 8 17
+ [apres_maj] 18 27
+ [=] 28 29
+ [96] 30 32
+ [ !correspond au dernier caractere [ 35 81
+L42
+ [parameter] 8 17
+ [taille_colonne] 18 32
+ [=] 33 34
+ [7] 35 36
+L43
+ [parameter] 8 17
+ [taille_ligne] 18 30
+ [=] 31 32
+ [12] 33 35
+L44
+ [parameter] 8 17
+ [lignes_desc] 18 29
+ [=] 30 31
+ [11] 32 34
+L46
+ [character*19] 9 21
+ [n] 22 23
+ [taille_colonne] 24 38
+ [taille_ligne] 39 51
+L47
+ [character*19] 8 20
+ [mots_commande] 21 34
+ [nb_mots_max] 35 46
+L48
+ [character*60] 8 20
+ [desc] 21 25
+ [lignes_desc] 26 37
+L50
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' '] 19 22
+L51
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' ---------------------------[ 19 80
+L52
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' | bonjour, et bienvenue dan[ 19 80
+L53
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' ---------------------------[ 19 80
+L54
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' '] 19 22
+L55
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' '] 19 22
+L56
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' voici un rappel des fonctions di[ 19 84
+L57
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' '] 19 22
+L58
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' _ task pour creer une tache (e[ 19 84
+L59
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' '] 19 22
+L60
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' _ show pour voir la descriptio[ 19 75
+L61
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' '] 19 22
+L62
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' _ remove pour enlever une tach[ 19 77
+L63
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' '] 19 22
+L64
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' _ clear pour effacer le dashbo[ 19 70
+L65
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' '] 19 22
+L66
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' _ cancel, done, todo pour modi[ 19 100
+L67
+ [write] 8 13
+ [*] 14 15
+ [*] 16 17
+ [' '] 19 22
+L69
+ [! la boucle de sortie pour quitter[ 1 58
+L70
+ [ios] 18 21
+ [.ne.] 22 26
+ [sortie] 27 33
+L72
+ [! initialisons les variables, afin[ 1 96
+L73
+ [position_espace] 16 31
+ [=] 32 33
+ [0] 34 35
+L74
+ [debut_mot] 16 25
+ [=] 26 27
+ [0] 28 29
+L75
+ [fin_mot] 16 23
+ [=] 24 25
+ [0] 26 27
+L76
+ [nb_mots] 16 23
+ [=] 24 25
+ [0] 26 27
+L77
+ [fin_chaine] 16 26
+ [=] 27 28
+ [0] 29 30
+L79
+ [! initialisons aussi le tableau de[ 1 50
+L80
+ [compteur] 19 27
+ [=] 28 29
+ [action] 30 36
+ [nb_mots_max] 38 49
+L81
+ [mots_commande] 24 37
+ [compteur] 39 47
+ [=] 49 50
+ [' '] 51 54
+L84
+ [! appelons le sous prgramme qui ge[ 1 86
+L85
+ [!l'utilisateur le demande] 1 26
+L86
+ [call] 16 20
+ [saisie] 21 27
+ [commande] 28 36
+ [ios] 38 41
+L88
+ [ios] 20 23
+ [.eq.] 24 28
+ [0] 29 30
+ [then] 32 36
+L90
+ [! trouvons la fin de la chaine] 1 31
+L91
+ [fin_chaine] 24 34
+ [=] 35 36
+ [trouver_fin] 37 48
+ [commande] 50 58
+L92
+ [compteur] 24 32
+ [=] 33 34
+ [1] 35 36
+L93
+ [position_espace] 34 49
+ [.lt.] 50 54
+ [fin_chaine] 55 65
+ [.and.] 66 71
+ [nb_mots] 72 79
+ [.lt.] 80 84
+ [nb_mots_max] 85 96
+L94
+ [debut_mot] 32 41
+ [=] 42 43
+ [position_espace] 44 59
+ [+] 60 61
+ [1] 62 63
+L96
+ [! decoupons les mots] 1 21
+L97
+ [position_espace] 32 47
+ [=] 48 49
+ [position_espace] 50 65
+ [+] 66 67
+ [index] 68 73
+ [commande] 75 83
+ [debut_mot:] 85 95
+ [' '] 98 101
+L98
+ [fin_mot] 32 39
+ [=] 40 41
+ [position_espace] 42 57
+ [-] 58 59
+ [1] 60 61
+L100
+ [! ensuite on les enregistre dans m[ 1 47
+L101
+ [mots_commande] 32 45
+ [compteur] 47 55
+ [=] 57 58
+ [commande] 59 67
+ [debut_mot] 69 78
+ [:] 79 80
+ [fin_mot] 81 88
+L103
+ [! comptons les mots] 1 20
+L104
+ [mots_commande] 36 49
+ [compteur] 51 59
+ [.ne.] 61 65
+ [' '] 66 69
+ [then] 71 75
+L105
+ [nb_mots] 40 47
+ [=] 48 49
+ [nb_mots] 50 57
+ [+] 58 59
+ [1] 60 61
+L106
+ [compteur] 40 48
+ [=] 49 50
+ [compteur] 51 59
+ [+] 60 61
+ [1] 62 63
+L110
+ [! le programme ne doit pas tenir c[ 1 82
+L111
+ [!dont est ecrit le mot, il sera mi[ 1 49
+L112
+ [compteur] 27 35
+ [=] 36 37
+ [1] 38 39
+ [nb_mots] 41 48
+L113
+ [num_caractere] 35 48
+ [=] 49 50
+ [premiere_lettre] 51 66
+ [derniere_lettre] 68 83
+L114
+ [ichar] 44 49
+ [mots_commande] 50 63
+ [compteur] 65 73
+ [num_caractere:num_caractere] 75 102
+L115
+ [1] 8 9
+ [.gt.] 10 14
+ [apres_maj] 15 24
+ [then] 26 30
+L116
+ [mots_commande] 48 61
+ [compteur] 63 71
+ [num_caractere:num_caractere] 73 100
+ [=] 102 103
+L117
+ [1] 8 9
+ [char] 10 14
+ [ichar] 15 20
+ [mots_commande] 21 34
+ [compteur] 36 44
+ [num_caractere:num_caractere] 46 73
+ [-] 76 77
+ [intervalle_maj_min] 78 96
+L122
+ [!! affichons les mots (provisoire)] 1 35
+L123
+ [!! do compteur[ 1 48
+L124
+ [!! wri[ 1 83
+L125
+ [!! end do] 1 30
+L126
+ [!!] 1 3
+L127
+ [!! testons si le mot est bien en m[ 1 62
+L128
+ [!! write(*,*) [ 1 80
+L131
+ [! si la commande contient plus de [ 1 68
+L133
+ [nb_mots] 28 35
+ [.eq.] 36 40
+ [nb_mots_max] 41 52
+ [then] 54 58
+L134
+ [write] 32 37
+ [*] 38 39
+ [*] 40 41
+ [' '] 43 46
+L135
+ [write] 32 37
+ [*] 38 39
+ [*] 40 41
+ ['err> trop de mot, veuillez ressai[ 43 81
+L136
+ [else] 24 28
+L138
+ [! maintenant, en fonction du premi[ 1 94
+L139
+ [mots_commande] 36 49
+ [action] 51 57
+ [.eq.] 59 63
+ ['task'] 64 70
+ [then] 72 76
+L140
+ [call] 40 44
+ [tache] 45 50
+ [mots_commande] 51 64
+ [desc] 66 70
+ [n] 72 73
+L141
+ [else] 32 36
+ [mots_commande] 41 54
+ [action] 56 62
+ [.eq.] 64 68
+ ['show'] 69 75
+ [then] 77 81
+L142
+ [! [ 1 82
+L143
+ [call] 40 44
+ [show] 45 49
+ [mots_commande] 50 63
+ [n] 65 66
+L144
+ [else] 32 36
+ [mots_commande] 41 54
+ [action] 56 62
+ [.eq.] 64 68
+ ['remove'] 69 77
+ [then] 79 83
+L145
+ [! [ 1 84
+L146
+ [call] 40 44
+ [remove] 45 51
+ [mots_commande] 52 65
+ [desc] 67 71
+ [n] 73 74
+L147
+ [else] 32 36
+ [mots_commande] 41 54
+ [action] 56 62
+ [.eq.] 64 68
+ ['clear'] 69 76
+ [then] 78 82
+L148
+ [! [ 1 83
+L149
+ [call] 40 44
+ [clear] 45 50
+ [mots_commande] 51 64
+ [n] 66 67
+L150
+ [else] 32 36
+ [mots_commande] 41 54
+ [action] 56 62
+ [.eq.] 64 68
+ ['cancel'] 69 77
+ [then] 79 83
+L151
+ [! [ 1 84
+L152
+ [call] 40 44
+ [cancel] 45 51
+ [mots_commande] 52 65
+ [n] 67 68
+L153
+ [else] 32 36
+ [mots_commande] 41 54
+ [action] 56 62
+ [.eq.] 64 68
+ ['done'] 69 75
+ [then] 77 81
+L154
+ [! [ 1 82
+L155
+ [call] 40 44
+ [done] 45 49
+ [mots_commande] 50 63
+ [n] 65 66
+L156
+ [else] 32 36
+ [mots_commande] 41 54
+ [action] 56 62
+ [.eq.] 64 68
+ ['todo'] 69 75
+ [then] 77 81
+L157
+ [! [ 1 82
+L158
+ [call] 40 44
+ [todo] 45 49
+ [mots_commande] 50 63
+ [n] 65 66
+L159
+ [else] 32 36
+L160
+ [write] 40 45
+ [*] 46 47
+ [*] 48 49
+ [' '] 51 54
+L161
+ [write] 40 45
+ [*] 46 47
+ [*] 48 49
+ ['l'] 51 54
+ ['action suivante n'] 54 73
+ ['a pas ete'] 73 84
+L162
+ [1] 8 9
+ [' comprise: '] 10 23
+ [mots_commande] 25 38
+ [action] 40 46
+EOF
diff --git a/pmd-go/pom.xml b/pmd-go/pom.xml
index d5fa12f849..3bc42f8f16 100644
--- a/pmd-go/pom.xml
+++ b/pmd-go/pom.xml
@@ -43,10 +43,20 @@
junit
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
net.sourceforge.pmd
pmd-test
test
+
+ net.sourceforge.pmd
+ pmd-lang-test
+ test
+
diff --git a/pmd-go/src/test/java/net/sourceforge/pmd/cpd/EdgeCasesTokenizerTest.java b/pmd-go/src/test/java/net/sourceforge/pmd/cpd/EdgeCasesTokenizerTest.java
deleted file mode 100644
index 71b085a34e..0000000000
--- a/pmd-go/src/test/java/net/sourceforge/pmd/cpd/EdgeCasesTokenizerTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.cpd;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-
-public class EdgeCasesTokenizerTest {
-
- private String getSampleCode(final String filename) throws IOException {
- return IOUtils.toString(GoTokenizer.class.getResourceAsStream(filename), StandardCharsets.UTF_8);
- }
-
- @Test
- public void testEscapedBackSlash() throws IOException {
- // See https://github.com/pmd/pmd/issues/1751
- final String filename = "issue1751.go";
- final GoTokenizer tokenizer = new GoTokenizer();
- final SourceCode sourceCode = new SourceCode(new SourceCode.StringCodeLoader(getSampleCode(filename), filename));
-
- final Tokens tokens = new Tokens();
- tokenizer.tokenize(sourceCode, tokens); // it should simply not fail
- }
-}
diff --git a/pmd-go/src/test/java/net/sourceforge/pmd/cpd/GoCPDTokenizerTest.java b/pmd-go/src/test/java/net/sourceforge/pmd/cpd/GoCPDTokenizerTest.java
deleted file mode 100644
index e46866d012..0000000000
--- a/pmd-go/src/test/java/net/sourceforge/pmd/cpd/GoCPDTokenizerTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.cpd;
-
-import java.io.IOException;
-
-import org.apache.commons.io.IOUtils;
-import org.junit.Before;
-import org.junit.Test;
-
-import net.sourceforge.pmd.testframework.AbstractTokenizerTest;
-
-public class GoCPDTokenizerTest extends AbstractTokenizerTest {
-
- private static final String FILENAME = "hello.go";
-
- @Before
- @Override
- public void buildTokenizer() throws IOException {
- this.tokenizer = new GoTokenizer();
- this.sourceCode = new SourceCode(new SourceCode.StringCodeLoader(this.getSampleCode(), FILENAME));
- }
-
- @Override
- public String getSampleCode() throws IOException {
- return IOUtils.toString(GoTokenizer.class.getResourceAsStream(FILENAME));
- }
-
- @Test
- public void tokenizeTest() throws IOException {
- this.expectedTokenCount = 23;
- super.tokenizeTest();
- }
-}
diff --git a/pmd-go/src/test/java/net/sourceforge/pmd/cpd/GoTokenizerTest.java b/pmd-go/src/test/java/net/sourceforge/pmd/cpd/GoTokenizerTest.java
index 7e34d93981..309867e995 100644
--- a/pmd-go/src/test/java/net/sourceforge/pmd/cpd/GoTokenizerTest.java
+++ b/pmd-go/src/test/java/net/sourceforge/pmd/cpd/GoTokenizerTest.java
@@ -4,33 +4,40 @@
package net.sourceforge.pmd.cpd;
-import java.io.IOException;
+import java.util.Properties;
-import org.apache.commons.io.IOUtils;
-import org.junit.Before;
import org.junit.Test;
-import net.sourceforge.pmd.testframework.AbstractTokenizerTest;
+import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
-public class GoTokenizerTest extends AbstractTokenizerTest {
+public class GoTokenizerTest extends CpdTextComparisonTest {
- private static final String FILENAME = "btrfs.go";
-
- @Before
- @Override
- public void buildTokenizer() throws IOException {
- this.tokenizer = new GoTokenizer();
- this.sourceCode = new SourceCode(new SourceCode.StringCodeLoader(this.getSampleCode(), FILENAME));
+ public GoTokenizerTest() {
+ super(".go");
}
@Override
- public String getSampleCode() throws IOException {
- return IOUtils.toString(GoTokenizer.class.getResourceAsStream(FILENAME));
+ public Tokenizer newTokenizer(Properties properties) {
+ return new GoTokenizer();
+ }
+
+ @Override
+ protected String getResourcePrefix() {
+ return "../lang/go/cpd/testdata";
}
@Test
- public void tokenizeTest() throws IOException {
- this.expectedTokenCount = 3517;
- super.tokenizeTest();
+ public void simpleTest() {
+ doTest("hello");
+ }
+
+ @Test
+ public void bigFileTest() {
+ doTest("btrfs");
+ }
+
+ @Test
+ public void testIssue1751() {
+ doTest("issue-1751");
}
}
diff --git a/pmd-go/src/test/resources/net/sourceforge/pmd/cpd/btrfs.go b/pmd-go/src/test/resources/net/sourceforge/pmd/lang/go/cpd/testdata/btrfs.go
similarity index 100%
rename from pmd-go/src/test/resources/net/sourceforge/pmd/cpd/btrfs.go
rename to pmd-go/src/test/resources/net/sourceforge/pmd/lang/go/cpd/testdata/btrfs.go
diff --git a/pmd-go/src/test/resources/net/sourceforge/pmd/lang/go/cpd/testdata/btrfs.txt b/pmd-go/src/test/resources/net/sourceforge/pmd/lang/go/cpd/testdata/btrfs.txt
new file mode 100644
index 0000000000..2eca870e38
--- /dev/null
+++ b/pmd-go/src/test/resources/net/sourceforge/pmd/lang/go/cpd/testdata/btrfs.txt
@@ -0,0 +1,4047 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L9
+ [package] 1 8
+ [btrfs] 9 14
+L21
+ [import] 1 7
+ ["C"] 8 11
+L23
+ [import] 1 7
+ [(] 8 9
+L24
+ ["fmt"] 2 7
+L25
+ ["io/ioutil"] 2 13
+L26
+ ["math"] 2 8
+L27
+ ["os"] 2 6
+L28
+ ["path"] 2 8
+L29
+ ["path/filepath"] 2 17
+L30
+ ["strconv"] 2 11
+L31
+ ["strings"] 2 11
+L32
+ ["sync"] 2 8
+L33
+ ["unsafe"] 2 10
+L35
+ ["github.com/docker/docker/daemon/g[ 2 47
+L36
+ ["github.com/docker/docker/pkg/cont[ 2 44
+L37
+ ["github.com/docker/docker/pkg/idto[ 2 40
+L38
+ ["github.com/docker/docker/pkg/moun[ 2 38
+L39
+ ["github.com/docker/docker/pkg/pars[ 2 40
+L40
+ ["github.com/docker/docker/pkg/syst[ 2 39
+L41
+ ["github.com/docker/go-units"] 2 30
+L42
+ ["github.com/opencontainers/selinux[ 2 54
+L43
+ ["github.com/pkg/errors"] 2 25
+L44
+ ["github.com/sirupsen/logrus"] 2 30
+L45
+ ["golang.org/x/sys/unix"] 2 25
+L46
+ [)] 1 2
+L48
+ [func] 1 5
+ [init] 6 10
+ [(] 10 11
+ [)] 11 12
+ [{] 13 14
+L49
+ [graphdriver] 2 13
+ [.] 13 14
+ [Register] 14 22
+ [(] 22 23
+ ["btrfs"] 23 30
+ [,] 30 31
+ [Init] 32 36
+ [)] 36 37
+L50
+ [}] 1 2
+L52
+ [type] 1 5
+ [btrfsOptions] 6 18
+ [struct] 19 25
+ [{] 26 27
+L53
+ [minSpace] 2 10
+ [uint64] 11 17
+L54
+ [size] 2 6
+ [uint64] 11 17
+L55
+ [}] 1 2
+L59
+ [func] 1 5
+ [Init] 6 10
+ [(] 10 11
+ [home] 11 15
+ [string] 16 22
+ [,] 22 23
+ [options] 24 31
+ [\[] 32 33
+ [\]] 33 34
+ [string] 34 40
+ [,] 40 41
+ [uidMaps] 42 49
+ [,] 49 50
+ [gidMaps] 51 58
+ [\[] 59 60
+ [\]] 60 61
+ [idtools] 61 68
+ [.] 68 69
+ [IDMap] 69 74
+ [)] 74 75
+ [(] 76 77
+ [graphdriver] 77 88
+ [.] 88 89
+ [Driver] 89 95
+ [,] 95 96
+ [error] 97 102
+ [)] 102 103
+ [{] 104 105
+L65
+ [testdir] 2 9
+ [:=] 10 12
+ [home] 13 17
+L66
+ [if] 2 4
+ [_] 5 6
+ [,] 6 7
+ [err] 8 11
+ [:=] 12 14
+ [os] 15 17
+ [.] 17 18
+ [Stat] 18 22
+ [(] 22 23
+ [testdir] 23 30
+ [)] 30 31
+ [;] 31 32
+ [os] 33 35
+ [.] 35 36
+ [IsNotExist] 36 46
+ [(] 46 47
+ [err] 47 50
+ [)] 50 51
+ [{] 52 53
+L67
+ [testdir] 3 10
+ [=] 11 12
+ [filepath] 13 21
+ [.] 21 22
+ [Dir] 22 25
+ [(] 25 26
+ [testdir] 26 33
+ [)] 33 34
+L68
+ [}] 2 3
+L70
+ [fsMagic] 2 9
+ [,] 9 10
+ [err] 11 14
+ [:=] 15 17
+ [graphdriver] 18 29
+ [.] 29 30
+ [GetFSMagic] 30 40
+ [(] 40 41
+ [testdir] 41 48
+ [)] 48 49
+L71
+ [if] 2 4
+ [err] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L72
+ [return] 3 9
+ [nil] 10 13
+ [,] 13 14
+ [err] 15 18
+L73
+ [}] 2 3
+L75
+ [if] 2 4
+ [fsMagic] 5 12
+ [!=] 13 15
+ [graphdriver] 16 27
+ [.] 27 28
+ [FsMagicBtrfs] 28 40
+ [{] 41 42
+L76
+ [return] 3 9
+ [nil] 10 13
+ [,] 13 14
+ [graphdriver] 15 26
+ [.] 26 27
+ [ErrPrerequisites] 27 43
+L77
+ [}] 2 3
+L79
+ [rootUID] 2 9
+ [,] 9 10
+ [rootGID] 11 18
+ [,] 18 19
+ [err] 20 23
+ [:=] 24 26
+ [idtools] 27 34
+ [.] 34 35
+ [GetRootUIDGID] 35 48
+ [(] 48 49
+ [uidMaps] 49 56
+ [,] 56 57
+ [gidMaps] 58 65
+ [)] 65 66
+L80
+ [if] 2 4
+ [err] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L81
+ [return] 3 9
+ [nil] 10 13
+ [,] 13 14
+ [err] 15 18
+L82
+ [}] 2 3
+L83
+ [if] 2 4
+ [err] 5 8
+ [:=] 9 11
+ [idtools] 12 19
+ [.] 19 20
+ [MkdirAllAndChown] 20 36
+ [(] 36 37
+ [home] 37 41
+ [,] 41 42
+ [0700] 43 47
+ [,] 47 48
+ [idtools] 49 56
+ [.] 56 57
+ [Identity] 57 65
+ [{] 65 66
+ [UID] 66 69
+ [:] 69 70
+ [rootUID] 71 78
+ [,] 78 79
+ [GID] 80 83
+ [:] 83 84
+ [rootGID] 85 92
+ [}] 92 93
+ [)] 93 94
+ [;] 94 95
+ [err] 96 99
+ [!=] 100 102
+ [nil] 103 106
+ [{] 107 108
+L84
+ [return] 3 9
+ [nil] 10 13
+ [,] 13 14
+ [err] 15 18
+L85
+ [}] 2 3
+L87
+ [opt] 2 5
+ [,] 5 6
+ [userDiskQuota] 7 20
+ [,] 20 21
+ [err] 22 25
+ [:=] 26 28
+ [parseOptions] 29 41
+ [(] 41 42
+ [options] 42 49
+ [)] 49 50
+L88
+ [if] 2 4
+ [err] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L89
+ [return] 3 9
+ [nil] 10 13
+ [,] 13 14
+ [err] 15 18
+L90
+ [}] 2 3
+L96
+ [err] 2 5
+ [=] 6 7
+ [mount] 8 13
+ [.] 13 14
+ [MakeMount] 14 23
+ [(] 23 24
+ [home] 24 28
+ [)] 28 29
+L97
+ [if] 2 4
+ [err] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L98
+ [return] 3 9
+ [nil] 10 13
+ [,] 13 14
+ [errors] 15 21
+ [.] 21 22
+ [Wrapf] 22 27
+ [(] 27 28
+ [err] 28 31
+ [,] 31 32
+ ["failed to make %s a mount"] 33 60
+ [,] 60 61
+ [home] 62 66
+ [)] 66 67
+L99
+ [}] 2 3
+L101
+ [driver] 2 8
+ [:=] 9 11
+ [&] 12 13
+ [Driver] 13 19
+ [{] 19 20
+L102
+ [home] 3 7
+ [:] 7 8
+ [home] 12 16
+ [,] 16 17
+L103
+ [uidMaps] 3 10
+ [:] 10 11
+ [uidMaps] 12 19
+ [,] 19 20
+L104
+ [gidMaps] 3 10
+ [:] 10 11
+ [gidMaps] 12 19
+ [,] 19 20
+L105
+ [options] 3 10
+ [:] 10 11
+ [opt] 12 15
+ [,] 15 16
+L106
+ [}] 2 3
+L108
+ [if] 2 4
+ [userDiskQuota] 5 18
+ [{] 19 20
+L109
+ [if] 3 5
+ [err] 6 9
+ [:=] 10 12
+ [driver] 13 19
+ [.] 19 20
+ [subvolEnableQuota] 20 37
+ [(] 37 38
+ [)] 38 39
+ [;] 39 40
+ [err] 41 44
+ [!=] 45 47
+ [nil] 48 51
+ [{] 52 53
+L110
+ [return] 4 10
+ [nil] 11 14
+ [,] 14 15
+ [err] 16 19
+L111
+ [}] 3 4
+L112
+ [}] 2 3
+L114
+ [return] 2 8
+ [graphdriver] 9 20
+ [.] 20 21
+ [NewNaiveDiffDriver] 21 39
+ [(] 39 40
+ [driver] 40 46
+ [,] 46 47
+ [uidMaps] 48 55
+ [,] 55 56
+ [gidMaps] 57 64
+ [)] 64 65
+ [,] 65 66
+ [nil] 67 70
+L115
+ [}] 1 2
+L117
+ [func] 1 5
+ [parseOptions] 6 18
+ [(] 18 19
+ [opt] 19 22
+ [\[] 23 24
+ [\]] 24 25
+ [string] 25 31
+ [)] 31 32
+ [(] 33 34
+ [btrfsOptions] 34 46
+ [,] 46 47
+ [bool] 48 52
+ [,] 52 53
+ [error] 54 59
+ [)] 59 60
+ [{] 61 62
+L118
+ [var] 2 5
+ [options] 6 13
+ [btrfsOptions] 14 26
+L119
+ [userDiskQuota] 2 15
+ [:=] 16 18
+ [false] 19 24
+L120
+ [for] 2 5
+ [_] 6 7
+ [,] 7 8
+ [option] 9 15
+ [:=] 16 18
+ [range] 19 24
+ [opt] 25 28
+ [{] 29 30
+L121
+ [key] 3 6
+ [,] 6 7
+ [val] 8 11
+ [,] 11 12
+ [err] 13 16
+ [:=] 17 19
+ [parsers] 20 27
+ [.] 27 28
+ [ParseKeyValueOpt] 28 44
+ [(] 44 45
+ [option] 45 51
+ [)] 51 52
+L122
+ [if] 3 5
+ [err] 6 9
+ [!=] 10 12
+ [nil] 13 16
+ [{] 17 18
+L123
+ [return] 4 10
+ [options] 11 18
+ [,] 18 19
+ [userDiskQuota] 20 33
+ [,] 33 34
+ [err] 35 38
+L124
+ [}] 3 4
+L125
+ [key] 3 6
+ [=] 7 8
+ [strings] 9 16
+ [.] 16 17
+ [ToLower] 17 24
+ [(] 24 25
+ [key] 25 28
+ [)] 28 29
+L126
+ [switch] 3 9
+ [key] 10 13
+ [{] 14 15
+L127
+ [case] 3 7
+ ["btrfs.min_space"] 8 25
+ [:] 25 26
+L128
+ [minSpace] 4 12
+ [,] 12 13
+ [err] 14 17
+ [:=] 18 20
+ [units] 21 26
+ [.] 26 27
+ [RAMInBytes] 27 37
+ [(] 37 38
+ [val] 38 41
+ [)] 41 42
+L129
+ [if] 4 6
+ [err] 7 10
+ [!=] 11 13
+ [nil] 14 17
+ [{] 18 19
+L130
+ [return] 5 11
+ [options] 12 19
+ [,] 19 20
+ [userDiskQuota] 21 34
+ [,] 34 35
+ [err] 36 39
+L131
+ [}] 4 5
+L132
+ [userDiskQuota] 4 17
+ [=] 18 19
+ [true] 20 24
+L133
+ [options] 4 11
+ [.] 11 12
+ [minSpace] 12 20
+ [=] 21 22
+ [uint64] 23 29
+ [(] 29 30
+ [minSpace] 30 38
+ [)] 38 39
+L134
+ [default] 3 10
+ [:] 10 11
+L135
+ [return] 4 10
+ [options] 11 18
+ [,] 18 19
+ [userDiskQuota] 20 33
+ [,] 33 34
+ [fmt] 35 38
+ [.] 38 39
+ [Errorf] 39 45
+ [(] 45 46
+ ["Unknown option %s"] 46 65
+ [,] 65 66
+ [key] 67 70
+ [)] 70 71
+L136
+ [}] 3 4
+L137
+ [}] 2 3
+L138
+ [return] 2 8
+ [options] 9 16
+ [,] 16 17
+ [userDiskQuota] 18 31
+ [,] 31 32
+ [nil] 33 36
+L139
+ [}] 1 2
+L142
+ [type] 1 5
+ [Driver] 6 12
+ [struct] 13 19
+ [{] 20 21
+L144
+ [home] 2 6
+ [string] 15 21
+L145
+ [uidMaps] 2 9
+ [\[] 15 16
+ [\]] 16 17
+ [idtools] 17 24
+ [.] 24 25
+ [IDMap] 25 30
+L146
+ [gidMaps] 2 9
+ [\[] 15 16
+ [\]] 16 17
+ [idtools] 17 24
+ [.] 24 25
+ [IDMap] 25 30
+L147
+ [options] 2 9
+ [btrfsOptions] 15 27
+L148
+ [quotaEnabled] 2 14
+ [bool] 15 19
+L149
+ [once] 2 6
+ [sync] 15 19
+ [.] 19 20
+ [Once] 20 24
+L150
+ [}] 1 2
+L153
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [String] 18 24
+ [(] 24 25
+ [)] 25 26
+ [string] 27 33
+ [{] 34 35
+L154
+ [return] 2 8
+ ["btrfs"] 9 16
+L155
+ [}] 1 2
+L160
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [Status] 18 24
+ [(] 24 25
+ [)] 25 26
+ [\[] 27 28
+ [\]] 28 29
+ [\[] 29 30
+ [2] 30 31
+ [\]] 31 32
+ [string] 32 38
+ [{] 39 40
+L161
+ [status] 2 8
+ [:=] 9 11
+ [\[] 12 13
+ [\]] 13 14
+ [\[] 14 15
+ [2] 15 16
+ [\]] 16 17
+ [string] 17 23
+ [{] 23 24
+ [}] 24 25
+L162
+ [if] 2 4
+ [bv] 5 7
+ [:=] 8 10
+ [btrfsBuildVersion] 11 28
+ [(] 28 29
+ [)] 29 30
+ [;] 30 31
+ [bv] 32 34
+ [!=] 35 37
+ ["-"] 38 41
+ [{] 42 43
+L163
+ [status] 3 9
+ [=] 10 11
+ [append] 12 18
+ [(] 18 19
+ [status] 19 25
+ [,] 25 26
+ [\[] 27 28
+ [2] 28 29
+ [\]] 29 30
+ [string] 30 36
+ [{] 36 37
+ ["Build Version"] 37 52
+ [,] 52 53
+ [bv] 54 56
+ [}] 56 57
+ [)] 57 58
+L164
+ [}] 2 3
+L165
+ [if] 2 4
+ [lv] 5 7
+ [:=] 8 10
+ [btrfsLibVersion] 11 26
+ [(] 26 27
+ [)] 27 28
+ [;] 28 29
+ [lv] 30 32
+ [!=] 33 35
+ [-] 36 37
+ [1] 37 38
+ [{] 39 40
+L166
+ [status] 3 9
+ [=] 10 11
+ [append] 12 18
+ [(] 18 19
+ [status] 19 25
+ [,] 25 26
+ [\[] 27 28
+ [2] 28 29
+ [\]] 29 30
+ [string] 30 36
+ [{] 36 37
+ ["Library Version"] 37 54
+ [,] 54 55
+ [fmt] 56 59
+ [.] 59 60
+ [Sprintf] 60 67
+ [(] 67 68
+ ["%d"] 68 72
+ [,] 72 73
+ [lv] 74 76
+ [)] 76 77
+ [}] 77 78
+ [)] 78 79
+L167
+ [}] 2 3
+L168
+ [return] 2 8
+ [status] 9 15
+L169
+ [}] 1 2
+L172
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [GetMetadata] 18 29
+ [(] 29 30
+ [id] 30 32
+ [string] 33 39
+ [)] 39 40
+ [(] 41 42
+ [map] 42 45
+ [\[] 45 46
+ [string] 46 52
+ [\]] 52 53
+ [string] 53 59
+ [,] 59 60
+ [error] 61 66
+ [)] 66 67
+ [{] 68 69
+L173
+ [return] 2 8
+ [nil] 9 12
+ [,] 12 13
+ [nil] 14 17
+L174
+ [}] 1 2
+L177
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [Cleanup] 18 25
+ [(] 25 26
+ [)] 26 27
+ [error] 28 33
+ [{] 34 35
+L178
+ [err] 2 5
+ [:=] 6 8
+ [d] 9 10
+ [.] 10 11
+ [subvolDisableQuota] 11 29
+ [(] 29 30
+ [)] 30 31
+L179
+ [umountErr] 2 11
+ [:=] 12 14
+ [mount] 15 20
+ [.] 20 21
+ [Unmount] 21 28
+ [(] 28 29
+ [d] 29 30
+ [.] 30 31
+ [home] 31 35
+ [)] 35 36
+L182
+ [if] 2 4
+ [err] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L183
+ [return] 3 9
+ [err] 10 13
+L184
+ [}] 2 3
+L186
+ [if] 2 4
+ [umountErr] 5 14
+ [!=] 15 17
+ [nil] 18 21
+ [{] 22 23
+L187
+ [return] 3 9
+ [errors] 10 16
+ [.] 16 17
+ [Wrapf] 17 22
+ [(] 22 23
+ [umountErr] 23 32
+ [,] 32 33
+ ["error unmounting %s"] 34 55
+ [,] 55 56
+ [d] 57 58
+ [.] 58 59
+ [home] 59 63
+ [)] 63 64
+L188
+ [}] 2 3
+L190
+ [return] 2 8
+ [nil] 9 12
+L191
+ [}] 1 2
+L193
+ [func] 1 5
+ [free] 6 10
+ [(] 10 11
+ [p] 11 12
+ [*] 13 14
+ [C] 14 15
+ [.] 15 16
+ [char] 16 20
+ [)] 20 21
+ [{] 22 23
+L194
+ [C] 2 3
+ [.] 3 4
+ [free] 4 8
+ [(] 8 9
+ [unsafe] 9 15
+ [.] 15 16
+ [Pointer] 16 23
+ [(] 23 24
+ [p] 24 25
+ [)] 25 26
+ [)] 26 27
+L195
+ [}] 1 2
+L197
+ [func] 1 5
+ [openDir] 6 13
+ [(] 13 14
+ [path] 14 18
+ [string] 19 25
+ [)] 25 26
+ [(] 27 28
+ [*] 28 29
+ [C] 29 30
+ [.] 30 31
+ [DIR] 31 34
+ [,] 34 35
+ [error] 36 41
+ [)] 41 42
+ [{] 43 44
+L198
+ [Cpath] 2 7
+ [:=] 8 10
+ [C] 11 12
+ [.] 12 13
+ [CString] 13 20
+ [(] 20 21
+ [path] 21 25
+ [)] 25 26
+L199
+ [defer] 2 7
+ [free] 8 12
+ [(] 12 13
+ [Cpath] 13 18
+ [)] 18 19
+L201
+ [dir] 2 5
+ [:=] 6 8
+ [C] 9 10
+ [.] 10 11
+ [opendir] 11 18
+ [(] 18 19
+ [Cpath] 19 24
+ [)] 24 25
+L202
+ [if] 2 4
+ [dir] 5 8
+ [==] 9 11
+ [nil] 12 15
+ [{] 16 17
+L203
+ [return] 3 9
+ [nil] 10 13
+ [,] 13 14
+ [fmt] 15 18
+ [.] 18 19
+ [Errorf] 19 25
+ [(] 25 26
+ ["Can't open dir"] 26 42
+ [)] 42 43
+L204
+ [}] 2 3
+L205
+ [return] 2 8
+ [dir] 9 12
+ [,] 12 13
+ [nil] 14 17
+L206
+ [}] 1 2
+L208
+ [func] 1 5
+ [closeDir] 6 14
+ [(] 14 15
+ [dir] 15 18
+ [*] 19 20
+ [C] 20 21
+ [.] 21 22
+ [DIR] 22 25
+ [)] 25 26
+ [{] 27 28
+L209
+ [if] 2 4
+ [dir] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L210
+ [C] 3 4
+ [.] 4 5
+ [closedir] 5 13
+ [(] 13 14
+ [dir] 14 17
+ [)] 17 18
+L211
+ [}] 2 3
+L212
+ [}] 1 2
+L214
+ [func] 1 5
+ [getDirFd] 6 14
+ [(] 14 15
+ [dir] 15 18
+ [*] 19 20
+ [C] 20 21
+ [.] 21 22
+ [DIR] 22 25
+ [)] 25 26
+ [uintptr] 27 34
+ [{] 35 36
+L215
+ [return] 2 8
+ [uintptr] 9 16
+ [(] 16 17
+ [C] 17 18
+ [.] 18 19
+ [dirfd] 19 24
+ [(] 24 25
+ [dir] 25 28
+ [)] 28 29
+ [)] 29 30
+L216
+ [}] 1 2
+L218
+ [func] 1 5
+ [subvolCreate] 6 18
+ [(] 18 19
+ [path] 19 23
+ [,] 23 24
+ [name] 25 29
+ [string] 30 36
+ [)] 36 37
+ [error] 38 43
+ [{] 44 45
+L219
+ [dir] 2 5
+ [,] 5 6
+ [err] 7 10
+ [:=] 11 13
+ [openDir] 14 21
+ [(] 21 22
+ [path] 22 26
+ [)] 26 27
+L220
+ [if] 2 4
+ [err] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L221
+ [return] 3 9
+ [err] 10 13
+L222
+ [}] 2 3
+L223
+ [defer] 2 7
+ [closeDir] 8 16
+ [(] 16 17
+ [dir] 17 20
+ [)] 20 21
+L225
+ [var] 2 5
+ [args] 6 10
+ [C] 11 12
+ [.] 12 13
+ [struct_btrfs_ioctl_vol_args] 13 40
+L226
+ [for] 2 5
+ [i] 6 7
+ [,] 7 8
+ [c] 9 10
+ [:=] 11 13
+ [range] 14 19
+ [\[] 20 21
+ [\]] 21 22
+ [byte] 22 26
+ [(] 26 27
+ [name] 27 31
+ [)] 31 32
+ [{] 33 34
+L227
+ [args] 3 7
+ [.] 7 8
+ [name] 8 12
+ [\[] 12 13
+ [i] 13 14
+ [\]] 14 15
+ [=] 16 17
+ [C] 18 19
+ [.] 19 20
+ [char] 20 24
+ [(] 24 25
+ [c] 25 26
+ [)] 26 27
+L228
+ [}] 2 3
+L230
+ [_] 2 3
+ [,] 3 4
+ [_] 5 6
+ [,] 6 7
+ [errno] 8 13
+ [:=] 14 16
+ [unix] 17 21
+ [.] 21 22
+ [Syscall] 22 29
+ [(] 29 30
+ [unix] 30 34
+ [.] 34 35
+ [SYS_IOCTL] 35 44
+ [,] 44 45
+ [getDirFd] 46 54
+ [(] 54 55
+ [dir] 55 58
+ [)] 58 59
+ [,] 59 60
+ [C] 61 62
+ [.] 62 63
+ [BTRFS_IOC_SUBVOL_CREATE] 63 86
+ [,] 86 87
+L231
+ [uintptr] 3 10
+ [(] 10 11
+ [unsafe] 11 17
+ [.] 17 18
+ [Pointer] 18 25
+ [(] 25 26
+ [&] 26 27
+ [args] 27 31
+ [)] 31 32
+ [)] 32 33
+ [)] 33 34
+L232
+ [if] 2 4
+ [errno] 5 10
+ [!=] 11 13
+ [0] 14 15
+ [{] 16 17
+L233
+ [return] 3 9
+ [fmt] 10 13
+ [.] 13 14
+ [Errorf] 14 20
+ [(] 20 21
+ ["Failed to create btrfs subvolume:[ 21 59
+ [,] 59 60
+ [errno] 61 66
+ [.] 66 67
+ [Error] 67 72
+ [(] 72 73
+ [)] 73 74
+ [)] 74 75
+L234
+ [}] 2 3
+L235
+ [return] 2 8
+ [nil] 9 12
+L236
+ [}] 1 2
+L238
+ [func] 1 5
+ [subvolSnapshot] 6 20
+ [(] 20 21
+ [src] 21 24
+ [,] 24 25
+ [dest] 26 30
+ [,] 30 31
+ [name] 32 36
+ [string] 37 43
+ [)] 43 44
+ [error] 45 50
+ [{] 51 52
+L239
+ [srcDir] 2 8
+ [,] 8 9
+ [err] 10 13
+ [:=] 14 16
+ [openDir] 17 24
+ [(] 24 25
+ [src] 25 28
+ [)] 28 29
+L240
+ [if] 2 4
+ [err] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L241
+ [return] 3 9
+ [err] 10 13
+L242
+ [}] 2 3
+L243
+ [defer] 2 7
+ [closeDir] 8 16
+ [(] 16 17
+ [srcDir] 17 23
+ [)] 23 24
+L245
+ [destDir] 2 9
+ [,] 9 10
+ [err] 11 14
+ [:=] 15 17
+ [openDir] 18 25
+ [(] 25 26
+ [dest] 26 30
+ [)] 30 31
+L246
+ [if] 2 4
+ [err] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L247
+ [return] 3 9
+ [err] 10 13
+L248
+ [}] 2 3
+L249
+ [defer] 2 7
+ [closeDir] 8 16
+ [(] 16 17
+ [destDir] 17 24
+ [)] 24 25
+L251
+ [var] 2 5
+ [args] 6 10
+ [C] 11 12
+ [.] 12 13
+ [struct_btrfs_ioctl_vol_args_v2] 13 43
+L252
+ [args] 2 6
+ [.] 6 7
+ [fd] 7 9
+ [=] 10 11
+ [C] 12 13
+ [.] 13 14
+ [__s64] 14 19
+ [(] 19 20
+ [getDirFd] 20 28
+ [(] 28 29
+ [srcDir] 29 35
+ [)] 35 36
+ [)] 36 37
+L254
+ [var] 2 5
+ [cs] 6 8
+ [=] 9 10
+ [C] 11 12
+ [.] 12 13
+ [CString] 13 20
+ [(] 20 21
+ [name] 21 25
+ [)] 25 26
+L255
+ [C] 2 3
+ [.] 3 4
+ [set_name_btrfs_ioctl_vol_args_v2] 4 36
+ [(] 36 37
+ [&] 37 38
+ [args] 38 42
+ [,] 42 43
+ [cs] 44 46
+ [)] 46 47
+L256
+ [C] 2 3
+ [.] 3 4
+ [free] 4 8
+ [(] 8 9
+ [unsafe] 9 15
+ [.] 15 16
+ [Pointer] 16 23
+ [(] 23 24
+ [cs] 24 26
+ [)] 26 27
+ [)] 27 28
+L258
+ [_] 2 3
+ [,] 3 4
+ [_] 5 6
+ [,] 6 7
+ [errno] 8 13
+ [:=] 14 16
+ [unix] 17 21
+ [.] 21 22
+ [Syscall] 22 29
+ [(] 29 30
+ [unix] 30 34
+ [.] 34 35
+ [SYS_IOCTL] 35 44
+ [,] 44 45
+ [getDirFd] 46 54
+ [(] 54 55
+ [destDir] 55 62
+ [)] 62 63
+ [,] 63 64
+ [C] 65 66
+ [.] 66 67
+ [BTRFS_IOC_SNAP_CREATE_V2] 67 91
+ [,] 91 92
+L259
+ [uintptr] 3 10
+ [(] 10 11
+ [unsafe] 11 17
+ [.] 17 18
+ [Pointer] 18 25
+ [(] 25 26
+ [&] 26 27
+ [args] 27 31
+ [)] 31 32
+ [)] 32 33
+ [)] 33 34
+L260
+ [if] 2 4
+ [errno] 5 10
+ [!=] 11 13
+ [0] 14 15
+ [{] 16 17
+L261
+ [return] 3 9
+ [fmt] 10 13
+ [.] 13 14
+ [Errorf] 14 20
+ [(] 20 21
+ ["Failed to create btrfs snapshot: [ 21 58
+ [,] 58 59
+ [errno] 60 65
+ [.] 65 66
+ [Error] 66 71
+ [(] 71 72
+ [)] 72 73
+ [)] 73 74
+L262
+ [}] 2 3
+L263
+ [return] 2 8
+ [nil] 9 12
+L264
+ [}] 1 2
+L266
+ [func] 1 5
+ [isSubvolume] 6 17
+ [(] 17 18
+ [p] 18 19
+ [string] 20 26
+ [)] 26 27
+ [(] 28 29
+ [bool] 29 33
+ [,] 33 34
+ [error] 35 40
+ [)] 40 41
+ [{] 42 43
+L267
+ [var] 2 5
+ [bufStat] 6 13
+ [unix] 14 18
+ [.] 18 19
+ [Stat_t] 19 25
+L268
+ [if] 2 4
+ [err] 5 8
+ [:=] 9 11
+ [unix] 12 16
+ [.] 16 17
+ [Lstat] 17 22
+ [(] 22 23
+ [p] 23 24
+ [,] 24 25
+ [&] 26 27
+ [bufStat] 27 34
+ [)] 34 35
+ [;] 35 36
+ [err] 37 40
+ [!=] 41 43
+ [nil] 44 47
+ [{] 48 49
+L269
+ [return] 3 9
+ [false] 10 15
+ [,] 15 16
+ [err] 17 20
+L270
+ [}] 2 3
+L273
+ [return] 2 8
+ [bufStat] 9 16
+ [.] 16 17
+ [Ino] 17 20
+ [==] 21 23
+ [C] 24 25
+ [.] 25 26
+ [BTRFS_FIRST_FREE_OBJECTID] 26 51
+ [,] 51 52
+ [nil] 53 56
+L274
+ [}] 1 2
+L276
+ [func] 1 5
+ [subvolDelete] 6 18
+ [(] 18 19
+ [dirpath] 19 26
+ [,] 26 27
+ [name] 28 32
+ [string] 33 39
+ [,] 39 40
+ [quotaEnabled] 41 53
+ [bool] 54 58
+ [)] 58 59
+ [error] 60 65
+ [{] 66 67
+L277
+ [dir] 2 5
+ [,] 5 6
+ [err] 7 10
+ [:=] 11 13
+ [openDir] 14 21
+ [(] 21 22
+ [dirpath] 22 29
+ [)] 29 30
+L278
+ [if] 2 4
+ [err] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L279
+ [return] 3 9
+ [err] 10 13
+L280
+ [}] 2 3
+L281
+ [defer] 2 7
+ [closeDir] 8 16
+ [(] 16 17
+ [dir] 17 20
+ [)] 20 21
+L282
+ [fullPath] 2 10
+ [:=] 11 13
+ [path] 14 18
+ [.] 18 19
+ [Join] 19 23
+ [(] 23 24
+ [dirpath] 24 31
+ [,] 31 32
+ [name] 33 37
+ [)] 37 38
+L284
+ [var] 2 5
+ [args] 6 10
+ [C] 11 12
+ [.] 12 13
+ [struct_btrfs_ioctl_vol_args] 13 40
+L287
+ [walkSubvolumes] 2 16
+ [:=] 17 19
+ [func] 20 24
+ [(] 24 25
+ [p] 25 26
+ [string] 27 33
+ [,] 33 34
+ [f] 35 36
+ [os] 37 39
+ [.] 39 40
+ [FileInfo] 40 48
+ [,] 48 49
+ [err] 50 53
+ [error] 54 59
+ [)] 59 60
+ [error] 61 66
+ [{] 67 68
+L288
+ [if] 3 5
+ [err] 6 9
+ [!=] 10 12
+ [nil] 13 16
+ [{] 17 18
+L289
+ [if] 4 6
+ [os] 7 9
+ [.] 9 10
+ [IsNotExist] 10 20
+ [(] 20 21
+ [err] 21 24
+ [)] 24 25
+ [&&] 26 28
+ [p] 29 30
+ [!=] 31 33
+ [fullPath] 34 42
+ [{] 43 44
+L292
+ [return] 5 11
+ [nil] 12 15
+L293
+ [}] 4 5
+L294
+ [return] 4 10
+ [fmt] 11 14
+ [.] 14 15
+ [Errorf] 15 21
+ [(] 21 22
+ ["error walking subvolumes: %v"] 22 52
+ [,] 52 53
+ [err] 54 57
+ [)] 57 58
+L295
+ [}] 3 4
+L298
+ [if] 3 5
+ [f] 6 7
+ [.] 7 8
+ [IsDir] 8 13
+ [(] 13 14
+ [)] 14 15
+ [&&] 16 18
+ [p] 19 20
+ [!=] 21 23
+ [fullPath] 24 32
+ [{] 33 34
+L299
+ [sv] 4 6
+ [,] 6 7
+ [err] 8 11
+ [:=] 12 14
+ [isSubvolume] 15 26
+ [(] 26 27
+ [p] 27 28
+ [)] 28 29
+L300
+ [if] 4 6
+ [err] 7 10
+ [!=] 11 13
+ [nil] 14 17
+ [{] 18 19
+L301
+ [return] 5 11
+ [fmt] 12 15
+ [.] 15 16
+ [Errorf] 16 22
+ [(] 22 23
+ ["Failed to test if %s is a btrfs s[ 23 70
+ [,] 70 71
+ [p] 72 73
+ [,] 73 74
+ [err] 75 78
+ [)] 78 79
+L302
+ [}] 4 5
+L303
+ [if] 4 6
+ [sv] 7 9
+ [{] 10 11
+L304
+ [if] 5 7
+ [err] 8 11
+ [:=] 12 14
+ [subvolDelete] 15 27
+ [(] 27 28
+ [path] 28 32
+ [.] 32 33
+ [Dir] 33 36
+ [(] 36 37
+ [p] 37 38
+ [)] 38 39
+ [,] 39 40
+ [f] 41 42
+ [.] 42 43
+ [Name] 43 47
+ [(] 47 48
+ [)] 48 49
+ [,] 49 50
+ [quotaEnabled] 51 63
+ [)] 63 64
+ [;] 64 65
+ [err] 66 69
+ [!=] 70 72
+ [nil] 73 76
+ [{] 77 78
+L305
+ [return] 6 12
+ [fmt] 13 16
+ [.] 16 17
+ [Errorf] 17 23
+ [(] 23 24
+ ["Failed to destroy btrfs child sub[ 24 89
+ [,] 89 90
+ [p] 91 92
+ [,] 92 93
+ [dirpath] 94 101
+ [,] 101 102
+ [err] 103 106
+ [)] 106 107
+L306
+ [}] 5 6
+L307
+ [}] 4 5
+L308
+ [}] 3 4
+L309
+ [return] 3 9
+ [nil] 10 13
+L310
+ [}] 2 3
+L311
+ [if] 2 4
+ [err] 5 8
+ [:=] 9 11
+ [filepath] 12 20
+ [.] 20 21
+ [Walk] 21 25
+ [(] 25 26
+ [path] 26 30
+ [.] 30 31
+ [Join] 31 35
+ [(] 35 36
+ [dirpath] 36 43
+ [,] 43 44
+ [name] 45 49
+ [)] 49 50
+ [,] 50 51
+ [walkSubvolumes] 52 66
+ [)] 66 67
+ [;] 67 68
+ [err] 69 72
+ [!=] 73 75
+ [nil] 76 79
+ [{] 80 81
+L312
+ [return] 3 9
+ [fmt] 10 13
+ [.] 13 14
+ [Errorf] 14 20
+ [(] 20 21
+ ["Recursively walking subvolumes fo[ 21 71
+ [,] 71 72
+ [dirpath] 73 80
+ [,] 80 81
+ [err] 82 85
+ [)] 85 86
+L313
+ [}] 2 3
+L315
+ [if] 2 4
+ [quotaEnabled] 5 17
+ [{] 18 19
+L316
+ [if] 3 5
+ [qgroupid] 6 14
+ [,] 14 15
+ [err] 16 19
+ [:=] 20 22
+ [subvolLookupQgroup] 23 41
+ [(] 41 42
+ [fullPath] 42 50
+ [)] 50 51
+ [;] 51 52
+ [err] 53 56
+ [==] 57 59
+ [nil] 60 63
+ [{] 64 65
+L317
+ [var] 4 7
+ [args] 8 12
+ [C] 13 14
+ [.] 14 15
+ [struct_btrfs_ioctl_qgroup_create_a[ 15 52
+L318
+ [args] 4 8
+ [.] 8 9
+ [qgroupid] 9 17
+ [=] 18 19
+ [C] 20 21
+ [.] 21 22
+ [__u64] 22 27
+ [(] 27 28
+ [qgroupid] 28 36
+ [)] 36 37
+L320
+ [_] 4 5
+ [,] 5 6
+ [_] 7 8
+ [,] 8 9
+ [errno] 10 15
+ [:=] 16 18
+ [unix] 19 23
+ [.] 23 24
+ [Syscall] 24 31
+ [(] 31 32
+ [unix] 32 36
+ [.] 36 37
+ [SYS_IOCTL] 37 46
+ [,] 46 47
+ [getDirFd] 48 56
+ [(] 56 57
+ [dir] 57 60
+ [)] 60 61
+ [,] 61 62
+ [C] 63 64
+ [.] 64 65
+ [BTRFS_IOC_QGROUP_CREATE] 65 88
+ [,] 88 89
+L321
+ [uintptr] 5 12
+ [(] 12 13
+ [unsafe] 13 19
+ [.] 19 20
+ [Pointer] 20 27
+ [(] 27 28
+ [&] 28 29
+ [args] 29 33
+ [)] 33 34
+ [)] 34 35
+ [)] 35 36
+L322
+ [if] 4 6
+ [errno] 7 12
+ [!=] 13 15
+ [0] 16 17
+ [{] 18 19
+L323
+ [logrus] 5 11
+ [.] 11 12
+ [WithField] 12 21
+ [(] 21 22
+ ["storage-driver"] 22 38
+ [,] 38 39
+ ["btrfs"] 40 47
+ [)] 47 48
+ [.] 48 49
+ [Errorf] 49 55
+ [(] 55 56
+ ["Failed to delete btrfs qgroup %v [ 56 101
+ [,] 101 102
+ [qgroupid] 103 111
+ [,] 111 112
+ [fullPath] 113 121
+ [,] 121 122
+ [errno] 123 128
+ [.] 128 129
+ [Error] 129 134
+ [(] 134 135
+ [)] 135 136
+ [)] 136 137
+L324
+ [}] 4 5
+L325
+ [}] 3 4
+ [else] 5 9
+ [{] 10 11
+L326
+ [logrus] 4 10
+ [.] 10 11
+ [WithField] 11 20
+ [(] 20 21
+ ["storage-driver"] 21 37
+ [,] 37 38
+ ["btrfs"] 39 46
+ [)] 46 47
+ [.] 47 48
+ [Errorf] 48 54
+ [(] 54 55
+ ["Failed to lookup btrfs qgroup for[ 55 97
+ [,] 97 98
+ [fullPath] 99 107
+ [,] 107 108
+ [err] 109 112
+ [.] 112 113
+ [Error] 113 118
+ [(] 118 119
+ [)] 119 120
+ [)] 120 121
+L327
+ [}] 3 4
+L328
+ [}] 2 3
+L332
+ [for] 2 5
+ [i] 6 7
+ [,] 7 8
+ [c] 9 10
+ [:=] 11 13
+ [range] 14 19
+ [\[] 20 21
+ [\]] 21 22
+ [byte] 22 26
+ [(] 26 27
+ [name] 27 31
+ [)] 31 32
+ [{] 33 34
+L333
+ [args] 3 7
+ [.] 7 8
+ [name] 8 12
+ [\[] 12 13
+ [i] 13 14
+ [\]] 14 15
+ [=] 16 17
+ [C] 18 19
+ [.] 19 20
+ [char] 20 24
+ [(] 24 25
+ [c] 25 26
+ [)] 26 27
+L334
+ [}] 2 3
+L335
+ [_] 2 3
+ [,] 3 4
+ [_] 5 6
+ [,] 6 7
+ [errno] 8 13
+ [:=] 14 16
+ [unix] 17 21
+ [.] 21 22
+ [Syscall] 22 29
+ [(] 29 30
+ [unix] 30 34
+ [.] 34 35
+ [SYS_IOCTL] 35 44
+ [,] 44 45
+ [getDirFd] 46 54
+ [(] 54 55
+ [dir] 55 58
+ [)] 58 59
+ [,] 59 60
+ [C] 61 62
+ [.] 62 63
+ [BTRFS_IOC_SNAP_DESTROY] 63 85
+ [,] 85 86
+L336
+ [uintptr] 3 10
+ [(] 10 11
+ [unsafe] 11 17
+ [.] 17 18
+ [Pointer] 18 25
+ [(] 25 26
+ [&] 26 27
+ [args] 27 31
+ [)] 31 32
+ [)] 32 33
+ [)] 33 34
+L337
+ [if] 2 4
+ [errno] 5 10
+ [!=] 11 13
+ [0] 14 15
+ [{] 16 17
+L338
+ [return] 3 9
+ [fmt] 10 13
+ [.] 13 14
+ [Errorf] 14 20
+ [(] 20 21
+ ["Failed to destroy btrfs snapshot [ 21 69
+ [,] 69 70
+ [dirpath] 71 78
+ [,] 78 79
+ [name] 80 84
+ [,] 84 85
+ [errno] 86 91
+ [.] 91 92
+ [Error] 92 97
+ [(] 97 98
+ [)] 98 99
+ [)] 99 100
+L339
+ [}] 2 3
+L340
+ [return] 2 8
+ [nil] 9 12
+L341
+ [}] 1 2
+L343
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [updateQuotaStatus] 18 35
+ [(] 35 36
+ [)] 36 37
+ [{] 38 39
+L344
+ [d] 2 3
+ [.] 3 4
+ [once] 4 8
+ [.] 8 9
+ [Do] 9 11
+ [(] 11 12
+ [func] 12 16
+ [(] 16 17
+ [)] 17 18
+ [{] 19 20
+L345
+ [if] 3 5
+ [!] 6 7
+ [d] 7 8
+ [.] 8 9
+ [quotaEnabled] 9 21
+ [{] 22 23
+L347
+ [if] 4 6
+ [err] 7 10
+ [:=] 11 13
+ [subvolQgroupStatus] 14 32
+ [(] 32 33
+ [d] 33 34
+ [.] 34 35
+ [home] 35 39
+ [)] 39 40
+ [;] 40 41
+ [err] 42 45
+ [!=] 46 48
+ [nil] 49 52
+ [{] 53 54
+L349
+ [return] 5 11
+L350
+ [}] 4 5
+L351
+ [d] 4 5
+ [.] 5 6
+ [quotaEnabled] 6 18
+ [=] 19 20
+ [true] 21 25
+L352
+ [}] 3 4
+L353
+ [}] 2 3
+ [)] 3 4
+L354
+ [}] 1 2
+L356
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [subvolEnableQuota] 18 35
+ [(] 35 36
+ [)] 36 37
+ [error] 38 43
+ [{] 44 45
+L357
+ [d] 2 3
+ [.] 3 4
+ [updateQuotaStatus] 4 21
+ [(] 21 22
+ [)] 22 23
+L359
+ [if] 2 4
+ [d] 5 6
+ [.] 6 7
+ [quotaEnabled] 7 19
+ [{] 20 21
+L360
+ [return] 3 9
+ [nil] 10 13
+L361
+ [}] 2 3
+L363
+ [dir] 2 5
+ [,] 5 6
+ [err] 7 10
+ [:=] 11 13
+ [openDir] 14 21
+ [(] 21 22
+ [d] 22 23
+ [.] 23 24
+ [home] 24 28
+ [)] 28 29
+L364
+ [if] 2 4
+ [err] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L365
+ [return] 3 9
+ [err] 10 13
+L366
+ [}] 2 3
+L367
+ [defer] 2 7
+ [closeDir] 8 16
+ [(] 16 17
+ [dir] 17 20
+ [)] 20 21
+L369
+ [var] 2 5
+ [args] 6 10
+ [C] 11 12
+ [.] 12 13
+ [struct_btrfs_ioctl_quota_ctl_args] 13 46
+L370
+ [args] 2 6
+ [.] 6 7
+ [cmd] 7 10
+ [=] 11 12
+ [C] 13 14
+ [.] 14 15
+ [BTRFS_QUOTA_CTL_ENABLE] 15 37
+L371
+ [_] 2 3
+ [,] 3 4
+ [_] 5 6
+ [,] 6 7
+ [errno] 8 13
+ [:=] 14 16
+ [unix] 17 21
+ [.] 21 22
+ [Syscall] 22 29
+ [(] 29 30
+ [unix] 30 34
+ [.] 34 35
+ [SYS_IOCTL] 35 44
+ [,] 44 45
+ [getDirFd] 46 54
+ [(] 54 55
+ [dir] 55 58
+ [)] 58 59
+ [,] 59 60
+ [C] 61 62
+ [.] 62 63
+ [BTRFS_IOC_QUOTA_CTL] 63 82
+ [,] 82 83
+L372
+ [uintptr] 3 10
+ [(] 10 11
+ [unsafe] 11 17
+ [.] 17 18
+ [Pointer] 18 25
+ [(] 25 26
+ [&] 26 27
+ [args] 27 31
+ [)] 31 32
+ [)] 32 33
+ [)] 33 34
+L373
+ [if] 2 4
+ [errno] 5 10
+ [!=] 11 13
+ [0] 14 15
+ [{] 16 17
+L374
+ [return] 3 9
+ [fmt] 10 13
+ [.] 13 14
+ [Errorf] 14 20
+ [(] 20 21
+ ["Failed to enable btrfs quota for [ 21 62
+ [,] 62 63
+ [dir] 64 67
+ [,] 67 68
+ [errno] 69 74
+ [.] 74 75
+ [Error] 75 80
+ [(] 80 81
+ [)] 81 82
+ [)] 82 83
+L375
+ [}] 2 3
+L377
+ [d] 2 3
+ [.] 3 4
+ [quotaEnabled] 4 16
+ [=] 17 18
+ [true] 19 23
+L379
+ [return] 2 8
+ [nil] 9 12
+L380
+ [}] 1 2
+L382
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [subvolDisableQuota] 18 36
+ [(] 36 37
+ [)] 37 38
+ [error] 39 44
+ [{] 45 46
+L383
+ [d] 2 3
+ [.] 3 4
+ [updateQuotaStatus] 4 21
+ [(] 21 22
+ [)] 22 23
+L385
+ [if] 2 4
+ [!] 5 6
+ [d] 6 7
+ [.] 7 8
+ [quotaEnabled] 8 20
+ [{] 21 22
+L386
+ [return] 3 9
+ [nil] 10 13
+L387
+ [}] 2 3
+L389
+ [dir] 2 5
+ [,] 5 6
+ [err] 7 10
+ [:=] 11 13
+ [openDir] 14 21
+ [(] 21 22
+ [d] 22 23
+ [.] 23 24
+ [home] 24 28
+ [)] 28 29
+L390
+ [if] 2 4
+ [err] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L391
+ [return] 3 9
+ [err] 10 13
+L392
+ [}] 2 3
+L393
+ [defer] 2 7
+ [closeDir] 8 16
+ [(] 16 17
+ [dir] 17 20
+ [)] 20 21
+L395
+ [var] 2 5
+ [args] 6 10
+ [C] 11 12
+ [.] 12 13
+ [struct_btrfs_ioctl_quota_ctl_args] 13 46
+L396
+ [args] 2 6
+ [.] 6 7
+ [cmd] 7 10
+ [=] 11 12
+ [C] 13 14
+ [.] 14 15
+ [BTRFS_QUOTA_CTL_DISABLE] 15 38
+L397
+ [_] 2 3
+ [,] 3 4
+ [_] 5 6
+ [,] 6 7
+ [errno] 8 13
+ [:=] 14 16
+ [unix] 17 21
+ [.] 21 22
+ [Syscall] 22 29
+ [(] 29 30
+ [unix] 30 34
+ [.] 34 35
+ [SYS_IOCTL] 35 44
+ [,] 44 45
+ [getDirFd] 46 54
+ [(] 54 55
+ [dir] 55 58
+ [)] 58 59
+ [,] 59 60
+ [C] 61 62
+ [.] 62 63
+ [BTRFS_IOC_QUOTA_CTL] 63 82
+ [,] 82 83
+L398
+ [uintptr] 3 10
+ [(] 10 11
+ [unsafe] 11 17
+ [.] 17 18
+ [Pointer] 18 25
+ [(] 25 26
+ [&] 26 27
+ [args] 27 31
+ [)] 31 32
+ [)] 32 33
+ [)] 33 34
+L399
+ [if] 2 4
+ [errno] 5 10
+ [!=] 11 13
+ [0] 14 15
+ [{] 16 17
+L400
+ [return] 3 9
+ [fmt] 10 13
+ [.] 13 14
+ [Errorf] 14 20
+ [(] 20 21
+ ["Failed to disable btrfs quota for[ 21 63
+ [,] 63 64
+ [dir] 65 68
+ [,] 68 69
+ [errno] 70 75
+ [.] 75 76
+ [Error] 76 81
+ [(] 81 82
+ [)] 82 83
+ [)] 83 84
+L401
+ [}] 2 3
+L403
+ [d] 2 3
+ [.] 3 4
+ [quotaEnabled] 4 16
+ [=] 17 18
+ [false] 19 24
+L405
+ [return] 2 8
+ [nil] 9 12
+L406
+ [}] 1 2
+L408
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [subvolRescanQuota] 18 35
+ [(] 35 36
+ [)] 36 37
+ [error] 38 43
+ [{] 44 45
+L409
+ [d] 2 3
+ [.] 3 4
+ [updateQuotaStatus] 4 21
+ [(] 21 22
+ [)] 22 23
+L411
+ [if] 2 4
+ [!] 5 6
+ [d] 6 7
+ [.] 7 8
+ [quotaEnabled] 8 20
+ [{] 21 22
+L412
+ [return] 3 9
+ [nil] 10 13
+L413
+ [}] 2 3
+L415
+ [dir] 2 5
+ [,] 5 6
+ [err] 7 10
+ [:=] 11 13
+ [openDir] 14 21
+ [(] 21 22
+ [d] 22 23
+ [.] 23 24
+ [home] 24 28
+ [)] 28 29
+L416
+ [if] 2 4
+ [err] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L417
+ [return] 3 9
+ [err] 10 13
+L418
+ [}] 2 3
+L419
+ [defer] 2 7
+ [closeDir] 8 16
+ [(] 16 17
+ [dir] 17 20
+ [)] 20 21
+L421
+ [var] 2 5
+ [args] 6 10
+ [C] 11 12
+ [.] 12 13
+ [struct_btrfs_ioctl_quota_rescan_ar[ 13 49
+L422
+ [_] 2 3
+ [,] 3 4
+ [_] 5 6
+ [,] 6 7
+ [errno] 8 13
+ [:=] 14 16
+ [unix] 17 21
+ [.] 21 22
+ [Syscall] 22 29
+ [(] 29 30
+ [unix] 30 34
+ [.] 34 35
+ [SYS_IOCTL] 35 44
+ [,] 44 45
+ [getDirFd] 46 54
+ [(] 54 55
+ [dir] 55 58
+ [)] 58 59
+ [,] 59 60
+ [C] 61 62
+ [.] 62 63
+ [BTRFS_IOC_QUOTA_RESCAN_WAIT] 63 90
+ [,] 90 91
+L423
+ [uintptr] 3 10
+ [(] 10 11
+ [unsafe] 11 17
+ [.] 17 18
+ [Pointer] 18 25
+ [(] 25 26
+ [&] 26 27
+ [args] 27 31
+ [)] 31 32
+ [)] 32 33
+ [)] 33 34
+L424
+ [if] 2 4
+ [errno] 5 10
+ [!=] 11 13
+ [0] 14 15
+ [{] 16 17
+L425
+ [return] 3 9
+ [fmt] 10 13
+ [.] 13 14
+ [Errorf] 14 20
+ [(] 20 21
+ ["Failed to rescan btrfs quota for [ 21 62
+ [,] 62 63
+ [dir] 64 67
+ [,] 67 68
+ [errno] 69 74
+ [.] 74 75
+ [Error] 75 80
+ [(] 80 81
+ [)] 81 82
+ [)] 82 83
+L426
+ [}] 2 3
+L428
+ [return] 2 8
+ [nil] 9 12
+L429
+ [}] 1 2
+L431
+ [func] 1 5
+ [subvolLimitQgroup] 6 23
+ [(] 23 24
+ [path] 24 28
+ [string] 29 35
+ [,] 35 36
+ [size] 37 41
+ [uint64] 42 48
+ [)] 48 49
+ [error] 50 55
+ [{] 56 57
+L432
+ [dir] 2 5
+ [,] 5 6
+ [err] 7 10
+ [:=] 11 13
+ [openDir] 14 21
+ [(] 21 22
+ [path] 22 26
+ [)] 26 27
+L433
+ [if] 2 4
+ [err] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L434
+ [return] 3 9
+ [err] 10 13
+L435
+ [}] 2 3
+L436
+ [defer] 2 7
+ [closeDir] 8 16
+ [(] 16 17
+ [dir] 17 20
+ [)] 20 21
+L438
+ [var] 2 5
+ [args] 6 10
+ [C] 11 12
+ [.] 12 13
+ [struct_btrfs_ioctl_qgroup_limit_ar[ 13 49
+L439
+ [args] 2 6
+ [.] 6 7
+ [lim] 7 10
+ [.] 10 11
+ [max_referenced] 11 25
+ [=] 26 27
+ [C] 28 29
+ [.] 29 30
+ [__u64] 30 35
+ [(] 35 36
+ [size] 36 40
+ [)] 40 41
+L440
+ [args] 2 6
+ [.] 6 7
+ [lim] 7 10
+ [.] 10 11
+ [flags] 11 16
+ [=] 17 18
+ [C] 19 20
+ [.] 20 21
+ [BTRFS_QGROUP_LIMIT_MAX_RFER] 21 48
+L441
+ [_] 2 3
+ [,] 3 4
+ [_] 5 6
+ [,] 6 7
+ [errno] 8 13
+ [:=] 14 16
+ [unix] 17 21
+ [.] 21 22
+ [Syscall] 22 29
+ [(] 29 30
+ [unix] 30 34
+ [.] 34 35
+ [SYS_IOCTL] 35 44
+ [,] 44 45
+ [getDirFd] 46 54
+ [(] 54 55
+ [dir] 55 58
+ [)] 58 59
+ [,] 59 60
+ [C] 61 62
+ [.] 62 63
+ [BTRFS_IOC_QGROUP_LIMIT] 63 85
+ [,] 85 86
+L442
+ [uintptr] 3 10
+ [(] 10 11
+ [unsafe] 11 17
+ [.] 17 18
+ [Pointer] 18 25
+ [(] 25 26
+ [&] 26 27
+ [args] 27 31
+ [)] 31 32
+ [)] 32 33
+ [)] 33 34
+L443
+ [if] 2 4
+ [errno] 5 10
+ [!=] 11 13
+ [0] 14 15
+ [{] 16 17
+L444
+ [return] 3 9
+ [fmt] 10 13
+ [.] 13 14
+ [Errorf] 14 20
+ [(] 20 21
+ ["Failed to limit qgroup for %s: %v[ 21 56
+ [,] 56 57
+ [dir] 58 61
+ [,] 61 62
+ [errno] 63 68
+ [.] 68 69
+ [Error] 69 74
+ [(] 74 75
+ [)] 75 76
+ [)] 76 77
+L445
+ [}] 2 3
+L447
+ [return] 2 8
+ [nil] 9 12
+L448
+ [}] 1 2
+L454
+ [func] 1 5
+ [subvolQgroupStatus] 6 24
+ [(] 24 25
+ [path] 25 29
+ [string] 30 36
+ [)] 36 37
+ [error] 38 43
+ [{] 44 45
+L455
+ [dir] 2 5
+ [,] 5 6
+ [err] 7 10
+ [:=] 11 13
+ [openDir] 14 21
+ [(] 21 22
+ [path] 22 26
+ [)] 26 27
+L456
+ [if] 2 4
+ [err] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L457
+ [return] 3 9
+ [err] 10 13
+L458
+ [}] 2 3
+L459
+ [defer] 2 7
+ [closeDir] 8 16
+ [(] 16 17
+ [dir] 17 20
+ [)] 20 21
+L461
+ [var] 2 5
+ [args] 6 10
+ [C] 11 12
+ [.] 12 13
+ [struct_btrfs_ioctl_search_args] 13 43
+L462
+ [args] 2 6
+ [.] 6 7
+ [key] 7 10
+ [.] 10 11
+ [tree_id] 11 18
+ [=] 19 20
+ [C] 21 22
+ [.] 22 23
+ [BTRFS_QUOTA_TREE_OBJECTID] 23 48
+L463
+ [args] 2 6
+ [.] 6 7
+ [key] 7 10
+ [.] 10 11
+ [min_type] 11 19
+ [=] 20 21
+ [C] 22 23
+ [.] 23 24
+ [BTRFS_QGROUP_STATUS_KEY] 24 47
+L464
+ [args] 2 6
+ [.] 6 7
+ [key] 7 10
+ [.] 10 11
+ [max_type] 11 19
+ [=] 20 21
+ [C] 22 23
+ [.] 23 24
+ [BTRFS_QGROUP_STATUS_KEY] 24 47
+L465
+ [args] 2 6
+ [.] 6 7
+ [key] 7 10
+ [.] 10 11
+ [max_objectid] 11 23
+ [=] 24 25
+ [C] 26 27
+ [.] 27 28
+ [__u64] 28 33
+ [(] 33 34
+ [math] 34 38
+ [.] 38 39
+ [MaxUint64] 39 48
+ [)] 48 49
+L466
+ [args] 2 6
+ [.] 6 7
+ [key] 7 10
+ [.] 10 11
+ [max_offset] 11 21
+ [=] 22 23
+ [C] 24 25
+ [.] 25 26
+ [__u64] 26 31
+ [(] 31 32
+ [math] 32 36
+ [.] 36 37
+ [MaxUint64] 37 46
+ [)] 46 47
+L467
+ [args] 2 6
+ [.] 6 7
+ [key] 7 10
+ [.] 10 11
+ [max_transid] 11 22
+ [=] 23 24
+ [C] 25 26
+ [.] 26 27
+ [__u64] 27 32
+ [(] 32 33
+ [math] 33 37
+ [.] 37 38
+ [MaxUint64] 38 47
+ [)] 47 48
+L468
+ [args] 2 6
+ [.] 6 7
+ [key] 7 10
+ [.] 10 11
+ [nr_items] 11 19
+ [=] 20 21
+ [4096] 22 26
+L470
+ [_] 2 3
+ [,] 3 4
+ [_] 5 6
+ [,] 6 7
+ [errno] 8 13
+ [:=] 14 16
+ [unix] 17 21
+ [.] 21 22
+ [Syscall] 22 29
+ [(] 29 30
+ [unix] 30 34
+ [.] 34 35
+ [SYS_IOCTL] 35 44
+ [,] 44 45
+ [getDirFd] 46 54
+ [(] 54 55
+ [dir] 55 58
+ [)] 58 59
+ [,] 59 60
+ [C] 61 62
+ [.] 62 63
+ [BTRFS_IOC_TREE_SEARCH] 63 84
+ [,] 84 85
+L471
+ [uintptr] 3 10
+ [(] 10 11
+ [unsafe] 11 17
+ [.] 17 18
+ [Pointer] 18 25
+ [(] 25 26
+ [&] 26 27
+ [args] 27 31
+ [)] 31 32
+ [)] 32 33
+ [)] 33 34
+L472
+ [if] 2 4
+ [errno] 5 10
+ [!=] 11 13
+ [0] 14 15
+ [{] 16 17
+L473
+ [return] 3 9
+ [fmt] 10 13
+ [.] 13 14
+ [Errorf] 14 20
+ [(] 20 21
+ ["Failed to search qgroup for %s: %[ 21 57
+ [,] 57 58
+ [path] 59 63
+ [,] 63 64
+ [errno] 65 70
+ [.] 70 71
+ [Error] 71 76
+ [(] 76 77
+ [)] 77 78
+ [)] 78 79
+L474
+ [}] 2 3
+L475
+ [sh] 2 4
+ [:=] 5 7
+ [(] 8 9
+ [*] 9 10
+ [C] 10 11
+ [.] 11 12
+ [struct_btrfs_ioctl_search_header] 12 44
+ [)] 44 45
+ [(] 45 46
+ [unsafe] 46 52
+ [.] 52 53
+ [Pointer] 53 60
+ [(] 60 61
+ [&] 61 62
+ [args] 62 66
+ [.] 66 67
+ [buf] 67 70
+ [)] 70 71
+ [)] 71 72
+L476
+ [if] 2 4
+ [sh] 5 7
+ [.] 7 8
+ [_type] 8 13
+ [!=] 14 16
+ [C] 17 18
+ [.] 18 19
+ [BTRFS_QGROUP_STATUS_KEY] 19 42
+ [{] 43 44
+L477
+ [return] 3 9
+ [fmt] 10 13
+ [.] 13 14
+ [Errorf] 14 20
+ [(] 20 21
+ ["Invalid qgroup search header type[ 21 67
+ [,] 67 68
+ [path] 69 73
+ [,] 73 74
+ [sh] 75 77
+ [.] 77 78
+ [_type] 78 83
+ [)] 83 84
+L478
+ [}] 2 3
+L479
+ [return] 2 8
+ [nil] 9 12
+L480
+ [}] 1 2
+L482
+ [func] 1 5
+ [subvolLookupQgroup] 6 24
+ [(] 24 25
+ [path] 25 29
+ [string] 30 36
+ [)] 36 37
+ [(] 38 39
+ [uint64] 39 45
+ [,] 45 46
+ [error] 47 52
+ [)] 52 53
+ [{] 54 55
+L483
+ [dir] 2 5
+ [,] 5 6
+ [err] 7 10
+ [:=] 11 13
+ [openDir] 14 21
+ [(] 21 22
+ [path] 22 26
+ [)] 26 27
+L484
+ [if] 2 4
+ [err] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L485
+ [return] 3 9
+ [0] 10 11
+ [,] 11 12
+ [err] 13 16
+L486
+ [}] 2 3
+L487
+ [defer] 2 7
+ [closeDir] 8 16
+ [(] 16 17
+ [dir] 17 20
+ [)] 20 21
+L489
+ [var] 2 5
+ [args] 6 10
+ [C] 11 12
+ [.] 12 13
+ [struct_btrfs_ioctl_ino_lookup_args] 13 47
+L490
+ [args] 2 6
+ [.] 6 7
+ [objectid] 7 15
+ [=] 16 17
+ [C] 18 19
+ [.] 19 20
+ [BTRFS_FIRST_FREE_OBJECTID] 20 45
+L492
+ [_] 2 3
+ [,] 3 4
+ [_] 5 6
+ [,] 6 7
+ [errno] 8 13
+ [:=] 14 16
+ [unix] 17 21
+ [.] 21 22
+ [Syscall] 22 29
+ [(] 29 30
+ [unix] 30 34
+ [.] 34 35
+ [SYS_IOCTL] 35 44
+ [,] 44 45
+ [getDirFd] 46 54
+ [(] 54 55
+ [dir] 55 58
+ [)] 58 59
+ [,] 59 60
+ [C] 61 62
+ [.] 62 63
+ [BTRFS_IOC_INO_LOOKUP] 63 83
+ [,] 83 84
+L493
+ [uintptr] 3 10
+ [(] 10 11
+ [unsafe] 11 17
+ [.] 17 18
+ [Pointer] 18 25
+ [(] 25 26
+ [&] 26 27
+ [args] 27 31
+ [)] 31 32
+ [)] 32 33
+ [)] 33 34
+L494
+ [if] 2 4
+ [errno] 5 10
+ [!=] 11 13
+ [0] 14 15
+ [{] 16 17
+L495
+ [return] 3 9
+ [0] 10 11
+ [,] 11 12
+ [fmt] 13 16
+ [.] 16 17
+ [Errorf] 17 23
+ [(] 23 24
+ ["Failed to lookup qgroup for %s: %[ 24 60
+ [,] 60 61
+ [dir] 62 65
+ [,] 65 66
+ [errno] 67 72
+ [.] 72 73
+ [Error] 73 78
+ [(] 78 79
+ [)] 79 80
+ [)] 80 81
+L496
+ [}] 2 3
+L497
+ [if] 2 4
+ [args] 5 9
+ [.] 9 10
+ [treeid] 10 16
+ [==] 17 19
+ [0] 20 21
+ [{] 22 23
+L498
+ [return] 3 9
+ [0] 10 11
+ [,] 11 12
+ [fmt] 13 16
+ [.] 16 17
+ [Errorf] 17 23
+ [(] 23 24
+ ["Invalid qgroup id for %s: 0"] 24 53
+ [,] 53 54
+ [dir] 55 58
+ [)] 58 59
+L499
+ [}] 2 3
+L501
+ [return] 2 8
+ [uint64] 9 15
+ [(] 15 16
+ [args] 16 20
+ [.] 20 21
+ [treeid] 21 27
+ [)] 27 28
+ [,] 28 29
+ [nil] 30 33
+L502
+ [}] 1 2
+L504
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [subvolumesDir] 18 31
+ [(] 31 32
+ [)] 32 33
+ [string] 34 40
+ [{] 41 42
+L505
+ [return] 2 8
+ [path] 9 13
+ [.] 13 14
+ [Join] 14 18
+ [(] 18 19
+ [d] 19 20
+ [.] 20 21
+ [home] 21 25
+ [,] 25 26
+ ["subvolumes"] 27 39
+ [)] 39 40
+L506
+ [}] 1 2
+L508
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [subvolumesDirID] 18 33
+ [(] 33 34
+ [id] 34 36
+ [string] 37 43
+ [)] 43 44
+ [string] 45 51
+ [{] 52 53
+L509
+ [return] 2 8
+ [path] 9 13
+ [.] 13 14
+ [Join] 14 18
+ [(] 18 19
+ [d] 19 20
+ [.] 20 21
+ [subvolumesDir] 21 34
+ [(] 34 35
+ [)] 35 36
+ [,] 36 37
+ [id] 38 40
+ [)] 40 41
+L510
+ [}] 1 2
+L512
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [quotasDir] 18 27
+ [(] 27 28
+ [)] 28 29
+ [string] 30 36
+ [{] 37 38
+L513
+ [return] 2 8
+ [path] 9 13
+ [.] 13 14
+ [Join] 14 18
+ [(] 18 19
+ [d] 19 20
+ [.] 20 21
+ [home] 21 25
+ [,] 25 26
+ ["quotas"] 27 35
+ [)] 35 36
+L514
+ [}] 1 2
+L516
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [quotasDirID] 18 29
+ [(] 29 30
+ [id] 30 32
+ [string] 33 39
+ [)] 39 40
+ [string] 41 47
+ [{] 48 49
+L517
+ [return] 2 8
+ [path] 9 13
+ [.] 13 14
+ [Join] 14 18
+ [(] 18 19
+ [d] 19 20
+ [.] 20 21
+ [quotasDir] 21 30
+ [(] 30 31
+ [)] 31 32
+ [,] 32 33
+ [id] 34 36
+ [)] 36 37
+L518
+ [}] 1 2
+L522
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [CreateReadWrite] 18 33
+ [(] 33 34
+ [id] 34 36
+ [,] 36 37
+ [parent] 38 44
+ [string] 45 51
+ [,] 51 52
+ [opts] 53 57
+ [*] 58 59
+ [graphdriver] 59 70
+ [.] 70 71
+ [CreateOpts] 71 81
+ [)] 81 82
+ [error] 83 88
+ [{] 89 90
+L523
+ [return] 2 8
+ [d] 9 10
+ [.] 10 11
+ [Create] 11 17
+ [(] 17 18
+ [id] 18 20
+ [,] 20 21
+ [parent] 22 28
+ [,] 28 29
+ [opts] 30 34
+ [)] 34 35
+L524
+ [}] 1 2
+L527
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [Create] 18 24
+ [(] 24 25
+ [id] 25 27
+ [,] 27 28
+ [parent] 29 35
+ [string] 36 42
+ [,] 42 43
+ [opts] 44 48
+ [*] 49 50
+ [graphdriver] 50 61
+ [.] 61 62
+ [CreateOpts] 62 72
+ [)] 72 73
+ [error] 74 79
+ [{] 80 81
+L528
+ [quotas] 2 8
+ [:=] 9 11
+ [path] 12 16
+ [.] 16 17
+ [Join] 17 21
+ [(] 21 22
+ [d] 22 23
+ [.] 23 24
+ [home] 24 28
+ [,] 28 29
+ ["quotas"] 30 38
+ [)] 38 39
+L529
+ [subvolumes] 2 12
+ [:=] 13 15
+ [path] 16 20
+ [.] 20 21
+ [Join] 21 25
+ [(] 25 26
+ [d] 26 27
+ [.] 27 28
+ [home] 28 32
+ [,] 32 33
+ ["subvolumes"] 34 46
+ [)] 46 47
+L530
+ [rootUID] 2 9
+ [,] 9 10
+ [rootGID] 11 18
+ [,] 18 19
+ [err] 20 23
+ [:=] 24 26
+ [idtools] 27 34
+ [.] 34 35
+ [GetRootUIDGID] 35 48
+ [(] 48 49
+ [d] 49 50
+ [.] 50 51
+ [uidMaps] 51 58
+ [,] 58 59
+ [d] 60 61
+ [.] 61 62
+ [gidMaps] 62 69
+ [)] 69 70
+L531
+ [if] 2 4
+ [err] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L532
+ [return] 3 9
+ [err] 10 13
+L533
+ [}] 2 3
+L534
+ [if] 2 4
+ [err] 5 8
+ [:=] 9 11
+ [idtools] 12 19
+ [.] 19 20
+ [MkdirAllAndChown] 20 36
+ [(] 36 37
+ [subvolumes] 37 47
+ [,] 47 48
+ [0700] 49 53
+ [,] 53 54
+ [idtools] 55 62
+ [.] 62 63
+ [Identity] 63 71
+ [{] 71 72
+ [UID] 72 75
+ [:] 75 76
+ [rootUID] 77 84
+ [,] 84 85
+ [GID] 86 89
+ [:] 89 90
+ [rootGID] 91 98
+ [}] 98 99
+ [)] 99 100
+ [;] 100 101
+ [err] 102 105
+ [!=] 106 108
+ [nil] 109 112
+ [{] 113 114
+L535
+ [return] 3 9
+ [err] 10 13
+L536
+ [}] 2 3
+L537
+ [if] 2 4
+ [parent] 5 11
+ [==] 12 14
+ [""] 15 17
+ [{] 18 19
+L538
+ [if] 3 5
+ [err] 6 9
+ [:=] 10 12
+ [subvolCreate] 13 25
+ [(] 25 26
+ [subvolumes] 26 36
+ [,] 36 37
+ [id] 38 40
+ [)] 40 41
+ [;] 41 42
+ [err] 43 46
+ [!=] 47 49
+ [nil] 50 53
+ [{] 54 55
+L539
+ [return] 4 10
+ [err] 11 14
+L540
+ [}] 3 4
+L541
+ [}] 2 3
+ [else] 4 8
+ [{] 9 10
+L542
+ [parentDir] 3 12
+ [:=] 13 15
+ [d] 16 17
+ [.] 17 18
+ [subvolumesDirID] 18 33
+ [(] 33 34
+ [parent] 34 40
+ [)] 40 41
+L543
+ [st] 3 5
+ [,] 5 6
+ [err] 7 10
+ [:=] 11 13
+ [os] 14 16
+ [.] 16 17
+ [Stat] 17 21
+ [(] 21 22
+ [parentDir] 22 31
+ [)] 31 32
+L544
+ [if] 3 5
+ [err] 6 9
+ [!=] 10 12
+ [nil] 13 16
+ [{] 17 18
+L545
+ [return] 4 10
+ [err] 11 14
+L546
+ [}] 3 4
+L547
+ [if] 3 5
+ [!] 6 7
+ [st] 7 9
+ [.] 9 10
+ [IsDir] 10 15
+ [(] 15 16
+ [)] 16 17
+ [{] 18 19
+L548
+ [return] 4 10
+ [fmt] 11 14
+ [.] 14 15
+ [Errorf] 15 21
+ [(] 21 22
+ ["%s: not a directory"] 22 43
+ [,] 43 44
+ [parentDir] 45 54
+ [)] 54 55
+L549
+ [}] 3 4
+L550
+ [if] 3 5
+ [err] 6 9
+ [:=] 10 12
+ [subvolSnapshot] 13 27
+ [(] 27 28
+ [parentDir] 28 37
+ [,] 37 38
+ [subvolumes] 39 49
+ [,] 49 50
+ [id] 51 53
+ [)] 53 54
+ [;] 54 55
+ [err] 56 59
+ [!=] 60 62
+ [nil] 63 66
+ [{] 67 68
+L551
+ [return] 4 10
+ [err] 11 14
+L552
+ [}] 3 4
+L553
+ [}] 2 3
+L555
+ [var] 2 5
+ [storageOpt] 6 16
+ [map] 17 20
+ [\[] 20 21
+ [string] 21 27
+ [\]] 27 28
+ [string] 28 34
+L556
+ [if] 2 4
+ [opts] 5 9
+ [!=] 10 12
+ [nil] 13 16
+ [{] 17 18
+L557
+ [storageOpt] 3 13
+ [=] 14 15
+ [opts] 16 20
+ [.] 20 21
+ [StorageOpt] 21 31
+L558
+ [}] 2 3
+L560
+ [if] 2 4
+ [_] 5 6
+ [,] 6 7
+ [ok] 8 10
+ [:=] 11 13
+ [storageOpt] 14 24
+ [\[] 24 25
+ ["size"] 25 31
+ [\]] 31 32
+ [;] 32 33
+ [ok] 34 36
+ [{] 37 38
+L561
+ [driver] 3 9
+ [:=] 10 12
+ [&] 13 14
+ [Driver] 14 20
+ [{] 20 21
+ [}] 21 22
+L562
+ [if] 3 5
+ [err] 6 9
+ [:=] 10 12
+ [d] 13 14
+ [.] 14 15
+ [parseStorageOpt] 15 30
+ [(] 30 31
+ [storageOpt] 31 41
+ [,] 41 42
+ [driver] 43 49
+ [)] 49 50
+ [;] 50 51
+ [err] 52 55
+ [!=] 56 58
+ [nil] 59 62
+ [{] 63 64
+L563
+ [return] 4 10
+ [err] 11 14
+L564
+ [}] 3 4
+L566
+ [if] 3 5
+ [err] 6 9
+ [:=] 10 12
+ [d] 13 14
+ [.] 14 15
+ [setStorageSize] 15 29
+ [(] 29 30
+ [path] 30 34
+ [.] 34 35
+ [Join] 35 39
+ [(] 39 40
+ [subvolumes] 40 50
+ [,] 50 51
+ [id] 52 54
+ [)] 54 55
+ [,] 55 56
+ [driver] 57 63
+ [)] 63 64
+ [;] 64 65
+ [err] 66 69
+ [!=] 70 72
+ [nil] 73 76
+ [{] 77 78
+L567
+ [return] 4 10
+ [err] 11 14
+L568
+ [}] 3 4
+L569
+ [if] 3 5
+ [err] 6 9
+ [:=] 10 12
+ [idtools] 13 20
+ [.] 20 21
+ [MkdirAllAndChown] 21 37
+ [(] 37 38
+ [quotas] 38 44
+ [,] 44 45
+ [0700] 46 50
+ [,] 50 51
+ [idtools] 52 59
+ [.] 59 60
+ [Identity] 60 68
+ [{] 68 69
+ [UID] 69 72
+ [:] 72 73
+ [rootUID] 74 81
+ [,] 81 82
+ [GID] 83 86
+ [:] 86 87
+ [rootGID] 88 95
+ [}] 95 96
+ [)] 96 97
+ [;] 97 98
+ [err] 99 102
+ [!=] 103 105
+ [nil] 106 109
+ [{] 110 111
+L570
+ [return] 4 10
+ [err] 11 14
+L571
+ [}] 3 4
+L572
+ [if] 3 5
+ [err] 6 9
+ [:=] 10 12
+ [ioutil] 13 19
+ [.] 19 20
+ [WriteFile] 20 29
+ [(] 29 30
+ [path] 30 34
+ [.] 34 35
+ [Join] 35 39
+ [(] 39 40
+ [quotas] 40 46
+ [,] 46 47
+ [id] 48 50
+ [)] 50 51
+ [,] 51 52
+ [\[] 53 54
+ [\]] 54 55
+ [byte] 55 59
+ [(] 59 60
+ [fmt] 60 63
+ [.] 63 64
+ [Sprint] 64 70
+ [(] 70 71
+ [driver] 71 77
+ [.] 77 78
+ [options] 78 85
+ [.] 85 86
+ [size] 86 90
+ [)] 90 91
+ [)] 91 92
+ [,] 92 93
+ [0644] 94 98
+ [)] 98 99
+ [;] 99 100
+ [err] 101 104
+ [!=] 105 107
+ [nil] 108 111
+ [{] 112 113
+L573
+ [return] 4 10
+ [err] 11 14
+L574
+ [}] 3 4
+L575
+ [}] 2 3
+L579
+ [if] 2 4
+ [rootUID] 5 12
+ [!=] 13 15
+ [0] 16 17
+ [||] 18 20
+ [rootGID] 21 28
+ [!=] 29 31
+ [0] 32 33
+ [{] 34 35
+L580
+ [if] 3 5
+ [err] 6 9
+ [:=] 10 12
+ [os] 13 15
+ [.] 15 16
+ [Chown] 16 21
+ [(] 21 22
+ [path] 22 26
+ [.] 26 27
+ [Join] 27 31
+ [(] 31 32
+ [subvolumes] 32 42
+ [,] 42 43
+ [id] 44 46
+ [)] 46 47
+ [,] 47 48
+ [rootUID] 49 56
+ [,] 56 57
+ [rootGID] 58 65
+ [)] 65 66
+ [;] 66 67
+ [err] 68 71
+ [!=] 72 74
+ [nil] 75 78
+ [{] 79 80
+L581
+ [return] 4 10
+ [err] 11 14
+L582
+ [}] 3 4
+L583
+ [}] 2 3
+L585
+ [mountLabel] 2 12
+ [:=] 13 15
+ [""] 16 18
+L586
+ [if] 2 4
+ [opts] 5 9
+ [!=] 10 12
+ [nil] 13 16
+ [{] 17 18
+L587
+ [mountLabel] 3 13
+ [=] 14 15
+ [opts] 16 20
+ [.] 20 21
+ [MountLabel] 21 31
+L588
+ [}] 2 3
+L590
+ [return] 2 8
+ [label] 9 14
+ [.] 14 15
+ [Relabel] 15 22
+ [(] 22 23
+ [path] 23 27
+ [.] 27 28
+ [Join] 28 32
+ [(] 32 33
+ [subvolumes] 33 43
+ [,] 43 44
+ [id] 45 47
+ [)] 47 48
+ [,] 48 49
+ [mountLabel] 50 60
+ [,] 60 61
+ [false] 62 67
+ [)] 67 68
+L591
+ [}] 1 2
+L594
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [parseStorageOpt] 18 33
+ [(] 33 34
+ [storageOpt] 34 44
+ [map] 45 48
+ [\[] 48 49
+ [string] 49 55
+ [\]] 55 56
+ [string] 56 62
+ [,] 62 63
+ [driver] 64 70
+ [*] 71 72
+ [Driver] 72 78
+ [)] 78 79
+ [error] 80 85
+ [{] 86 87
+L596
+ [for] 2 5
+ [key] 6 9
+ [,] 9 10
+ [val] 11 14
+ [:=] 15 17
+ [range] 18 23
+ [storageOpt] 24 34
+ [{] 35 36
+L597
+ [key] 3 6
+ [:=] 7 9
+ [strings] 10 17
+ [.] 17 18
+ [ToLower] 18 25
+ [(] 25 26
+ [key] 26 29
+ [)] 29 30
+L598
+ [switch] 3 9
+ [key] 10 13
+ [{] 14 15
+L599
+ [case] 3 7
+ ["size"] 8 14
+ [:] 14 15
+L600
+ [size] 4 8
+ [,] 8 9
+ [err] 10 13
+ [:=] 14 16
+ [units] 17 22
+ [.] 22 23
+ [RAMInBytes] 23 33
+ [(] 33 34
+ [val] 34 37
+ [)] 37 38
+L601
+ [if] 4 6
+ [err] 7 10
+ [!=] 11 13
+ [nil] 14 17
+ [{] 18 19
+L602
+ [return] 5 11
+ [err] 12 15
+L603
+ [}] 4 5
+L604
+ [driver] 4 10
+ [.] 10 11
+ [options] 11 18
+ [.] 18 19
+ [size] 19 23
+ [=] 24 25
+ [uint64] 26 32
+ [(] 32 33
+ [size] 33 37
+ [)] 37 38
+L605
+ [default] 3 10
+ [:] 10 11
+L606
+ [return] 4 10
+ [fmt] 11 14
+ [.] 14 15
+ [Errorf] 15 21
+ [(] 21 22
+ ["Unknown option %s"] 22 41
+ [,] 41 42
+ [key] 43 46
+ [)] 46 47
+L607
+ [}] 3 4
+L608
+ [}] 2 3
+L610
+ [return] 2 8
+ [nil] 9 12
+L611
+ [}] 1 2
+L614
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [setStorageSize] 18 32
+ [(] 32 33
+ [dir] 33 36
+ [string] 37 43
+ [,] 43 44
+ [driver] 45 51
+ [*] 52 53
+ [Driver] 53 59
+ [)] 59 60
+ [error] 61 66
+ [{] 67 68
+L615
+ [if] 2 4
+ [driver] 5 11
+ [.] 11 12
+ [options] 12 19
+ [.] 19 20
+ [size] 20 24
+ [<=] 25 27
+ [0] 28 29
+ [{] 30 31
+L616
+ [return] 3 9
+ [fmt] 10 13
+ [.] 13 14
+ [Errorf] 14 20
+ [(] 20 21
+ ["btrfs: invalid storage size: %s"] 21 54
+ [,] 54 55
+ [units] 56 61
+ [.] 61 62
+ [HumanSize] 62 71
+ [(] 71 72
+ [float64] 72 79
+ [(] 79 80
+ [driver] 80 86
+ [.] 86 87
+ [options] 87 94
+ [.] 94 95
+ [size] 95 99
+ [)] 99 100
+ [)] 100 101
+ [)] 101 102
+L617
+ [}] 2 3
+L618
+ [if] 2 4
+ [d] 5 6
+ [.] 6 7
+ [options] 7 14
+ [.] 14 15
+ [minSpace] 15 23
+ [>] 24 25
+ [0] 26 27
+ [&&] 28 30
+ [driver] 31 37
+ [.] 37 38
+ [options] 38 45
+ [.] 45 46
+ [size] 46 50
+ [<] 51 52
+ [d] 53 54
+ [.] 54 55
+ [options] 55 62
+ [.] 62 63
+ [minSpace] 63 71
+ [{] 72 73
+L619
+ [return] 3 9
+ [fmt] 10 13
+ [.] 13 14
+ [Errorf] 14 20
+ [(] 20 21
+ ["btrfs: storage size cannot be les[ 21 65
+ [,] 65 66
+ [units] 67 72
+ [.] 72 73
+ [HumanSize] 73 82
+ [(] 82 83
+ [float64] 83 90
+ [(] 90 91
+ [d] 91 92
+ [.] 92 93
+ [options] 93 100
+ [.] 100 101
+ [minSpace] 101 109
+ [)] 109 110
+ [)] 110 111
+ [)] 111 112
+L620
+ [}] 2 3
+L621
+ [if] 2 4
+ [err] 5 8
+ [:=] 9 11
+ [d] 12 13
+ [.] 13 14
+ [subvolEnableQuota] 14 31
+ [(] 31 32
+ [)] 32 33
+ [;] 33 34
+ [err] 35 38
+ [!=] 39 41
+ [nil] 42 45
+ [{] 46 47
+L622
+ [return] 3 9
+ [err] 10 13
+L623
+ [}] 2 3
+L624
+ [return] 2 8
+ [subvolLimitQgroup] 9 26
+ [(] 26 27
+ [dir] 27 30
+ [,] 30 31
+ [driver] 32 38
+ [.] 38 39
+ [options] 39 46
+ [.] 46 47
+ [size] 47 51
+ [)] 51 52
+L625
+ [}] 1 2
+L628
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [Remove] 18 24
+ [(] 24 25
+ [id] 25 27
+ [string] 28 34
+ [)] 34 35
+ [error] 36 41
+ [{] 42 43
+L629
+ [dir] 2 5
+ [:=] 6 8
+ [d] 9 10
+ [.] 10 11
+ [subvolumesDirID] 11 26
+ [(] 26 27
+ [id] 27 29
+ [)] 29 30
+L630
+ [if] 2 4
+ [_] 5 6
+ [,] 6 7
+ [err] 8 11
+ [:=] 12 14
+ [os] 15 17
+ [.] 17 18
+ [Stat] 18 22
+ [(] 22 23
+ [dir] 23 26
+ [)] 26 27
+ [;] 27 28
+ [err] 29 32
+ [!=] 33 35
+ [nil] 36 39
+ [{] 40 41
+L631
+ [return] 3 9
+ [err] 10 13
+L632
+ [}] 2 3
+L633
+ [quotasDir] 2 11
+ [:=] 12 14
+ [d] 15 16
+ [.] 16 17
+ [quotasDirID] 17 28
+ [(] 28 29
+ [id] 29 31
+ [)] 31 32
+L634
+ [if] 2 4
+ [_] 5 6
+ [,] 6 7
+ [err] 8 11
+ [:=] 12 14
+ [os] 15 17
+ [.] 17 18
+ [Stat] 18 22
+ [(] 22 23
+ [quotasDir] 23 32
+ [)] 32 33
+ [;] 33 34
+ [err] 35 38
+ [==] 39 41
+ [nil] 42 45
+ [{] 46 47
+L635
+ [if] 3 5
+ [err] 6 9
+ [:=] 10 12
+ [os] 13 15
+ [.] 15 16
+ [Remove] 16 22
+ [(] 22 23
+ [quotasDir] 23 32
+ [)] 32 33
+ [;] 33 34
+ [err] 35 38
+ [!=] 39 41
+ [nil] 42 45
+ [{] 46 47
+L636
+ [return] 4 10
+ [err] 11 14
+L637
+ [}] 3 4
+L638
+ [}] 2 3
+ [else] 4 8
+ [if] 9 11
+ [!] 12 13
+ [os] 13 15
+ [.] 15 16
+ [IsNotExist] 16 26
+ [(] 26 27
+ [err] 27 30
+ [)] 30 31
+ [{] 32 33
+L639
+ [return] 3 9
+ [err] 10 13
+L640
+ [}] 2 3
+L643
+ [d] 2 3
+ [.] 3 4
+ [updateQuotaStatus] 4 21
+ [(] 21 22
+ [)] 22 23
+L645
+ [if] 2 4
+ [err] 5 8
+ [:=] 9 11
+ [subvolDelete] 12 24
+ [(] 24 25
+ [d] 25 26
+ [.] 26 27
+ [subvolumesDir] 27 40
+ [(] 40 41
+ [)] 41 42
+ [,] 42 43
+ [id] 44 46
+ [,] 46 47
+ [d] 48 49
+ [.] 49 50
+ [quotaEnabled] 50 62
+ [)] 62 63
+ [;] 63 64
+ [err] 65 68
+ [!=] 69 71
+ [nil] 72 75
+ [{] 76 77
+L646
+ [return] 3 9
+ [err] 10 13
+L647
+ [}] 2 3
+L648
+ [if] 2 4
+ [err] 5 8
+ [:=] 9 11
+ [system] 12 18
+ [.] 18 19
+ [EnsureRemoveAll] 19 34
+ [(] 34 35
+ [dir] 35 38
+ [)] 38 39
+ [;] 39 40
+ [err] 41 44
+ [!=] 45 47
+ [nil] 48 51
+ [{] 52 53
+L649
+ [return] 3 9
+ [err] 10 13
+L650
+ [}] 2 3
+L651
+ [return] 2 8
+ [d] 9 10
+ [.] 10 11
+ [subvolRescanQuota] 11 28
+ [(] 28 29
+ [)] 29 30
+L652
+ [}] 1 2
+L655
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [Get] 18 21
+ [(] 21 22
+ [id] 22 24
+ [,] 24 25
+ [mountLabel] 26 36
+ [string] 37 43
+ [)] 43 44
+ [(] 45 46
+ [containerfs] 46 57
+ [.] 57 58
+ [ContainerFS] 58 69
+ [,] 69 70
+ [error] 71 76
+ [)] 76 77
+ [{] 78 79
+L656
+ [dir] 2 5
+ [:=] 6 8
+ [d] 9 10
+ [.] 10 11
+ [subvolumesDirID] 11 26
+ [(] 26 27
+ [id] 27 29
+ [)] 29 30
+L657
+ [st] 2 4
+ [,] 4 5
+ [err] 6 9
+ [:=] 10 12
+ [os] 13 15
+ [.] 15 16
+ [Stat] 16 20
+ [(] 20 21
+ [dir] 21 24
+ [)] 24 25
+L658
+ [if] 2 4
+ [err] 5 8
+ [!=] 9 11
+ [nil] 12 15
+ [{] 16 17
+L659
+ [return] 3 9
+ [nil] 10 13
+ [,] 13 14
+ [err] 15 18
+L660
+ [}] 2 3
+L662
+ [if] 2 4
+ [!] 5 6
+ [st] 6 8
+ [.] 8 9
+ [IsDir] 9 14
+ [(] 14 15
+ [)] 15 16
+ [{] 17 18
+L663
+ [return] 3 9
+ [nil] 10 13
+ [,] 13 14
+ [fmt] 15 18
+ [.] 18 19
+ [Errorf] 19 25
+ [(] 25 26
+ ["%s: not a directory"] 26 47
+ [,] 47 48
+ [dir] 49 52
+ [)] 52 53
+L664
+ [}] 2 3
+L666
+ [if] 2 4
+ [quota] 5 10
+ [,] 10 11
+ [err] 12 15
+ [:=] 16 18
+ [ioutil] 19 25
+ [.] 25 26
+ [ReadFile] 26 34
+ [(] 34 35
+ [d] 35 36
+ [.] 36 37
+ [quotasDirID] 37 48
+ [(] 48 49
+ [id] 49 51
+ [)] 51 52
+ [)] 52 53
+ [;] 53 54
+ [err] 55 58
+ [==] 59 61
+ [nil] 62 65
+ [{] 66 67
+L667
+ [if] 3 5
+ [size] 6 10
+ [,] 10 11
+ [err] 12 15
+ [:=] 16 18
+ [strconv] 19 26
+ [.] 26 27
+ [ParseUint] 27 36
+ [(] 36 37
+ [string] 37 43
+ [(] 43 44
+ [quota] 44 49
+ [)] 49 50
+ [,] 50 51
+ [10] 52 54
+ [,] 54 55
+ [64] 56 58
+ [)] 58 59
+ [;] 59 60
+ [err] 61 64
+ [==] 65 67
+ [nil] 68 71
+ [&&] 72 74
+ [size] 75 79
+ [>=] 80 82
+ [d] 83 84
+ [.] 84 85
+ [options] 85 92
+ [.] 92 93
+ [minSpace] 93 101
+ [{] 102 103
+L668
+ [if] 4 6
+ [err] 7 10
+ [:=] 11 13
+ [d] 14 15
+ [.] 15 16
+ [subvolEnableQuota] 16 33
+ [(] 33 34
+ [)] 34 35
+ [;] 35 36
+ [err] 37 40
+ [!=] 41 43
+ [nil] 44 47
+ [{] 48 49
+L669
+ [return] 5 11
+ [nil] 12 15
+ [,] 15 16
+ [err] 17 20
+L670
+ [}] 4 5
+L671
+ [if] 4 6
+ [err] 7 10
+ [:=] 11 13
+ [subvolLimitQgroup] 14 31
+ [(] 31 32
+ [dir] 32 35
+ [,] 35 36
+ [size] 37 41
+ [)] 41 42
+ [;] 42 43
+ [err] 44 47
+ [!=] 48 50
+ [nil] 51 54
+ [{] 55 56
+L672
+ [return] 5 11
+ [nil] 12 15
+ [,] 15 16
+ [err] 17 20
+L673
+ [}] 4 5
+L674
+ [}] 3 4
+L675
+ [}] 2 3
+L677
+ [return] 2 8
+ [containerfs] 9 20
+ [.] 20 21
+ [NewLocalContainerFS] 21 40
+ [(] 40 41
+ [dir] 41 44
+ [)] 44 45
+ [,] 45 46
+ [nil] 47 50
+L678
+ [}] 1 2
+L681
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [Put] 18 21
+ [(] 21 22
+ [id] 22 24
+ [string] 25 31
+ [)] 31 32
+ [error] 33 38
+ [{] 39 40
+L684
+ [return] 2 8
+ [nil] 9 12
+L685
+ [}] 1 2
+L688
+ [func] 1 5
+ [(] 6 7
+ [d] 7 8
+ [*] 9 10
+ [Driver] 10 16
+ [)] 16 17
+ [Exists] 18 24
+ [(] 24 25
+ [id] 25 27
+ [string] 28 34
+ [)] 34 35
+ [bool] 36 40
+ [{] 41 42
+L689
+ [dir] 2 5
+ [:=] 6 8
+ [d] 9 10
+ [.] 10 11
+ [subvolumesDirID] 11 26
+ [(] 26 27
+ [id] 27 29
+ [)] 29 30
+L690
+ [_] 2 3
+ [,] 3 4
+ [err] 5 8
+ [:=] 9 11
+ [os] 12 14
+ [.] 14 15
+ [Stat] 15 19
+ [(] 19 20
+ [dir] 20 23
+ [)] 23 24
+L691
+ [return] 2 8
+ [err] 9 12
+ [==] 13 15
+ [nil] 16 19
+L692
+ [}] 1 2
+EOF
diff --git a/pmd-go/src/test/resources/net/sourceforge/pmd/cpd/hello.go b/pmd-go/src/test/resources/net/sourceforge/pmd/lang/go/cpd/testdata/hello.go
similarity index 100%
rename from pmd-go/src/test/resources/net/sourceforge/pmd/cpd/hello.go
rename to pmd-go/src/test/resources/net/sourceforge/pmd/lang/go/cpd/testdata/hello.go
diff --git a/pmd-go/src/test/resources/net/sourceforge/pmd/lang/go/cpd/testdata/hello.txt b/pmd-go/src/test/resources/net/sourceforge/pmd/lang/go/cpd/testdata/hello.txt
new file mode 100644
index 0000000000..f5c908b261
--- /dev/null
+++ b/pmd-go/src/test/resources/net/sourceforge/pmd/lang/go/cpd/testdata/hello.txt
@@ -0,0 +1,31 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L21
+ [import] 1 7
+ [(] 8 9
+L22
+ ["fmt"] 2 7
+L24
+ ["github.com/golang/example/stringu[ 2 40
+L25
+ [)] 1 2
+L27
+ [func] 1 5
+ [main] 6 10
+ [(] 10 11
+ [)] 11 12
+ [{] 13 14
+L28
+ [fmt] 2 5
+ [.] 5 6
+ [Println] 6 13
+ [(] 13 14
+ [stringutil] 14 24
+ [.] 24 25
+ [Reverse] 25 32
+ [(] 32 33
+ ["!selpmaxe oG ,olleH"] 33 54
+ [)] 54 55
+ [)] 55 56
+L29
+ [}] 1 2
+EOF
diff --git a/pmd-go/src/test/resources/net/sourceforge/pmd/cpd/issue1751.go b/pmd-go/src/test/resources/net/sourceforge/pmd/lang/go/cpd/testdata/issue-1751.go
similarity index 100%
rename from pmd-go/src/test/resources/net/sourceforge/pmd/cpd/issue1751.go
rename to pmd-go/src/test/resources/net/sourceforge/pmd/lang/go/cpd/testdata/issue-1751.go
diff --git a/pmd-go/src/test/resources/net/sourceforge/pmd/lang/go/cpd/testdata/issue-1751.txt b/pmd-go/src/test/resources/net/sourceforge/pmd/lang/go/cpd/testdata/issue-1751.txt
new file mode 100644
index 0000000000..53237260ef
--- /dev/null
+++ b/pmd-go/src/test/resources/net/sourceforge/pmd/lang/go/cpd/testdata/issue-1751.txt
@@ -0,0 +1,84 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [func] 1 5
+ [test] 6 10
+ [(] 10 11
+ [in] 11 13
+ [*] 14 15
+ [Value] 15 20
+ [,] 20 21
+ [param] 22 27
+ [*] 28 29
+ [Value] 29 34
+ [)] 34 35
+ [(] 36 37
+ [*] 37 38
+ [Value] 38 43
+ [,] 43 44
+ [*] 45 46
+ [Error] 46 51
+ [)] 51 52
+ [{] 53 54
+L2
+ [output] 2 8
+ [:=] 9 11
+ [strings] 12 19
+ [.] 19 20
+ [Replace] 20 27
+ [(] 27 28
+ [in] 28 30
+ [.] 30 31
+ [String] 31 37
+ [(] 37 38
+ [)] 38 39
+ [,] 39 40
+ ["\\\\"] 41 45
+ [,] 45 46
+ ["\\\\\\\\"] 47 53
+ [,] 53 54
+ [-] 55 56
+ [1] 56 57
+ [)] 57 58
+L3
+ [output] 2 8
+ [=] 9 10
+ [strings] 11 18
+ [.] 18 19
+ [Replace] 19 26
+ [(] 26 27
+ [output] 27 33
+ [,] 33 34
+ ["\\""] 35 39
+ [,] 39 40
+ ["\\\\\\""] 41 47
+ [,] 47 48
+ [-] 49 50
+ [1] 50 51
+ [)] 51 52
+L4
+ [output] 2 8
+ [=] 9 10
+ [strings] 11 18
+ [.] 18 19
+ [Replace] 19 26
+ [(] 26 27
+ [output] 27 33
+ [,] 33 34
+ ["'"] 35 38
+ [,] 38 39
+ ["\\\\'"] 40 45
+ [,] 45 46
+ [-] 47 48
+ [1] 48 49
+ [)] 49 50
+L5
+ [return] 2 8
+ [AsValue] 9 16
+ [(] 16 17
+ [output] 17 23
+ [)] 23 24
+ [,] 24 25
+ [nil] 26 29
+L6
+ [}] 1 2
+EOF
diff --git a/pmd-groovy/pom.xml b/pmd-groovy/pom.xml
index 3feb7a47e7..f38fadd1cf 100644
--- a/pmd-groovy/pom.xml
+++ b/pmd-groovy/pom.xml
@@ -45,10 +45,20 @@
junit
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
net.sourceforge.pmd
pmd-test
test
+
+ net.sourceforge.pmd
+ pmd-lang-test
+ test
+
diff --git a/pmd-groovy/src/main/java/net/sourceforge/pmd/cpd/GroovyTokenizer.java b/pmd-groovy/src/main/java/net/sourceforge/pmd/cpd/GroovyTokenizer.java
index 4e387cc07f..18a2e94779 100644
--- a/pmd-groovy/src/main/java/net/sourceforge/pmd/cpd/GroovyTokenizer.java
+++ b/pmd-groovy/src/main/java/net/sourceforge/pmd/cpd/GroovyTokenizer.java
@@ -6,6 +6,7 @@ package net.sourceforge.pmd.cpd;
import java.io.StringReader;
+import org.codehaus.groovy.antlr.SourceInfo;
import org.codehaus.groovy.antlr.parser.GroovyLexer;
import net.sourceforge.pmd.lang.ast.TokenMgrError;
@@ -31,8 +32,16 @@ public class GroovyTokenizer implements Tokenizer {
while (token.getType() != Token.EOF_TYPE) {
String tokenText = token.getText();
- TokenEntry tokenEntry = new TokenEntry(tokenText, sourceCode.getFileName(), token.getLine(),
- token.getColumn(), tokenText.length());
+
+
+ int lastCol;
+ if (token instanceof SourceInfo) {
+ lastCol = ((SourceInfo) token).getColumnLast();
+ } else {
+ // fallback
+ lastCol = token.getColumn() + tokenText.length();
+ }
+ TokenEntry tokenEntry = new TokenEntry(tokenText, sourceCode.getFileName(), token.getLine(), token.getColumn(), lastCol);
tokenEntries.add(tokenEntry);
token = tokenStream.nextToken();
diff --git a/pmd-groovy/src/test/java/net/sourceforge/pmd/cpd/GroovyTokenizerTest.java b/pmd-groovy/src/test/java/net/sourceforge/pmd/cpd/GroovyTokenizerTest.java
index 200fecfb80..ba6e2d1d65 100644
--- a/pmd-groovy/src/test/java/net/sourceforge/pmd/cpd/GroovyTokenizerTest.java
+++ b/pmd-groovy/src/test/java/net/sourceforge/pmd/cpd/GroovyTokenizerTest.java
@@ -4,34 +4,30 @@
package net.sourceforge.pmd.cpd;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
+import java.util.Properties;
-import org.apache.commons.io.IOUtils;
-import org.junit.Before;
import org.junit.Test;
-import net.sourceforge.pmd.testframework.AbstractTokenizerTest;
+import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
-public class GroovyTokenizerTest extends AbstractTokenizerTest {
+public class GroovyTokenizerTest extends CpdTextComparisonTest {
- private static final String FILENAME = "BTree.groovy";
-
- @Before
- @Override
- public void buildTokenizer() throws IOException {
- this.tokenizer = new GroovyTokenizer();
- this.sourceCode = new SourceCode(new SourceCode.StringCodeLoader(this.getSampleCode(), FILENAME));
+ public GroovyTokenizerTest() {
+ super(".groovy");
}
@Override
- public String getSampleCode() throws IOException {
- return IOUtils.toString(GroovyTokenizer.class.getResourceAsStream(FILENAME), StandardCharsets.UTF_8);
+ protected String getResourcePrefix() {
+ return "../lang/groovy/cpd/testdata";
+ }
+
+ @Override
+ public Tokenizer newTokenizer(Properties properties) {
+ return new GroovyTokenizer();
}
@Test
- public void tokenizeTest() throws IOException {
- this.expectedTokenCount = 369;
- super.tokenizeTest();
+ public void testSample() {
+ doTest("sample");
}
}
diff --git a/pmd-groovy/src/test/resources/net/sourceforge/pmd/cpd/BTree.groovy b/pmd-groovy/src/test/resources/net/sourceforge/pmd/lang/groovy/cpd/testdata/sample.groovy
similarity index 100%
rename from pmd-groovy/src/test/resources/net/sourceforge/pmd/cpd/BTree.groovy
rename to pmd-groovy/src/test/resources/net/sourceforge/pmd/lang/groovy/cpd/testdata/sample.groovy
diff --git a/pmd-groovy/src/test/resources/net/sourceforge/pmd/lang/groovy/cpd/testdata/sample.txt b/pmd-groovy/src/test/resources/net/sourceforge/pmd/lang/groovy/cpd/testdata/sample.txt
new file mode 100644
index 0000000000..997a1005bd
--- /dev/null
+++ b/pmd-groovy/src/test/resources/net/sourceforge/pmd/lang/groovy/cpd/testdata/sample.txt
@@ -0,0 +1,421 @@
+ [Image] or [Truncated image[ Bcol Ecol
+L1
+ [] 49 1
+L2
+ [package] 1 8
+ [net] 9 12
+ [.] 12 13
+ [sourceforge] 13 24
+ [.] 24 25
+ [pmd] 25 28
+ [.] 28 29
+ [cpd] 29 32
+ [] 32 1
+L7
+ [class] 1 6
+ [BTree] 7 12
+ [<] 12 13
+ [K] 13 14
+ [,] 14 15
+ [V] 16 17
+ [>] 17 18
+ [extends] 19 26
+ [BTreeNode] 27 36
+ [<] 36 37
+ [K] 37 38
+ [>] 38 39
+ [{] 40 41
+ [] 41 2
+L9
+ [static] 2 8
+ [def] 9 12
+ [instance] 13 21
+ [] 21 2
+L11
+ [BlockManager] 2 14
+ [<] 14 15
+ [V] 15 16
+ [>] 16 17
+ [manager] 18 25
+ [] 25 2
+L13
+ [BTree] 2 7
+ [(] 7 8
+ [)] 8 9
+ [{] 10 11
+ [] 11 3
+L14
+ [instance] 3 11
+ [=] 12 13
+ [this] 14 18
+ [] 18 3
+L15
+ [getLeaf] 3 10
+ [(] 10 11
+ [this] 11 15
+ [)] 15 16
+ [] 16 3
+L16
+ [manager] 3 10
+ [=] 11 12
+ [new] 13 16
+ [BlockManager] 17 29
+ [<] 29 30
+ [>] 30 31
+ [(] 31 32
+ [)] 32 33
+ [] 33 2
+L17
+ [}] 2 3
+ [] 3 2
+L19
+ [def] 2 5
+ [split] 6 11
+ [(] 11 12
+ [)] 12 13
+ [{] 14 15
+ [] 15 3
+L22
+ [BTreeNode] 3 12
+ [<] 12 13
+ [K] 13 14
+ [>] 14 15
+ [left] 16 20
+ [=] 21 22
+ [clone] 23 28
+ [(] 28 29
+ [)] 29 30
+ [] 30 3
+L23
+ [BTreeNode] 3 12
+ [<] 12 13
+ [K] 13 14
+ [>] 14 15
+ [right] 16 21
+ [=] 22 23
+ [clone] 24 29
+ [(] 29 30
+ [)] 30 31
+ [] 31 3
+L26
+ [\[] 3 4
+ [left] 4 8
+ [,] 8 9
+ [right] 10 15
+ [\]] 15 16
+ [*.] 16 18
+ [parent] 18 24
+ [=] 25 26
+ [this] 27 31
+ [] 31 3
+L29
+ [left] 3 7
+ [.] 7 8
+ [pointers] 8 16
+ [=] 17 18
+ [pointers] 19 27
+ [.] 27 28
+ [subList] 28 35
+ [(] 35 36
+ [0] 36 37
+ [,] 37 38
+ [count] 39 44
+ [/] 45 46
+ [2] 47 48
+ [as] 49 51
+ [int] 52 55
+ [)] 55 56
+ [as] 57 59
+ [LinkedList] 60 70
+ [] 70 3
+L30
+ [right] 3 8
+ [.] 8 9
+ [pointers] 9 17
+ [=] 18 19
+ [pointers] 20 28
+ [.] 28 29
+ [subList] 29 36
+ [(] 36 37
+ [count] 37 42
+ [/] 43 44
+ [2] 45 46
+ [as] 47 49
+ [int] 50 53
+ [,] 53 54
+ [count] 55 60
+ [)] 60 61
+ [as] 62 64
+ [LinkedList] 65 75
+ [] 75 3
+L33
+ [if] 3 5
+ [(] 6 7
+ [left] 7 11
+ [.] 11 12
+ [internalNode] 12 24
+ [)] 24 25
+ [{] 26 27
+ [] 27 4
+L34
+ [left] 4 8
+ [.] 8 9
+ [pointers] 9 17
+ [\[] 17 18
+ [-] 18 19
+ [1] 19 20
+ [\]] 20 21
+ [.] 21 22
+ [key] 22 25
+ [=] 26 27
+ [null] 28 32
+ [] 32 3
+L35
+ [}] 3 4
+ [] 4 3
+L36
+ [else] 3 7
+ [{] 8 9
+ [] 9 4
+L37
+ [left] 4 8
+ [.] 8 9
+ [rightSibling] 9 21
+ [=] 22 23
+ [right] 24 29
+ [] 29 4
+L38
+ [right] 4 9
+ [.] 9 10
+ [leftSibling] 10 21
+ [=] 22 23
+ [left] 24 28
+ [] 28 3
+L39
+ [}] 3 4
+ [] 4 3
+L42
+ [if] 3 5
+ [(] 6 7
+ [!] 7 8
+ [bucketNode] 8 18
+ [)] 18 19
+ [{] 20 21
+ [] 21 4
+L43
+ [\[] 4 5
+ [left] 5 9
+ [,] 9 10
+ [right] 11 16
+ [\]] 16 17
+ [.] 17 18
+ [each] 18 22
+ [{] 23 24
+ [node] 25 29
+ [->] 30 32
+ [node] 33 37
+ [.] 37 38
+ [pointers] 38 46
+ [*.] 46 48
+ [value] 48 53
+ [*.] 53 55
+ [parent] 55 61
+ [=] 62 63
+ [node] 64 68
+ [}] 69 70
+ [] 70 3
+L44
+ [}] 3 4
+ [] 4 3
+L47
+ [pointers] 3 11
+ [.] 11 12
+ [clear] 12 17
+ [(] 17 18
+ [)] 18 19
+ [] 19 3
+L48
+ [addDirect] 3 12
+ [(] 12 13
+ [new] 13 16
+ [BTreeEntry] 17 27
+ [(] 27 28
+ [right] 28 33
+ [.] 33 34
+ [smallestKey] 34 45
+ [,] 45 46
+ [left] 47 51
+ [)] 51 52
+ [)] 52 53
+ [] 53 3
+L49
+ [addDirect] 3 12
+ [(] 12 13
+ [new] 13 16
+ [BTreeEntry] 17 27
+ [(] 27 28
+ [null] 28 32
+ [,] 32 33
+ [right] 34 39
+ [)] 39 40
+ [)] 40 41
+ [] 41 3
+L52
+ [if] 3 5
+ [(] 6 7
+ [leafNode] 7 15
+ [)] 15 16
+ [{] 17 18
+ [] 18 4
+L53
+ [getPointer] 4 14
+ [(] 14 15
+ [this] 15 19
+ [)] 19 20
+ [] 20 3
+L54
+ [}] 3 4
+ [] 4 2
+L55
+ [}] 2 3
+ [] 3 2
+L57
+ [def] 2 5
+ [add] 6 9
+ [(] 9 10
+ [K] 10 11
+ [key] 12 15
+ [,] 15 16
+ [V] 17 18
+ [value] 19 24
+ [)] 24 25
+ [{] 26 27
+ [] 27 3
+L59
+ [if] 3 5
+ [(] 6 7
+ [count] 7 12
+ [>] 13 14
+ [0] 15 16
+ [&&] 17 19
+ [search] 20 26
+ [(] 26 27
+ [key] 27 30
+ [)] 30 31
+ [)] 31 32
+ [{] 33 34
+ [] 34 4
+L60
+ [throw] 4 9
+ [new] 10 13
+ [IllegalArgumentException] 14 38
+ [(] 38 39
+ [] 39 41
+ [key] 41 44
+ [ is already in the tree] 44 68
+ [)] 68 69
+ [] 69 3
+L61
+ [}] 3 4
+ [] 4 3
+L63
+ [BlockManager] 3 15
+ [.] 15 16
+ [Block] 16 21
+ [.] 21 22
+ [BlockElement] 22 34
+ [<] 34 35
+ [V] 35 36
+ [>] 36 37
+ [element] 38 45
+ [=] 46 47
+ [manager] 48 55
+ [.] 55 56
+ [element] 56 63
+ [] 63 3
+L64
+ [element] 3 10
+ [.] 10 11
+ [value] 11 16
+ [=] 17 18
+ [value] 19 24
+ [] 24 3
+L66
+ [super] 3 8
+ [.] 8 9
+ [add] 9 12
+ [key] 13 16
+ [,] 16 17
+ [element] 18 25
+ [] 25 2
+L67
+ [}] 2 3
+ [] 3 2
+L69
+ [def] 2 5
+ [delete] 6 12
+ [(] 12 13
+ [K] 13 14
+ [key] 15 18
+ [)] 18 19
+ [{] 20 21
+ [] 21 3
+L71
+ [if] 3 5
+ [(] 6 7
+ [count] 7 12
+ [>] 13 14
+ [0] 15 16
+ [&&] 17 19
+ [!] 20 21
+ [search] 21 27
+ [(] 27 28
+ [key] 28 31
+ [)] 31 32
+ [)] 32 33
+ [{] 34 35
+ [] 35 4
+L72
+ [throw] 4 9
+ [new] 10 13
+ [IllegalArgumentException] 14 38
+ [(] 38 39
+ [] 39 41
+ [key] 41 44
+ [ is not in the tree] 44 64
+ [)] 64 65
+ [] 65 3
+L73
+ [}] 3 4
+ [] 4 3
+L75
+ [super] 3 8
+ [.] 8 9
+ [delete] 9 15
+ [key] 16 19
+ [] 19 3
+L77
+ [if] 3 5
+ [(] 6 7
+ [count] 7 12
+ [==] 13 15
+ [0] 16 17
+ [)] 17 18
+ [{] 19 20
+ [] 20 4
+L78
+ [getLeaf] 4 11
+ [(] 11 12
+ [this] 12 16
+ [)] 16 17
+ [] 17 3
+L79
+ [}] 3 4
+ [] 4 2
+L80
+ [}] 2 3
+ [] 3 1
+L81
+ [}] 1 2
+ [] 2 1
+EOF
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NPathComplexityRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NPathComplexityRule.java
index 9260ae6b4f..656cce0fee 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NPathComplexityRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NPathComplexityRule.java
@@ -1,4 +1,4 @@
-/**
+/*
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
@@ -78,7 +78,9 @@ public class NPathComplexityRule extends AbstractJavaMetricsRule {
int npath = (int) MetricsUtil.computeMetric(JavaOperationMetricKey.NPATH, node);
if (npath >= reportLevel) {
addViolation(data, node, new String[] {node instanceof ASTMethodDeclaration ? "method" : "constructor",
- PrettyPrintingUtil.displaySignature(node), "" + npath, });
+ PrettyPrintingUtil.displaySignature(node),
+ String.valueOf(npath),
+ String.valueOf(reportLevel)});
}
return data;
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/AppendCharacterWithCharRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/AppendCharacterWithCharRule.java
index 6f725ef954..9969cabe42 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/AppendCharacterWithCharRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/AppendCharacterWithCharRule.java
@@ -4,6 +4,8 @@
package net.sourceforge.pmd.lang.java.rule.performance;
+import net.sourceforge.pmd.lang.java.ast.ASTAllocationExpression;
+import net.sourceforge.pmd.lang.java.ast.ASTArgumentList;
import net.sourceforge.pmd.lang.java.ast.ASTBlockStatement;
import net.sourceforge.pmd.lang.java.ast.ASTLiteral;
import net.sourceforge.pmd.lang.java.ast.ASTPrimaryExpression;
@@ -25,6 +27,10 @@ import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
*/
public class AppendCharacterWithCharRule extends AbstractJavaRule {
+ public AppendCharacterWithCharRule() {
+ addRuleChainVisit(ASTLiteral.class);
+ }
+
@Override
public Object visit(ASTLiteral node, Object data) {
ASTBlockStatement bs = node.getFirstParentOfType(ASTBlockStatement.class);
@@ -33,7 +39,7 @@ public class AppendCharacterWithCharRule extends AbstractJavaRule {
}
if (node.isSingleCharacterStringLiteral()) {
- if (!InefficientStringBufferingRule.isInStringBufferOperation(node, 8, "append")) {
+ if (!InefficientStringBufferingRule.isInStringBufferOperationChain(node, "append")) {
return data;
}
@@ -42,6 +48,14 @@ public class AppendCharacterWithCharRule extends AbstractJavaRule {
if (primaryExpression != null && primaryExpression.getFirstChildOfType(ASTPrimarySuffix.class) != null) {
return data;
}
+ // ignore, if this literal is part of a different expression, e.g. "X" + something else
+ if (primaryExpression != null && !(primaryExpression.getNthParent(2) instanceof ASTArgumentList)) {
+ return data;
+ }
+ // ignore if this string literal is used as a constructor argument
+ if (primaryExpression != null && primaryExpression.getNthParent(4) instanceof ASTAllocationExpression) {
+ return data;
+ }
addViolation(data, node);
}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/ConsecutiveLiteralAppendsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/ConsecutiveLiteralAppendsRule.java
index 065df94419..bad078608e 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/ConsecutiveLiteralAppendsRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/ConsecutiveLiteralAppendsRule.java
@@ -21,6 +21,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTDoStatement;
import net.sourceforge.pmd.lang.java.ast.ASTFinallyStatement;
import net.sourceforge.pmd.lang.java.ast.ASTForStatement;
import net.sourceforge.pmd.lang.java.ast.ASTIfStatement;
+import net.sourceforge.pmd.lang.java.ast.ASTLambdaExpression;
import net.sourceforge.pmd.lang.java.ast.ASTLiteral;
import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTName;
@@ -78,6 +79,7 @@ public class ConsecutiveLiteralAppendsRule extends AbstractJavaRule {
BLOCK_PARENTS.add(ASTMethodDeclaration.class);
BLOCK_PARENTS.add(ASTCatchStatement.class);
BLOCK_PARENTS.add(ASTFinallyStatement.class);
+ BLOCK_PARENTS.add(ASTLambdaExpression.class);
}
private static final PropertyDescriptor THRESHOLD_DESCRIPTOR
@@ -119,7 +121,7 @@ public class ConsecutiveLiteralAppendsRule extends AbstractJavaRule {
currentBlock = getFirstParentBlock(n);
- if (InefficientStringBufferingRule.isInStringBufferOperation(n, 3, "append")) {
+ if (InefficientStringBufferingRule.isInStringBufferOperationChain(n, "append")) {
// append method call detected
ASTPrimaryExpression s = n.getFirstParentOfType(ASTPrimaryExpression.class);
int numChildren = s.getNumChildren();
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/InefficientStringBufferingRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/InefficientStringBufferingRule.java
index b6151fd576..3850e21101 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/InefficientStringBufferingRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/InefficientStringBufferingRule.java
@@ -4,6 +4,7 @@
package net.sourceforge.pmd.lang.java.rule.performance;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -13,10 +14,14 @@ import net.sourceforge.pmd.lang.java.ast.ASTAllocationExpression;
import net.sourceforge.pmd.lang.java.ast.ASTArgumentList;
import net.sourceforge.pmd.lang.java.ast.ASTBlockStatement;
import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
+import net.sourceforge.pmd.lang.java.ast.ASTConditionalExpression;
import net.sourceforge.pmd.lang.java.ast.ASTFormalParameter;
import net.sourceforge.pmd.lang.java.ast.ASTLiteral;
import net.sourceforge.pmd.lang.java.ast.ASTLocalVariableDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTName;
+import net.sourceforge.pmd.lang.java.ast.ASTPrimaryExpression;
+import net.sourceforge.pmd.lang.java.ast.ASTPrimaryPrefix;
+import net.sourceforge.pmd.lang.java.ast.ASTPrimarySuffix;
import net.sourceforge.pmd.lang.java.ast.ASTPrimitiveType;
import net.sourceforge.pmd.lang.java.ast.ASTStatementExpression;
import net.sourceforge.pmd.lang.java.ast.ASTType;
@@ -35,8 +40,17 @@ import net.sourceforge.pmd.lang.java.typeresolution.TypeHelper;
*/
public class InefficientStringBufferingRule extends AbstractJavaRule {
+ public InefficientStringBufferingRule() {
+ addRuleChainVisit(ASTAdditiveExpression.class);
+ }
+
@Override
public Object visit(ASTAdditiveExpression node, Object data) {
+ if (node.getParent() instanceof ASTConditionalExpression || node.getNthParent(2) instanceof ASTConditionalExpression) {
+ // ignore concats in ternary expressions
+ return data;
+ }
+
ASTBlockStatement bs = node.getFirstParentOfType(ASTBlockStatement.class);
if (bs == null) {
return data;
@@ -58,17 +72,19 @@ public class InefficientStringBufferingRule extends AbstractJavaRule {
}
}
- if (immediateLiterals > 1) {
+ boolean onlyStringLiterals = immediateLiterals == immediateStringLiterals
+ && immediateLiterals == node.getNumChildren();
+ if (onlyStringLiterals) {
return data;
}
- // if literal + public static final, return
+ // if literal + final, return
List nameNodes = node.findDescendantsOfType(ASTName.class);
for (ASTName name : nameNodes) {
if (name.getNameDeclaration() != null && name.getNameDeclaration() instanceof VariableNameDeclaration) {
VariableNameDeclaration vnd = (VariableNameDeclaration) name.getNameDeclaration();
AccessNode accessNodeParent = vnd.getAccessNodeParent();
- if (accessNodeParent.isFinal() && accessNodeParent.isStatic()) {
+ if (accessNodeParent.isFinal()) {
return data;
}
}
@@ -98,8 +114,10 @@ public class InefficientStringBufferingRule extends AbstractJavaRule {
if (isAllocatedStringBuffer(node)) {
addViolation(data, node);
+ } else if (isInStringBufferOperationChain(node, "append")) {
+ addViolation(data, node);
}
- } else if (isInStringBufferOperation(node, 6, "append")) {
+ } else if (isInStringBufferOperationChain(node, "append")) {
addViolation(data, node);
}
return data;
@@ -111,7 +129,7 @@ public class InefficientStringBufferingRule extends AbstractJavaRule {
List types = type.findDescendantsOfType(ASTClassOrInterfaceType.class);
if (!types.isEmpty()) {
ASTClassOrInterfaceType typeDeclaration = types.get(0);
- if (String.class == typeDeclaration.getType() || "String".equals(typeDeclaration.getImage())) {
+ if (TypeHelper.isA(typeDeclaration, String.class)) {
return true;
}
}
@@ -125,19 +143,39 @@ public class InefficientStringBufferingRule extends AbstractJavaRule {
}
private ASTType getTypeNode(ASTName name) {
+ ASTType result = null;
if (name.getNameDeclaration() instanceof VariableNameDeclaration) {
VariableNameDeclaration vnd = (VariableNameDeclaration) name.getNameDeclaration();
if (vnd.getAccessNodeParent() instanceof ASTLocalVariableDeclaration) {
ASTLocalVariableDeclaration l = (ASTLocalVariableDeclaration) vnd.getAccessNodeParent();
- return l.getTypeNode();
+ result = l.getTypeNode();
} else if (vnd.getAccessNodeParent() instanceof ASTFormalParameter) {
ASTFormalParameter p = (ASTFormalParameter) vnd.getAccessNodeParent();
- return p.getTypeNode();
+ result = p.getTypeNode();
}
}
- return null;
+ return result;
}
+ static boolean isInStringBufferOperationChain(Node node, String methodName) {
+ ASTPrimaryExpression expr = node.getFirstParentOfType(ASTPrimaryExpression.class);
+ MethodCallChain methodCalls = MethodCallChain.wrap(expr);
+ while (expr != null && methodCalls == null) {
+ expr = expr.getFirstParentOfType(ASTPrimaryExpression.class);
+ methodCalls = MethodCallChain.wrap(expr);
+ }
+
+ if (methodCalls != null && !methodCalls.isExactlyOfAnyType(StringBuffer.class, StringBuilder.class)) {
+ methodCalls = null;
+ }
+
+ return methodCalls != null && methodCalls.getMethodNames().contains(methodName);
+ }
+
+ /**
+ * @deprecated will be removed with PMD 7
+ */
+ @Deprecated
protected static boolean isInStringBufferOperation(Node node, int length, String methodName) {
if (!(node.getNthParent(length) instanceof ASTStatementExpression)) {
return false;
@@ -174,4 +212,70 @@ public class InefficientStringBufferingRule extends AbstractJavaRule {
ASTClassOrInterfaceType an = ao.getFirstChildOfType(ASTClassOrInterfaceType.class);
return an != null && TypeHelper.isEither(an, StringBuffer.class, StringBuilder.class);
}
+
+ private static class MethodCallChain {
+ private final ASTPrimaryExpression primary;
+
+ private MethodCallChain(ASTPrimaryExpression primary) {
+ this.primary = primary;
+ }
+
+ // Note: The impl here is technically not correct: The type of a method call
+ // chain is the result of the last method called, not the type of the
+ // first receiver object (== PrimaryPrefix).
+ boolean isExactlyOfAnyType(Class clazz, Class ... clazzes) {
+ ASTPrimaryPrefix typeNode = getTypeNode();
+
+ if (TypeHelper.isExactlyA(typeNode, clazz.getName())) {
+ return true;
+ }
+ if (clazzes != null) {
+ for (Class c : clazzes) {
+ if (TypeHelper.isExactlyA(typeNode, c.getName())) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ ASTPrimaryPrefix getTypeNode() {
+ return primary.getFirstChildOfType(ASTPrimaryPrefix.class);
+ }
+
+ List getMethodNames() {
+ List methodNames = new ArrayList<>();
+
+ ASTPrimaryPrefix prefix = getTypeNode();
+ ASTName name = prefix.getFirstChildOfType(ASTName.class);
+ if (name != null) {
+ String firstMethod = name.getImage();
+ int dot = firstMethod.lastIndexOf('.');
+ if (dot != -1) {
+ firstMethod = firstMethod.substring(dot + 1);
+ }
+ methodNames.add(firstMethod);
+ }
+
+ for (ASTPrimarySuffix suffix : primary.findChildrenOfType(ASTPrimarySuffix.class)) {
+ if (suffix.getImage() != null) {
+ methodNames.add(suffix.getImage());
+ }
+ }
+ return methodNames;
+ }
+
+ static MethodCallChain wrap(ASTPrimaryExpression primary) {
+ if (primary != null && isMethodCall(primary)) {
+ return new MethodCallChain(primary);
+ }
+ return null;
+ }
+
+ private static boolean isMethodCall(ASTPrimaryExpression primary) {
+ return primary.getNumChildren() >= 2
+ && primary.getChild(0) instanceof ASTPrimaryPrefix
+ && primary.getChild(1) instanceof ASTPrimarySuffix;
+ }
+ }
}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/InsufficientStringBufferDeclarationRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/InsufficientStringBufferDeclarationRule.java
index 53c1bc4098..e384b66d42 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/InsufficientStringBufferDeclarationRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/InsufficientStringBufferDeclarationRule.java
@@ -73,10 +73,10 @@ public class InsufficientStringBufferDeclarationRule extends AbstractJavaRule {
for (NameOccurrence no : usage) {
JavaNameOccurrence jno = (JavaNameOccurrence) no;
Node n = jno.getLocation();
- if (!InefficientStringBufferingRule.isInStringBufferOperation(n, 3, "append")) {
+ if (!InefficientStringBufferingRule.isInStringBufferOperationChain(n, "append")) {
if (!jno.isOnLeftHandSide()
- && !InefficientStringBufferingRule.isInStringBufferOperation(n, 3, "setLength")) {
+ && !InefficientStringBufferingRule.isInStringBufferOperationChain(n, "setLength")) {
continue;
}
if (constructorLength != -1 && anticipatedLength > constructorLength) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/UseStringBufferForStringAppendsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/UseStringBufferForStringAppendsRule.java
index 88b5cf3b75..283a38d3b0 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/UseStringBufferForStringAppendsRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/UseStringBufferForStringAppendsRule.java
@@ -1,4 +1,4 @@
-/**
+/*
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
@@ -10,27 +10,33 @@ import net.sourceforge.pmd.lang.ast.Node;
import net.sourceforge.pmd.lang.java.ast.ASTArgumentList;
import net.sourceforge.pmd.lang.java.ast.ASTAssignmentOperator;
import net.sourceforge.pmd.lang.java.ast.ASTConditionalExpression;
+import net.sourceforge.pmd.lang.java.ast.ASTDoStatement;
import net.sourceforge.pmd.lang.java.ast.ASTEqualityExpression;
-import net.sourceforge.pmd.lang.java.ast.ASTLocalVariableDeclaration;
+import net.sourceforge.pmd.lang.java.ast.ASTFieldDeclaration;
+import net.sourceforge.pmd.lang.java.ast.ASTForStatement;
+import net.sourceforge.pmd.lang.java.ast.ASTFormalParameter;
import net.sourceforge.pmd.lang.java.ast.ASTName;
import net.sourceforge.pmd.lang.java.ast.ASTPrimaryExpression;
import net.sourceforge.pmd.lang.java.ast.ASTStatementExpression;
import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId;
+import net.sourceforge.pmd.lang.java.ast.ASTWhileStatement;
import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
import net.sourceforge.pmd.lang.java.typeresolution.TypeHelper;
import net.sourceforge.pmd.lang.symboltable.NameOccurrence;
public class UseStringBufferForStringAppendsRule extends AbstractJavaRule {
+ public UseStringBufferForStringAppendsRule() {
+ addRuleChainVisit(ASTVariableDeclaratorId.class);
+ }
+
@Override
public Object visit(ASTVariableDeclaratorId node, Object data) {
- if (!TypeHelper.isA(node, String.class) || node.isArray()) {
- return data;
- }
- Node parent = node.getParent().getParent();
- if (!(parent instanceof ASTLocalVariableDeclaration)) {
+ if (!TypeHelper.isA(node, String.class) || node.isArray()
+ || node.getNthParent(3) instanceof ASTForStatement) {
return data;
}
+
for (NameOccurrence no : node.getUsages()) {
Node name = no.getLocation();
ASTStatementExpression statement = name.getFirstParentOfType(ASTStatementExpression.class);
@@ -47,6 +53,12 @@ public class UseStringBufferForStringAppendsRule extends AbstractJavaRule {
// used in condition
continue;
}
+ if ((node.getNthParent(2) instanceof ASTFieldDeclaration
+ || node.getParent() instanceof ASTFormalParameter)
+ && isNotWithinLoop(name)) {
+ // ignore if the field or formal parameter is *not* used within loops
+ continue;
+ }
ASTConditionalExpression conditional = name.getFirstParentOfType(ASTConditionalExpression.class);
if (conditional != null) {
@@ -80,4 +92,10 @@ public class UseStringBufferForStringAppendsRule extends AbstractJavaRule {
}
return data;
}
+
+ private boolean isNotWithinLoop(Node name) {
+ return name.getFirstParentOfType(ASTForStatement.class) == null
+ && name.getFirstParentOfType(ASTWhileStatement.class) == null
+ && name.getFirstParentOfType(ASTDoStatement.class) == null;
+ }
}
diff --git a/pmd-java/src/main/resources/category/java/codestyle.xml b/pmd-java/src/main/resources/category/java/codestyle.xml
index 62a8c4c589..861b470741 100644
--- a/pmd-java/src/main/resources/category/java/codestyle.xml
+++ b/pmd-java/src/main/resources/category/java/codestyle.xml
@@ -402,7 +402,7 @@ while (true) { // preferred approach
externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_codestyle.html#defaultpackage">
Use explicit scoping instead of accidental usage of default package private level.
-The rule allows methods and fields annotated with Guava's @VisibleForTesting.
+The rule allows methods and fields annotated with Guava's @VisibleForTesting and JUnit 5's annotations.
3
@@ -413,7 +413,17 @@ The rule allows methods and fields annotated with Guava's @VisibleForTesting.
//ClassOrInterfaceDeclaration[@Interface= false()]
/ClassOrInterfaceBody
/ClassOrInterfaceBodyDeclaration
-[not(Annotation//Name[ends-with(@Image, 'VisibleForTesting')])]
+[not(Annotation//Name[
+ pmd-java:typeIs('org.junit.jupiter.api.Test')
+ or pmd-java:typeIs('org.junit.jupiter.api.RepeatedTest')
+ or pmd-java:typeIs('org.junit.jupiter.api.ParameterizedTest')
+ or pmd-java:typeIs('org.junit.jupiter.api.TestFactory')
+ or pmd-java:typeIs('org.junit.jupiter.api.TestTemplate')
+ or pmd-java:typeIs('org.junit.jupiter.api.BeforeAll')
+ or pmd-java:typeIs('org.junit.jupiter.api.AfterAll')
+ or pmd-java:typeIs('org.junit.jupiter.api.BeforeEach')
+ or pmd-java:typeIs('org.junit.jupiter.api.AfterEach')
+ or ends-with(@Image, 'VisibleForTesting')])]
[
FieldDeclaration[@PackagePrivate= true()]
or MethodDeclaration[@PackagePrivate= true()]
@@ -1673,6 +1683,11 @@ Use the diamond operator to let the type be inferred automatically. With the Dia
to avoid duplication of the type parameters.
Instead, the compiler is now able to infer the parameter types for constructor calls,
which makes the code also more readable.
+
+The diamond operator has been introduced with java 7. However, type inference has been improved further
+with java8, rendering more type parameters unnecessary. This is only possible with java8 and the resulting
+code won't compile with java7. If you use java7, make sure to enable `java7Compatibility` for this rule to avoid
+false positives.
3
@@ -1685,15 +1700,17 @@ which makes the code also more readable.
|
//StatementExpression[AssignmentOperator and PrimaryExpression/PrimaryPrefix[not(Expression)]]
)
-/Expression/PrimaryExpression[not(PrimarySuffix) and not(ancestor::ArgumentList)]
+/(Expression | Expression[$java7Compatibility = false()]/ConditionalExpression | Expression[$java7Compatibility = false()]/ConditionalExpression/Expression)
+/PrimaryExpression[not(PrimarySuffix) and not(ancestor::ArgumentList)]
/PrimaryPrefix
/AllocationExpression
[@AnonymousClass=false()]
- [ClassOrInterfaceType/TypeArguments[@Diamond=false() and not(TypeArgument//TypeArguments)]]
+ [ClassOrInterfaceType/TypeArguments[@Diamond=false() and not($java7Compatibility = true() and .//TypeArgument[@Wildcard=true()])]]
[not(ArrayDimsAndInits)]
]]>
+
diff --git a/pmd-java/src/main/resources/category/java/errorprone.xml b/pmd-java/src/main/resources/category/java/errorprone.xml
index fb581bb756..803156fdf4 100644
--- a/pmd-java/src/main/resources/category/java/errorprone.xml
+++ b/pmd-java/src/main/resources/category/java/errorprone.xml
@@ -3486,7 +3486,7 @@ Thread.currentThread().getContextClassLoader() instead.