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 2018/04/02 16:07:05 UTC
groovy git commit: Trivial refactoring: simplify collection
initialization and avoid calling `toArray` with pre-sized array parameter
Repository: groovy
Updated Branches:
refs/heads/master 08c197a0d -> 5d9132156
Trivial refactoring: simplify collection initialization and avoid calling `toArray` with pre-sized array parameter
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/5d913215
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/5d913215
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/5d913215
Branch: refs/heads/master
Commit: 5d91321562a1158b7463ed1749ce04eecc72858e
Parents: 08c197a
Author: sunlan <su...@apache.org>
Authored: Tue Apr 3 00:06:53 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Tue Apr 3 00:06:53 2018 +0800
----------------------------------------------------------------------
src/main/java/org/codehaus/groovy/reflection/CachedClass.java | 2 +-
src/main/java/org/codehaus/groovy/reflection/CachedMethod.java | 1 +
.../org/codehaus/groovy/transform/CategoryASTTransformation.java | 3 +--
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/5d913215/src/main/java/org/codehaus/groovy/reflection/CachedClass.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/reflection/CachedClass.java b/src/main/java/org/codehaus/groovy/reflection/CachedClass.java
index 1c285c9..c5ca547 100644
--- a/src/main/java/org/codehaus/groovy/reflection/CachedClass.java
+++ b/src/main/java/org/codehaus/groovy/reflection/CachedClass.java
@@ -155,7 +155,7 @@ public class CachedClass {
for (int i = 0; i != superMopMethods.length; ++i)
mopMethods.add(superMopMethods[i]);
}
- CachedClass.this.mopMethods = mopMethods.toArray(new CachedMethod[mopMethods.size()]);
+ CachedClass.this.mopMethods = mopMethods.toArray(CachedMethod.EMPTY_ARRAY);
Arrays.sort(CachedClass.this.mopMethods, CachedMethodComparatorByName.INSTANCE);
return resMethods;
http://git-wip-us.apache.org/repos/asf/groovy/blob/5d913215/src/main/java/org/codehaus/groovy/reflection/CachedMethod.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/reflection/CachedMethod.java b/src/main/java/org/codehaus/groovy/reflection/CachedMethod.java
index 58314e2..6014c85 100644
--- a/src/main/java/org/codehaus/groovy/reflection/CachedMethod.java
+++ b/src/main/java/org/codehaus/groovy/reflection/CachedMethod.java
@@ -42,6 +42,7 @@ import java.util.Comparator;
* @author Alex.Tkachman
*/
public class CachedMethod extends MetaMethod implements Comparable {
+ public static final CachedMethod[] EMPTY_ARRAY = new CachedMethod[0];
public final CachedClass cachedClass;
private final Method cachedMethod;
http://git-wip-us.apache.org/repos/asf/groovy/blob/5d913215/src/main/java/org/codehaus/groovy/transform/CategoryASTTransformation.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/transform/CategoryASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/CategoryASTTransformation.java
index 1affbf0..6189c1c 100644
--- a/src/main/java/org/codehaus/groovy/transform/CategoryASTTransformation.java
+++ b/src/main/java/org/codehaus/groovy/transform/CategoryASTTransformation.java
@@ -134,8 +134,7 @@ public class CategoryASTTransformation implements ASTTransformation, Opcodes {
@Override
public void visitBlockStatement(BlockStatement block) {
- Set<String> names = new HashSet<String>();
- names.addAll(varStack.getLast());
+ Set<String> names = new HashSet<String>(varStack.getLast());
varStack.add(names);
super.visitBlockStatement(block);
varStack.remove(names);