[2/2] groovy git commit: Trivial refactoring: cleanup code
Trivial refactoring: cleanup code (cherry picked from commit 75a16a0) Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/021ab0fb Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/021ab0fb Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/021ab0fb Branch: refs/heads/GROOVY_2_5_X Commit: 021ab0fba64e3bb246ca52772ac6b41371dd8ffb Parents: f02978c Author: danielsun1106 Authored: Mon Feb 19 23:23:25 2018 +0800 Committer: danielsun1106 Committed: Mon Feb 19 23:54:11 2018 +0800 -- src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java | 1 - .../java/org/codehaus/groovy/classgen/AnnotationVisitor.java| 5 - .../codehaus/groovy/classgen/asm/OptimizingStatementWriter.java | 3 +-- .../groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java | 1 - src/main/java/org/codehaus/groovy/control/ResolveVisitor.java | 1 - .../org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java | 1 - .../transform/AbstractInterruptibleASTTransformation.java | 2 +- src/main/java/org/codehaus/groovy/vmplugin/v7/Selector.java | 3 +-- 8 files changed, 3 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/groovy/blob/021ab0fb/src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java -- diff --git a/src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java index cc40ad5..c0d645a 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java @@ -37,6 +37,5 @@ public class EmptyExpression extends Expression { } public void visit(GroovyCodeVisitor visitor) { -return; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/groovy/blob/021ab0fb/src/main/java/org/codehaus/groovy/classgen/AnnotationVisitor.java -- diff --git a/src/main/java/org/codehaus/groovy/classgen/AnnotationVisitor.java b/src/main/java/org/codehaus/groovy/classgen/AnnotationVisitor.java index e514b59..dafc741 100644 --- a/src/main/java/org/codehaus/groovy/classgen/AnnotationVisitor.java +++ b/src/main/java/org/codehaus/groovy/classgen/AnnotationVisitor.java @@ -240,15 +240,10 @@ public class AnnotationVisitor { if (attrType.isArray()) { checkReturnType(attrType.getComponentType(), node); } else if (ClassHelper.isPrimitiveType(attrType)) { -return; } else if (ClassHelper.STRING_TYPE.equals(attrType)) { -return; } else if (ClassHelper.CLASS_Type.equals(attrType)) { -return; } else if (attrType.isDerivedFrom(ClassHelper.Enum_Type)) { -return; } else if (isValidAnnotationClass(attrType)) { -return; } else { addError("Unexpected return type " + attrType.getName(), node); } http://git-wip-us.apache.org/repos/asf/groovy/blob/021ab0fb/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java -- diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java index 1539706..fb07f94 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java +++ b/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java @@ -335,7 +335,7 @@ public class OptimizingStatementWriter extends StatementWriter { private boolean isNewPathFork(StatementMeta meta) { // meta.optimize -> can do fast path -if (meta==null || meta.optimize==false) return false; +if (meta==null || !meta.optimize) return false; // fastPathBlocked -> slow path if (fastPathBlocked) return false; // controller.isFastPath() -> fastPath @@ -931,7 +931,6 @@ public class OptimizingStatementWriter extends StatementWriter { @Override public void visitClosureExpression(ClosureExpression expression) { -return; } @Override http://git-wip-us.apache.org/repos/asf/groovy/blob/021ab0fb/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 eda3367..7221ba5 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter
[2/2] groovy git commit: Trivial refactoring: cleanup code
Trivial refactoring: cleanup code (cherry picked from commit 75a16a0) Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/7d1654a9 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/7d1654a9 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/7d1654a9 Branch: refs/heads/GROOVY_2_6_X Commit: 7d1654a92f2aa795ae1f5ba96f3beaccce1385e9 Parents: e07c0dc Author: danielsun1106 Authored: Mon Feb 19 23:23:25 2018 +0800 Committer: danielsun1106 Committed: Mon Feb 19 23:53:41 2018 +0800 -- src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java | 1 - .../java/org/codehaus/groovy/classgen/AnnotationVisitor.java| 5 - .../codehaus/groovy/classgen/asm/OptimizingStatementWriter.java | 3 +-- .../groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java | 1 - src/main/java/org/codehaus/groovy/control/ResolveVisitor.java | 1 - .../org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java | 1 - .../transform/AbstractInterruptibleASTTransformation.java | 2 +- src/main/java/org/codehaus/groovy/vmplugin/v7/Selector.java | 3 +-- 8 files changed, 3 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/groovy/blob/7d1654a9/src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java -- diff --git a/src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java index d1a3596..af2fe65 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java @@ -50,7 +50,6 @@ public class EmptyExpression extends Expression { } public void visit(GroovyCodeVisitor visitor) { -return; } http://git-wip-us.apache.org/repos/asf/groovy/blob/7d1654a9/src/main/java/org/codehaus/groovy/classgen/AnnotationVisitor.java -- diff --git a/src/main/java/org/codehaus/groovy/classgen/AnnotationVisitor.java b/src/main/java/org/codehaus/groovy/classgen/AnnotationVisitor.java index e514b59..dafc741 100644 --- a/src/main/java/org/codehaus/groovy/classgen/AnnotationVisitor.java +++ b/src/main/java/org/codehaus/groovy/classgen/AnnotationVisitor.java @@ -240,15 +240,10 @@ public class AnnotationVisitor { if (attrType.isArray()) { checkReturnType(attrType.getComponentType(), node); } else if (ClassHelper.isPrimitiveType(attrType)) { -return; } else if (ClassHelper.STRING_TYPE.equals(attrType)) { -return; } else if (ClassHelper.CLASS_Type.equals(attrType)) { -return; } else if (attrType.isDerivedFrom(ClassHelper.Enum_Type)) { -return; } else if (isValidAnnotationClass(attrType)) { -return; } else { addError("Unexpected return type " + attrType.getName(), node); } http://git-wip-us.apache.org/repos/asf/groovy/blob/7d1654a9/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java -- diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java index 1539706..fb07f94 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java +++ b/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java @@ -335,7 +335,7 @@ public class OptimizingStatementWriter extends StatementWriter { private boolean isNewPathFork(StatementMeta meta) { // meta.optimize -> can do fast path -if (meta==null || meta.optimize==false) return false; +if (meta==null || !meta.optimize) return false; // fastPathBlocked -> slow path if (fastPathBlocked) return false; // controller.isFastPath() -> fastPath @@ -931,7 +931,6 @@ public class OptimizingStatementWriter extends StatementWriter { @Override public void visitClosureExpression(ClosureExpression expression) { -return; } @Override http://git-wip-us.apache.org/repos/asf/groovy/blob/7d1654a9/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 28b8aab..f1ff7dd 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java +++ b/src/main/java/
groovy git commit: Trivial refactoring: cleanup code
Repository: groovy Updated Branches: refs/heads/master 5d5b590cd -> 75a16a0ab Trivial refactoring: cleanup code Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/75a16a0a Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/75a16a0a Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/75a16a0a Branch: refs/heads/master Commit: 75a16a0ab9204d44b9e7c0ecc07ad1a9e89333d4 Parents: 5d5b590 Author: danielsun1106 Authored: Mon Feb 19 23:23:25 2018 +0800 Committer: danielsun1106 Committed: Mon Feb 19 23:23:25 2018 +0800 -- src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java | 1 - .../java/org/codehaus/groovy/classgen/AnnotationVisitor.java| 5 - .../codehaus/groovy/classgen/asm/OptimizingStatementWriter.java | 3 +-- .../groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java | 1 - src/main/java/org/codehaus/groovy/control/ResolveVisitor.java | 1 - .../org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java | 1 - .../transform/AbstractInterruptibleASTTransformation.java | 2 +- src/main/java/org/codehaus/groovy/vmplugin/v7/Selector.java | 3 +-- 8 files changed, 3 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/groovy/blob/75a16a0a/src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java -- diff --git a/src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java index 401f906..11ef2d9 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/EmptyExpression.java @@ -47,7 +47,6 @@ public class EmptyExpression extends Expression { } public void visit(GroovyCodeVisitor visitor) { -return; } http://git-wip-us.apache.org/repos/asf/groovy/blob/75a16a0a/src/main/java/org/codehaus/groovy/classgen/AnnotationVisitor.java -- diff --git a/src/main/java/org/codehaus/groovy/classgen/AnnotationVisitor.java b/src/main/java/org/codehaus/groovy/classgen/AnnotationVisitor.java index e514b59..dafc741 100644 --- a/src/main/java/org/codehaus/groovy/classgen/AnnotationVisitor.java +++ b/src/main/java/org/codehaus/groovy/classgen/AnnotationVisitor.java @@ -240,15 +240,10 @@ public class AnnotationVisitor { if (attrType.isArray()) { checkReturnType(attrType.getComponentType(), node); } else if (ClassHelper.isPrimitiveType(attrType)) { -return; } else if (ClassHelper.STRING_TYPE.equals(attrType)) { -return; } else if (ClassHelper.CLASS_Type.equals(attrType)) { -return; } else if (attrType.isDerivedFrom(ClassHelper.Enum_Type)) { -return; } else if (isValidAnnotationClass(attrType)) { -return; } else { addError("Unexpected return type " + attrType.getName(), node); } http://git-wip-us.apache.org/repos/asf/groovy/blob/75a16a0a/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java -- diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java index 1539706..fb07f94 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java +++ b/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java @@ -335,7 +335,7 @@ public class OptimizingStatementWriter extends StatementWriter { private boolean isNewPathFork(StatementMeta meta) { // meta.optimize -> can do fast path -if (meta==null || meta.optimize==false) return false; +if (meta==null || !meta.optimize) return false; // fastPathBlocked -> slow path if (fastPathBlocked) return false; // controller.isFastPath() -> fastPath @@ -931,7 +931,6 @@ public class OptimizingStatementWriter extends StatementWriter { @Override public void visitClosureExpression(ClosureExpression expression) { -return; } @Override http://git-wip-us.apache.org/repos/asf/groovy/blob/75a16a0a/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 28b8aab..f1ff7dd 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCa
[1/2] groovy git commit: Trivial refactoring: cleanup code of `ClassHelper`
Repository: groovy Updated Branches: refs/heads/master ee6060bee -> 5217a582a Trivial refactoring: cleanup code of `ClassHelper` Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/273340db Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/273340db Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/273340db Branch: refs/heads/master Commit: 273340db8aba42f8774b431c64f05279f25fab2a Parents: ee6060b Author: danielsun1106 Authored: Sun Feb 18 19:17:22 2018 +0800 Committer: danielsun1106 Committed: Sun Feb 18 19:17:22 2018 +0800 -- src/main/java/org/codehaus/groovy/ast/ClassHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/groovy/blob/273340db/src/main/java/org/codehaus/groovy/ast/ClassHelper.java -- diff --git a/src/main/java/org/codehaus/groovy/ast/ClassHelper.java b/src/main/java/org/codehaus/groovy/ast/ClassHelper.java index 8362d8d..b81c969 100644 --- a/src/main/java/org/codehaus/groovy/ast/ClassHelper.java +++ b/src/main/java/org/codehaus/groovy/ast/ClassHelper.java @@ -103,7 +103,7 @@ public class ClassHelper { Annotation_TYPE = makeCached(Annotation.class), ELEMENT_TYPE_TYPE = makeCached(ElementType.class), -FunctionalInterface_Type = ClassHelper.makeCached(FunctionalInterface.class), +//FunctionalInterface_Type = ClassHelper.makeCached(FunctionalInterface.class), // uncached constants. CLASS_Type = makeWithoutCaching(Class.class), COMPARABLE_TYPE = makeWithoutCaching(Comparable.class),