Repository: groovy Updated Branches: refs/heads/master b1ff68490 -> e823653a0
Minor refactoring Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e823653a Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e823653a Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e823653a Branch: refs/heads/master Commit: e823653a0e9022db785fa71916cc99d12fc07f3e Parents: b1ff684 Author: sunlan <[email protected]> Authored: Fri Aug 25 08:20:23 2017 +0800 Committer: sunlan <[email protected]> Committed: Fri Aug 25 08:20:23 2017 +0800 ---------------------------------------------------------------------- .../apache/groovy/parser/antlr4/AstBuilder.java | 38 +++++++------------- 1 file changed, 12 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/e823653a/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 aee8194..0a80fbf 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 @@ -1811,17 +1811,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov this.createMethodCallExpression(baseExpr, arguments), arguments); } else { // e.g. a[x] b, new A() b, etc. - methodCallExpression = - this.configureAST( - new MethodCallExpression( - baseExpr, - CALL_STR, - arguments - ), - arguments - ); - - methodCallExpression.setImplicitThis(false); + methodCallExpression = this.configureAST(this.createCallMethodCallExpression(baseExpr, arguments), arguments); } if (!asBoolean(ctx.commandArgument())) { @@ -2042,16 +2032,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov this.configureAST(argumentsExpr, ctx); if (isInsideParentheses(baseExpr)) { // e.g. (obj.x)(), (obj.@x)() - MethodCallExpression methodCallExpression = - new MethodCallExpression( - baseExpr, - CALL_STR, - argumentsExpr - ); - - methodCallExpression.setImplicitThis(false); - - return this.configureAST(methodCallExpression, ctx); + return this.configureAST(createCallMethodCallExpression(baseExpr, argumentsExpr), ctx); } if (baseExpr instanceof AttributeExpression) { // e.g. obj.@a(1, 2) @@ -2130,11 +2111,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov } // e.g. 1(), 1.1(), ((int) 1 / 2)(1, 2), {a, b -> a + b }(1, 2), m()() - MethodCallExpression methodCallExpression = - new MethodCallExpression(baseExpr, CALL_STR, argumentsExpr); - methodCallExpression.setImplicitThis(false); - - return this.configureAST(methodCallExpression, ctx); + return this.configureAST(createCallMethodCallExpression(baseExpr, argumentsExpr), ctx); } if (asBoolean(ctx.closure())) { @@ -2237,6 +2214,15 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov throw createParsingFailedException("Unsupported path element: " + ctx.getText(), ctx); } + private MethodCallExpression createCallMethodCallExpression(Expression baseExpr, Expression argumentsExpr) { + MethodCallExpression methodCallExpression = + new MethodCallExpression(baseExpr, CALL_STR, argumentsExpr); + + methodCallExpression.setImplicitThis(false); + + return methodCallExpression; + } + @Override public GenericsType[] visitNonWildcardTypeArguments(NonWildcardTypeArgumentsContext ctx) { if (!asBoolean(ctx)) {
