Trivial refactoring: avoid creating zero length array (cherry picked from commit 02dd6d6)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/247d1ae6 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/247d1ae6 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/247d1ae6 Branch: refs/heads/GROOVY_2_5_X Commit: 247d1ae65bd2d62c92836b3176d7b912c19ceb8d Parents: 2b8407f Author: sunlan <[email protected]> Authored: Mon Apr 2 11:41:42 2018 +0800 Committer: sunlan <[email protected]> Committed: Mon Apr 2 12:35:39 2018 +0800 ---------------------------------------------------------------------- .../asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java | 2 +- .../groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java | 2 +- .../groovy/transform/AutoImplementASTTransformation.java | 2 +- .../groovy/transform/MapConstructorASTTransformation.java | 4 ++-- .../groovy/transform/TupleConstructorASTTransformation.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/247d1ae6/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java index 2c4ba0b..74eef2c 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java +++ b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java @@ -82,7 +82,7 @@ import static org.codehaus.groovy.transform.sc.StaticCompilationVisitor.ARRAYLIS public class StaticTypesBinaryExpressionMultiTypeDispatcher extends BinaryExpressionMultiTypeDispatcher implements Opcodes { private final AtomicInteger labelCounter = new AtomicInteger(); - private static final MethodNode CLOSURE_GETTHISOBJECT_METHOD = CLOSURE_TYPE.getMethod("getThisObject", new Parameter[0]); + private static final MethodNode CLOSURE_GETTHISOBJECT_METHOD = CLOSURE_TYPE.getMethod("getThisObject", Parameter.EMPTY_ARRAY); public StaticTypesBinaryExpressionMultiTypeDispatcher(WriterController wc) { http://git-wip-us.apache.org/repos/asf/groovy/blob/247d1ae6/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java index 7221ba5..a8a8938 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java +++ b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java @@ -100,7 +100,7 @@ public class StaticTypesCallSiteWriter extends CallSiteWriter implements Opcodes private static final MethodNode GROOVYOBJECT_GETPROPERTY_METHOD = GROOVY_OBJECT_TYPE.getMethod("getProperty", new Parameter[]{new Parameter(STRING_TYPE, "propertyName")}); private static final MethodNode INVOKERHELPER_GETPROPERTY_METHOD = INVOKERHELPER_TYPE.getMethod("getProperty", new Parameter[]{new Parameter(OBJECT_TYPE, "object"), new Parameter(STRING_TYPE, "propertyName")}); private static final MethodNode INVOKERHELPER_GETPROPERTYSAFE_METHOD = INVOKERHELPER_TYPE.getMethod("getPropertySafe", new Parameter[]{new Parameter(OBJECT_TYPE, "object"), new Parameter(STRING_TYPE, "propertyName")}); - private static final MethodNode CLOSURE_GETTHISOBJECT_METHOD = CLOSURE_TYPE.getMethod("getThisObject", new Parameter[0]); + private static final MethodNode CLOSURE_GETTHISOBJECT_METHOD = CLOSURE_TYPE.getMethod("getThisObject", Parameter.EMPTY_ARRAY); private static final ClassNode COLLECTION_TYPE = make(Collection.class); private static final MethodNode COLLECTION_SIZE_METHOD = COLLECTION_TYPE.getMethod("size", Parameter.EMPTY_ARRAY); private static final MethodNode MAP_GET_METHOD = MAP_TYPE.getMethod("get", new Parameter[] { new Parameter(OBJECT_TYPE, "key")}); http://git-wip-us.apache.org/repos/asf/groovy/blob/247d1ae6/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java index 8283fc2..0507116 100644 --- a/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java +++ b/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java @@ -85,7 +85,7 @@ public class AutoImplementASTTransformation extends AbstractASTTransformation { } createMethods(cNode, exception, message, (ClosureExpression) code); if (code != null) { - anno.setMember("code", new ClosureExpression(new Parameter[0], new EmptyStatement())); + anno.setMember("code", new ClosureExpression(Parameter.EMPTY_ARRAY, EmptyStatement.INSTANCE)); } } } http://git-wip-us.apache.org/repos/asf/groovy/blob/247d1ae6/src/main/java/org/codehaus/groovy/transform/MapConstructorASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/transform/MapConstructorASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/MapConstructorASTTransformation.java index 9c94c11..9016c16 100644 --- a/src/main/java/org/codehaus/groovy/transform/MapConstructorASTTransformation.java +++ b/src/main/java/org/codehaus/groovy/transform/MapConstructorASTTransformation.java @@ -128,10 +128,10 @@ public class MapConstructorASTTransformation extends AbstractASTTransformation i createConstructors(this, anno, handler, cNode, includeFields, includeProperties, includeSuperProperties, includeSuperFields, noArg, allNames, allProperties, specialNamedArgHandling, includeStatic, excludes, includes, (ClosureExpression) pre, (ClosureExpression) post, source); if (pre != null) { - anno.setMember("pre", new ClosureExpression(new Parameter[0], new EmptyStatement())); + anno.setMember("pre", new ClosureExpression(Parameter.EMPTY_ARRAY, EmptyStatement.INSTANCE)); } if (post != null) { - anno.setMember("post", new ClosureExpression(new Parameter[0], new EmptyStatement())); + anno.setMember("post", new ClosureExpression(new Parameter[0], EmptyStatement.INSTANCE)); } } } http://git-wip-us.apache.org/repos/asf/groovy/blob/247d1ae6/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java index c14075f..94e31f9 100644 --- a/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java +++ b/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java @@ -156,10 +156,10 @@ public class TupleConstructorASTTransformation extends AbstractASTTransformation sourceUnit, handler, (ClosureExpression) pre, (ClosureExpression) post); if (pre != null) { - anno.setMember("pre", new ClosureExpression(new Parameter[0], new EmptyStatement())); + anno.setMember("pre", new ClosureExpression(Parameter.EMPTY_ARRAY, EmptyStatement.INSTANCE)); } if (post != null) { - anno.setMember("post", new ClosureExpression(new Parameter[0], new EmptyStatement())); + anno.setMember("post", new ClosureExpression(Parameter.EMPTY_ARRAY, EmptyStatement.INSTANCE)); } } }
