Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X e7676ec75 -> 0aa9ec3fd
Minor refactoring (cherry picked from commit 4b09236) Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/0aa9ec3f Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/0aa9ec3f Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/0aa9ec3f Branch: refs/heads/GROOVY_2_6_X Commit: 0aa9ec3fd30355094c794558d801707929cc7fdc Parents: e7676ec Author: sunlan <sun...@apache.org> Authored: Thu Sep 7 21:16:18 2017 +0800 Committer: sunlan <sun...@apache.org> Committed: Thu Sep 7 21:23:13 2017 +0800 ---------------------------------------------------------------------- src/main/org/codehaus/groovy/ast/Parameter.java | 3 +-- .../org/apache/groovy/parser/antlr4/AstBuilder.java | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/0aa9ec3f/src/main/org/codehaus/groovy/ast/Parameter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/Parameter.java b/src/main/org/codehaus/groovy/ast/Parameter.java index a49b34a..c3df7c3 100644 --- a/src/main/org/codehaus/groovy/ast/Parameter.java +++ b/src/main/org/codehaus/groovy/ast/Parameter.java @@ -29,8 +29,7 @@ import org.codehaus.groovy.ast.expr.*; */ public class Parameter extends AnnotatedNode implements Variable { - public static final Parameter[] EMPTY_ARRAY = { - }; + public static final Parameter[] EMPTY_ARRAY = {}; private ClassNode type; private final String name; http://git-wip-us.apache.org/repos/asf/groovy/blob/0aa9ec3f/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java ---------------------------------------------------------------------- diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java index b2d0c47..9a9fe95 100644 --- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java +++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java @@ -262,7 +262,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov this.addPackageInfoClassNode(); } else { // if groovy source file only contains blank(including EOF), add "return null" to the AST - if (this.isBlankScript(ctx)) { + if (this.isBlankScript()) { this.addEmptyReturnStatement(); } } @@ -3396,7 +3396,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov @Override public Parameter[] visitFormalParameters(FormalParametersContext ctx) { if (!asBoolean(ctx)) { - return new Parameter[0]; + return Parameter.EMPTY_ARRAY; } return this.visitFormalParameterList(ctx.formalParameterList()); @@ -3405,7 +3405,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov @Override public Parameter[] visitFormalParameterList(FormalParameterListContext ctx) { if (!asBoolean(ctx)) { - return new Parameter[0]; + return Parameter.EMPTY_ARRAY; } List<Parameter> parameterList = new LinkedList<>(); @@ -3428,7 +3428,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov validateParameterList(parameterList); - return parameterList.toArray(new Parameter[0]); + return parameterList.toArray(Parameter.EMPTY_ARRAY); } private void validateVarArgParameter(List<? extends FormalParameterContext> formalParameterList) { @@ -3912,7 +3912,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov @Override public ClassNode[] visitQualifiedClassNameList(QualifiedClassNameListContext ctx) { if (!asBoolean(ctx)) { - return new ClassNode[0]; + return ClassNode.EMPTY_ARRAY; } List<ClassNode> list = new ArrayList<>(); @@ -4202,7 +4202,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov } - private boolean isBlankScript(CompilationUnitContext ctx) { + private boolean isBlankScript() { return moduleNode.getStatementBlock().isEmpty() && moduleNode.getMethods().isEmpty() && moduleNode.getClasses().isEmpty(); }
