You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2021/08/07 19:23:38 UTC
[groovy] branch master updated (225a49e -> 7349f79)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 225a49e Support Java17
new f6b49fa Trivial refactoring: remove redundant initializer
new 90bea6c Trivial refactoring: extract constant
new 7349f79 Trivial refactoring: make field `final`
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/java/org/codehaus/groovy/ast/ClassNode.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
[groovy] 02/03: Trivial refactoring: extract constant
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 90bea6cf28710d5b66a0725c83d4fa2f1f68ef2d
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Aug 8 03:21:02 2021 +0800
Trivial refactoring: extract constant
---
src/main/java/org/codehaus/groovy/ast/ClassNode.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/ast/ClassNode.java b/src/main/java/org/codehaus/groovy/ast/ClassNode.java
index c938762..8e22643 100644
--- a/src/main/java/org/codehaus/groovy/ast/ClassNode.java
+++ b/src/main/java/org/codehaus/groovy/ast/ClassNode.java
@@ -121,6 +121,7 @@ import static org.objectweb.asm.Opcodes.ACC_SYNTHETIC;
* @see org.codehaus.groovy.ast.ClassHelper
*/
public class ClassNode extends AnnotatedNode {
+ private static final String CLINIT = "<clinit>";
private static class MapOfLists {
Map<Object, List<MethodNode>> map;
@@ -804,9 +805,9 @@ public class ClassNode extends AnnotatedNode {
private MethodNode getOrAddStaticConstructorNode() {
MethodNode method;
- List<MethodNode> declaredMethods = getDeclaredMethods("<clinit>");
+ List<MethodNode> declaredMethods = getDeclaredMethods(CLINIT);
if (declaredMethods.isEmpty()) {
- method = addMethod("<clinit>", ACC_STATIC, ClassHelper.VOID_TYPE, Parameter.EMPTY_ARRAY, ClassNode.EMPTY_ARRAY, new BlockStatement());
+ method = addMethod(CLINIT, ACC_STATIC, ClassHelper.VOID_TYPE, Parameter.EMPTY_ARRAY, ClassNode.EMPTY_ARRAY, new BlockStatement());
method.setSynthetic(true);
} else {
method = declaredMethods.get(0);
[groovy] 01/03: Trivial refactoring: remove redundant initializer
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit f6b49fa6f637a4ffcb438e1aa58e1bf3cbe050b1
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Aug 8 03:19:33 2021 +0800
Trivial refactoring: remove redundant initializer
---
src/main/java/org/codehaus/groovy/ast/ClassNode.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/groovy/ast/ClassNode.java b/src/main/java/org/codehaus/groovy/ast/ClassNode.java
index e7bf99a..c938762 100644
--- a/src/main/java/org/codehaus/groovy/ast/ClassNode.java
+++ b/src/main/java/org/codehaus/groovy/ast/ClassNode.java
@@ -803,7 +803,7 @@ public class ClassNode extends AnnotatedNode {
}
private MethodNode getOrAddStaticConstructorNode() {
- MethodNode method = null;
+ MethodNode method;
List<MethodNode> declaredMethods = getDeclaredMethods("<clinit>");
if (declaredMethods.isEmpty()) {
method = addMethod("<clinit>", ACC_STATIC, ClassHelper.VOID_TYPE, Parameter.EMPTY_ARRAY, ClassNode.EMPTY_ARRAY, new BlockStatement());
[groovy] 03/03: Trivial refactoring: make field `final`
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 7349f79639ae6a81b8c31333df7a680239402886
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Aug 8 03:23:15 2021 +0800
Trivial refactoring: make field `final`
---
src/main/java/org/codehaus/groovy/ast/ClassNode.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/groovy/ast/ClassNode.java b/src/main/java/org/codehaus/groovy/ast/ClassNode.java
index 8e22643..a7be838 100644
--- a/src/main/java/org/codehaus/groovy/ast/ClassNode.java
+++ b/src/main/java/org/codehaus/groovy/ast/ClassNode.java
@@ -153,7 +153,7 @@ public class ClassNode extends AnnotatedNode {
private MixinNode[] mixins;
private List<Statement> objectInitializers;
private List<ConstructorNode> constructors;
- private MapOfLists methods;
+ private final MapOfLists methods;
private List<MethodNode> methodsList;
private List<FieldNode> fields;
private List<PropertyNode> properties;