From 13dacb72ff79db384dd5a93b769d36957911ebc7 Mon Sep 17 00:00:00 2001 From: Danny van Bruggen Date: Sun, 5 Nov 2017 01:42:40 +0100 Subject: [PATCH] Run core generators --- .../java/com/github/javaparser/ast/Node.java | 24 ++++++++++------- .../ast/body/AnnotationMemberDeclaration.java | 2 -- .../ast/body/CallableDeclaration.java | 27 +++++++++++++++---- .../ast/body/ClassOrInterfaceDeclaration.java | 1 - .../ast/body/EnumConstantDeclaration.java | 1 - .../ast/body/MethodDeclaration.java | 1 - .../javaparser/ast/expr/MethodCallExpr.java | 2 +- .../javaparser/ast/visitor/CloneVisitor.java | 5 ++-- .../javaparser/ast/visitor/EqualsVisitor.java | 6 +++-- .../visitor/GenericListVisitorAdapter.java | 15 +++++++---- .../ast/visitor/GenericVisitorAdapter.java | 15 +++++++---- .../ast/visitor/HashCodeVisitor.java | 4 +-- .../ast/visitor/ModifierVisitor.java | 6 +++-- .../ast/visitor/NoCommentEqualsVisitor.java | 6 +++-- .../ast/visitor/NoCommentHashCodeVisitor.java | 4 +-- .../ast/visitor/VoidVisitorAdapter.java | 3 ++- 16 files changed, 79 insertions(+), 43 deletions(-) diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java b/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java index caaf02fde3..4191808216 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java @@ -42,7 +42,6 @@ import com.github.javaparser.printer.PrettyPrinter; import com.github.javaparser.printer.PrettyPrinterConfiguration; import com.github.javaparser.resolution.SymbolResolver; - import javax.annotation.Generated; import java.util.*; import java.util.function.Consumer; @@ -50,12 +49,12 @@ import java.util.function.Predicate; import java.util.stream.Stream; import java.util.stream.StreamSupport; - import static com.github.javaparser.ast.Node.Parsedness.PARSED; import static com.github.javaparser.ast.Node.TreeTraversal.PREORDER; import static java.util.Collections.unmodifiableList; import static java.util.Spliterator.DISTINCT; import static java.util.Spliterator.NONNULL; +import com.github.javaparser.ast.Node; /** * Base class for all nodes of the abstract syntax tree. @@ -688,13 +687,13 @@ protected SymbolResolver getSymbolResolver() { public static final DataKey SYMBOL_RESOLVER_KEY = new DataKey() { }; - public enum TreeTraversal { + PREORDER, BREADTHFIRST, POSTORDER, PARENTS, DIRECT_CHILDREN } private Iterator treeIterator(TreeTraversal traversal) { - switch (traversal) { + switch(traversal) { case BREADTHFIRST: return new BreadthFirstIterator(this); case POSTORDER: @@ -709,7 +708,7 @@ private Iterator treeIterator(TreeTraversal traversal) { throw new IllegalArgumentException("Unknown traversal choice."); } } - + private Iterable treeIterable(TreeTraversal traversal) { return () -> treeIterator(traversal); } @@ -738,7 +737,7 @@ public void walk(TreeTraversal traversal, Consumer consumer) { consumer.accept(node); } } - + /** * Walks the AST, calling the consumer for every node with pre-order traversal. */ @@ -772,7 +771,8 @@ public List findAll(Class nodeType) { public List findAll(Class nodeType, Predicate predicate) { final List found = new ArrayList<>(); walk(nodeType, n -> { - if (predicate.test(n)) found.add(n); + if (predicate.test(n)) + found.add(n); }); return found; } @@ -840,6 +840,7 @@ public Optional findParent(Class nodeType) { * @see Breadth-first traversal */ public static class BreadthFirstIterator implements Iterator { + private final Queue queue = new LinkedList<>(); public BreadthFirstIterator(Node node) { @@ -863,6 +864,7 @@ public Node next() { * Performs a simple traversal over all nodes that have the passed node as their parent. */ public static class DirectChildrenIterator implements Iterator { + private final Iterator childrenIterator; public DirectChildrenIterator(Node node) { @@ -885,6 +887,7 @@ public Node next() { * out of parents. */ public static class ParentsVisitor implements Iterator { + private Node node; public ParentsVisitor(Node node) { @@ -909,6 +912,7 @@ public Node next() { * @see Pre-order traversal */ public static class PreOrderIterator implements Iterator { + private final Stack stack = new Stack<>(); public PreOrderIterator(Node node) { @@ -937,9 +941,13 @@ public Node next() { * @see Post-order traversal */ public static class PostOrderIterator implements Iterator { + private final Stack> nodesStack = new Stack<>(); + private final Stack cursorStack = new Stack<>(); + private final Node root; + private boolean hasNext = true; public PostOrderIterator(Node root) { @@ -991,6 +999,4 @@ private Node nextFromLevel() { return nodes.get(cursor); } } - - } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java index b0ba86328c..fdf9d92017 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java @@ -44,12 +44,10 @@ import com.github.javaparser.resolution.Resolvable; import com.github.javaparser.resolution.declarations.ResolvedAnnotationMemberDeclaration; import com.github.javaparser.resolution.declarations.ResolvedConstructorDeclaration; - import javax.annotation.Generated; import java.util.EnumSet; import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java index 61f607fb94..36d1d8f382 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java @@ -43,7 +43,6 @@ import static com.github.javaparser.utils.Utils.assertNotNull; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; - import java.util.Optional; import java.util.function.Consumer; @@ -73,7 +72,7 @@ public abstract class CallableDeclaration> exte * This constructor is used by the parser and is considered private. */ @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator") - CallableDeclaration(TokenRange tokenRange, EnumSet modifiers, NodeList annotations, NodeList typeParameters, SimpleName name, NodeList parameters, NodeList thrownExceptions, ReceiverParameter receiverParameter) { + public CallableDeclaration(TokenRange tokenRange, EnumSet modifiers, NodeList annotations, NodeList typeParameters, SimpleName name, NodeList parameters, NodeList thrownExceptions, ReceiverParameter receiverParameter) { super(tokenRange, annotations); setModifiers(modifiers); setTypeParameters(typeParameters); @@ -225,6 +224,12 @@ public boolean remove(Node node) { return true; } } + if (receiverParameter != null) { + if (node == receiverParameter) { + removeReceiverParameter(); + return true; + } + } for (int i = 0; i < thrownExceptions.size(); i++) { if (thrownExceptions.get(i) == node) { thrownExceptions.remove(i); @@ -351,6 +356,12 @@ public boolean replace(Node node, Node replacementNode) { return true; } } + if (receiverParameter != null) { + if (node == receiverParameter) { + setReceiverParameter((ReceiverParameter) replacementNode); + return true; + } + } for (int i = 0; i < thrownExceptions.size(); i++) { if (thrownExceptions.get(i) == node) { thrownExceptions.set(i, (ReferenceType) replacementNode); @@ -388,16 +399,22 @@ public Optional getReceiverParameter() { return Optional.ofNullable(receiverParameter); } + @SuppressWarnings("unchecked") @Generated("com.github.javaparser.generator.core.node.PropertyGenerator") - public CallableDeclaration setReceiverParameter(final ReceiverParameter receiverParameter) { + public T setReceiverParameter(final ReceiverParameter receiverParameter) { if (receiverParameter == this.receiverParameter) { - return (CallableDeclaration) this; + return (T) this; } notifyPropertyChange(ObservableProperty.RECEIVER_PARAMETER, this.receiverParameter, receiverParameter); if (this.receiverParameter != null) this.receiverParameter.setParentNode(null); this.receiverParameter = receiverParameter; setAsParentNodeOf(receiverParameter); - return this; + return (T) this; + } + + @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator") + public CallableDeclaration removeReceiverParameter() { + return setReceiverParameter((ReceiverParameter) null); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java index 3c9b0af530..91b9614df0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java @@ -45,7 +45,6 @@ import com.github.javaparser.resolution.Resolvable; import com.github.javaparser.resolution.declarations.ResolvedAnnotationDeclaration; import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration; - import javax.annotation.Generated; import java.util.EnumSet; import static com.github.javaparser.utils.Utils.assertNotNull; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java index 6b475cc894..40be67fd1c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java @@ -43,7 +43,6 @@ import com.github.javaparser.resolution.Resolvable; import com.github.javaparser.resolution.declarations.ResolvedConstructorDeclaration; import com.github.javaparser.resolution.declarations.ResolvedEnumConstantDeclaration; - import java.util.function.Consumer; /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java index 658a2d8efb..8b7c117b12 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java @@ -101,7 +101,6 @@ public MethodDeclaration(TokenRange tokenRange, EnumSet modifiers, Nod super(tokenRange, modifiers, annotations, typeParameters, name, parameters, thrownExceptions, receiverParameter); setType(type); setBody(body); - setReceiverParameter(receiverParameter); customInitialization(); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java index ca28f9ae48..4e2b454335 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java @@ -63,7 +63,7 @@ public MethodCallExpr() { public MethodCallExpr(String name, Expression... arguments) { this(null, null, new NodeList<>(), new SimpleName(name), new NodeList<>(arguments)); } - + public MethodCallExpr(final Expression scope, final String name) { this(null, scope, new NodeList<>(), new SimpleName(name), new NodeList<>()); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java index 43cd1487ff..e5b88e1a1f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java @@ -185,11 +185,12 @@ public Visitable visit(final ConstructorDeclaration n, final Object arg) { BlockStmt body = cloneNode(n.getBody(), arg); SimpleName name = cloneNode(n.getName(), arg); NodeList parameters = cloneList(n.getParameters(), arg); + ReceiverParameter receiverParameter = cloneNode(n.getReceiverParameter(), arg); NodeList thrownExceptions = cloneList(n.getThrownExceptions(), arg); NodeList typeParameters = cloneList(n.getTypeParameters(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); Comment comment = cloneNode(n.getComment(), arg); - ConstructorDeclaration r = new ConstructorDeclaration(n.getTokenRange().orElse(null), n.getModifiers(), annotations, typeParameters, name, parameters, thrownExceptions, body, null); + ConstructorDeclaration r = new ConstructorDeclaration(n.getTokenRange().orElse(null), n.getModifiers(), annotations, typeParameters, name, parameters, thrownExceptions, body, receiverParameter); r.setComment(comment); return r; } @@ -198,10 +199,10 @@ public Visitable visit(final ConstructorDeclaration n, final Object arg) { @Generated("com.github.javaparser.generator.core.visitor.CloneVisitorGenerator") public Visitable visit(final MethodDeclaration n, final Object arg) { BlockStmt body = cloneNode(n.getBody(), arg); - ReceiverParameter receiverParameter = cloneNode(n.getReceiverParameter(), arg); Type type = cloneNode(n.getType(), arg); SimpleName name = cloneNode(n.getName(), arg); NodeList parameters = cloneList(n.getParameters(), arg); + ReceiverParameter receiverParameter = cloneNode(n.getReceiverParameter(), arg); NodeList thrownExceptions = cloneList(n.getThrownExceptions(), arg); NodeList typeParameters = cloneList(n.getTypeParameters(), arg); NodeList annotations = cloneList(n.getAnnotations(), arg); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java index 72e7afcc1c..49a2ee2787 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java @@ -338,6 +338,8 @@ public Boolean visit(final ConstructorDeclaration n, final Visitable arg) { return false; if (!nodesEquals(n.getParameters(), n2.getParameters())) return false; + if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) + return false; if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) return false; if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) @@ -355,8 +357,6 @@ public Boolean visit(final MethodDeclaration n, final Visitable arg) { final MethodDeclaration n2 = (MethodDeclaration) arg; if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) - return false; if (!nodeEquals(n.getType(), n2.getType())) return false; if (!objEquals(n.getModifiers(), n2.getModifiers())) @@ -365,6 +365,8 @@ public Boolean visit(final MethodDeclaration n, final Visitable arg) { return false; if (!nodesEquals(n.getParameters(), n2.getParameters())) return false; + if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) + return false; if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) return false; if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapter.java index b6cad5bae8..14ae6c5b5b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapter.java @@ -562,6 +562,11 @@ public List visit(final ConstructorDeclaration n, final A arg) { if (tmp != null) result.addAll(tmp); } + if (n.getReceiverParameter().isPresent()) { + tmp = n.getReceiverParameter().get().accept(this, arg); + if (tmp != null) + result.addAll(tmp); + } { tmp = n.getThrownExceptions().accept(this, arg); if (tmp != null) @@ -1185,11 +1190,6 @@ public List visit(final MethodDeclaration n, final A arg) { if (tmp != null) result.addAll(tmp); } - if (n.getReceiverParameter().isPresent()) { - tmp = n.getReceiverParameter().get().accept(this, arg); - if (tmp != null) - result.addAll(tmp); - } { tmp = n.getType().accept(this, arg); if (tmp != null) @@ -1205,6 +1205,11 @@ public List visit(final MethodDeclaration n, final A arg) { if (tmp != null) result.addAll(tmp); } + if (n.getReceiverParameter().isPresent()) { + tmp = n.getReceiverParameter().get().accept(this, arg); + if (tmp != null) + result.addAll(tmp); + } { tmp = n.getThrownExceptions().accept(this, arg); if (tmp != null) diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java index 14872667c9..5b4bf55c0f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java @@ -502,6 +502,11 @@ public R visit(final ConstructorDeclaration n, final A arg) { if (result != null) return result; } + if (n.getReceiverParameter().isPresent()) { + result = n.getReceiverParameter().get().accept(this, arg); + if (result != null) + return result; + } { result = n.getThrownExceptions().accept(this, arg); if (result != null) @@ -1035,11 +1040,6 @@ public R visit(final MethodDeclaration n, final A arg) { if (result != null) return result; } - if (n.getReceiverParameter().isPresent()) { - result = n.getReceiverParameter().get().accept(this, arg); - if (result != null) - return result; - } { result = n.getType().accept(this, arg); if (result != null) @@ -1055,6 +1055,11 @@ public R visit(final MethodDeclaration n, final A arg) { if (result != null) return result; } + if (n.getReceiverParameter().isPresent()) { + result = n.getReceiverParameter().get().accept(this, arg); + if (result != null) + return result; + } { result = n.getThrownExceptions().accept(this, arg); if (result != null) diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/HashCodeVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/HashCodeVisitor.java index 0b4f346b64..2a12b7f69f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/HashCodeVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/HashCodeVisitor.java @@ -159,7 +159,7 @@ public Integer visit(final ConditionalExpr n, final Void arg) { @Generated("com.github.javaparser.generator.core.visitor.HashCodeVisitorGenerator") public Integer visit(final ConstructorDeclaration n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 + (n.getModifiers().hashCode()) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + return (n.getBody().accept(this, arg)) * 31 + (n.getModifiers().hashCode()) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Generated("com.github.javaparser.generator.core.visitor.HashCodeVisitorGenerator") @@ -304,7 +304,7 @@ public Integer visit(final MethodCallExpr n, final Void arg) { @Generated("com.github.javaparser.generator.core.visitor.HashCodeVisitorGenerator") public Integer visit(final MethodDeclaration n, final Void arg) { - return (n.getBody().isPresent() ? n.getBody().get().accept(this, arg) : 0) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getModifiers().hashCode()) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); + return (n.getBody().isPresent() ? n.getBody().get().accept(this, arg) : 0) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getModifiers().hashCode()) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0); } @Generated("com.github.javaparser.generator.core.visitor.HashCodeVisitorGenerator") diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitor.java index 5a62f025a1..0a86190556 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitor.java @@ -321,6 +321,7 @@ public Visitable visit(final ConstructorDeclaration n, final A arg) { BlockStmt body = (BlockStmt) n.getBody().accept(this, arg); SimpleName name = (SimpleName) n.getName().accept(this, arg); NodeList parameters = modifyList(n.getParameters(), arg); + ReceiverParameter receiverParameter = n.getReceiverParameter().map(s -> (ReceiverParameter) s.accept(this, arg)).orElse(null); NodeList thrownExceptions = modifyList(n.getThrownExceptions(), arg); NodeList typeParameters = modifyList(n.getTypeParameters(), arg); NodeList annotations = modifyList(n.getAnnotations(), arg); @@ -330,6 +331,7 @@ public Visitable visit(final ConstructorDeclaration n, final A arg) { n.setBody(body); n.setName(name); n.setParameters(parameters); + n.setReceiverParameter(receiverParameter); n.setThrownExceptions(thrownExceptions); n.setTypeParameters(typeParameters); n.setAnnotations(annotations); @@ -647,10 +649,10 @@ public Visitable visit(final MethodCallExpr n, final A arg) { @Generated("com.github.javaparser.generator.core.visitor.ModifierVisitorGenerator") public Visitable visit(final MethodDeclaration n, final A arg) { BlockStmt body = n.getBody().map(s -> (BlockStmt) s.accept(this, arg)).orElse(null); - ReceiverParameter receiverParameter = n.getReceiverParameter().map(s -> (ReceiverParameter) s.accept(this, arg)).orElse(null); Type type = (Type) n.getType().accept(this, arg); SimpleName name = (SimpleName) n.getName().accept(this, arg); NodeList parameters = modifyList(n.getParameters(), arg); + ReceiverParameter receiverParameter = n.getReceiverParameter().map(s -> (ReceiverParameter) s.accept(this, arg)).orElse(null); NodeList thrownExceptions = modifyList(n.getThrownExceptions(), arg); NodeList typeParameters = modifyList(n.getTypeParameters(), arg); NodeList annotations = modifyList(n.getAnnotations(), arg); @@ -658,10 +660,10 @@ public Visitable visit(final MethodDeclaration n, final A arg) { if (type == null || name == null) return null; n.setBody(body); - n.setReceiverParameter(receiverParameter); n.setType(type); n.setName(name); n.setParameters(parameters); + n.setReceiverParameter(receiverParameter); n.setThrownExceptions(thrownExceptions); n.setTypeParameters(typeParameters); n.setAnnotations(annotations); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentEqualsVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentEqualsVisitor.java index b7a9914df9..8e68629955 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentEqualsVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentEqualsVisitor.java @@ -267,6 +267,8 @@ public Boolean visit(final ConstructorDeclaration n, final Visitable arg) { return false; if (!nodesEquals(n.getParameters(), n2.getParameters())) return false; + if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) + return false; if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) return false; if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) @@ -282,8 +284,6 @@ public Boolean visit(final MethodDeclaration n, final Visitable arg) { final MethodDeclaration n2 = (MethodDeclaration) arg; if (!nodeEquals(n.getBody(), n2.getBody())) return false; - if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) - return false; if (!nodeEquals(n.getType(), n2.getType())) return false; if (!objEquals(n.getModifiers(), n2.getModifiers())) @@ -292,6 +292,8 @@ public Boolean visit(final MethodDeclaration n, final Visitable arg) { return false; if (!nodesEquals(n.getParameters(), n2.getParameters())) return false; + if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) + return false; if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) return false; if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitor.java index e23beae796..914391c901 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitor.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitor.java @@ -151,7 +151,7 @@ public Integer visit(final ConditionalExpr n, final Void arg) { @Generated("com.github.javaparser.generator.core.visitor.NoCommentHashCodeVisitorGenerator") public Integer visit(final ConstructorDeclaration n, final Void arg) { - return (n.getBody().accept(this, arg)) * 31 + (n.getModifiers().hashCode()) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); + return (n.getBody().accept(this, arg)) * 31 + (n.getModifiers().hashCode()) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } @Generated("com.github.javaparser.generator.core.visitor.NoCommentHashCodeVisitorGenerator") @@ -296,7 +296,7 @@ public Integer visit(final MethodCallExpr n, final Void arg) { @Generated("com.github.javaparser.generator.core.visitor.NoCommentHashCodeVisitorGenerator") public Integer visit(final MethodDeclaration n, final Void arg) { - return (n.getBody().isPresent() ? n.getBody().get().accept(this, arg) : 0) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getModifiers().hashCode()) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); + return (n.getBody().isPresent() ? n.getBody().get().accept(this, arg) : 0) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getModifiers().hashCode()) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)); } @Generated("com.github.javaparser.generator.core.visitor.NoCommentHashCodeVisitorGenerator") diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java index 02f530a9ab..6ece2a3026 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java @@ -208,6 +208,7 @@ public void visit(final ConstructorDeclaration n, final A arg) { n.getBody().accept(this, arg); n.getName().accept(this, arg); n.getParameters().forEach(p -> p.accept(this, arg)); + n.getReceiverParameter().ifPresent(l -> l.accept(this, arg)); n.getThrownExceptions().forEach(p -> p.accept(this, arg)); n.getTypeParameters().forEach(p -> p.accept(this, arg)); n.getAnnotations().forEach(p -> p.accept(this, arg)); @@ -407,10 +408,10 @@ public void visit(final MethodCallExpr n, final A arg) { @Generated("com.github.javaparser.generator.core.visitor.VoidVisitorAdapterGenerator") public void visit(final MethodDeclaration n, final A arg) { n.getBody().ifPresent(l -> l.accept(this, arg)); - n.getReceiverParameter().ifPresent(l -> l.accept(this, arg)); n.getType().accept(this, arg); n.getName().accept(this, arg); n.getParameters().forEach(p -> p.accept(this, arg)); + n.getReceiverParameter().ifPresent(l -> l.accept(this, arg)); n.getThrownExceptions().forEach(p -> p.accept(this, arg)); n.getTypeParameters().forEach(p -> p.accept(this, arg)); n.getAnnotations().forEach(p -> p.accept(this, arg));