You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2017/05/26 00:04:59 UTC
[8/9] groovy git commit: Minor refactoring
Minor refactoring
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/604f5776
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/604f5776
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/604f5776
Branch: refs/heads/GROOVY_2_6_X
Commit: 604f5776bc1c01fe8c86ebc5d6f5298a7e561e5e
Parents: b8041d8
Author: sunlan <su...@apache.org>
Authored: Thu May 25 20:21:05 2017 +0800
Committer: paulk <pa...@asert.com.au>
Committed: Fri May 26 10:04:31 2017 +1000
----------------------------------------------------------------------
.../apache/groovy/parser/antlr4/GroovyParser.g4 | 14 ++++--
.../apache/groovy/parser/antlr4/AstBuilder.java | 48 +++++++++-----------
2 files changed, 30 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/604f5776/subprojects/parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/GroovyParser.g4
----------------------------------------------------------------------
diff --git a/subprojects/parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/GroovyParser.g4 b/subprojects/parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/GroovyParser.g4
index 3949350..08cdbe2 100644
--- a/subprojects/parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/GroovyParser.g4
+++ b/subprojects/parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/GroovyParser.g4
@@ -364,8 +364,7 @@ variableDeclaratorId
;
variableInitializer
- : statementExpression
- | standardLambda
+ : enhancedStatementExpression
;
variableInitializers
@@ -679,7 +678,7 @@ locals[boolean resourcesExists = false]
|
nls finallyBlock
|
- // a catch or finally clause is required unless it's try-with-resources
+ // try-with-resources can have no catche and finally clauses
{ $resourcesExists }?<fail={"catch or finally clauses are required for try-catch statement"}>
)
;
@@ -792,7 +791,12 @@ castParExpression
;
parExpression
- : LPAREN (statementExpression | standardLambda) rparen
+ : LPAREN enhancedStatementExpression rparen
+ ;
+
+enhancedStatementExpression
+ : statementExpression
+ | standardLambda
;
expressionList[boolean canSpread]
@@ -920,7 +924,7 @@ expression
| POWER_ASSIGN
| ELVIS_ASSIGN
) nls
- (statementExpression | standardLambda) #assignmentExprAlt
+ enhancedStatementExpression #assignmentExprAlt
;
commandExpression
http://git-wip-us.apache.org/repos/asf/groovy/blob/604f5776/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 79b3d90..471b5de 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
@@ -128,7 +128,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Deque;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedList;
@@ -1683,17 +1682,9 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
return EmptyExpression.INSTANCE;
}
- if (asBoolean(ctx.statementExpression())) {
- return this.configureAST(
- ((ExpressionStatement) this.visit(ctx.statementExpression())).getExpression(),
- ctx);
- }
-
- if (asBoolean(ctx.standardLambda())) {
- return this.configureAST(this.visitStandardLambda(ctx.standardLambda()), ctx);
- }
-
- throw createParsingFailedException("Unsupported variable initializer: " + ctx.getText(), ctx);
+ return this.configureAST(
+ this.visitEnhancedStatementExpression(ctx.enhancedStatementExpression()),
+ ctx);
}
@Override
@@ -1855,15 +1846,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public Expression visitParExpression(ParExpressionContext ctx) {
- Expression expression;
-
- if (asBoolean(ctx.statementExpression())) {
- expression = ((ExpressionStatement) this.visit(ctx.statementExpression())).getExpression();
- } else if (asBoolean(ctx.standardLambda())) {
- expression = this.visitStandardLambda(ctx.standardLambda());
- } else {
- throw createParsingFailedException("Unsupported parentheses expression: " + ctx.getText(), ctx);
- }
+ Expression expression = this.visitEnhancedStatementExpression(ctx.enhancedStatementExpression());
expression.putNodeMetaData(IS_INSIDE_PARENTHESES, true);
@@ -1878,6 +1861,21 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
return this.configureAST(expression, ctx);
}
+ @Override public Expression visitEnhancedStatementExpression(EnhancedStatementExpressionContext ctx) {
+ Expression expression;
+
+ if (asBoolean(ctx.statementExpression())) {
+ expression = ((ExpressionStatement) this.visit(ctx.statementExpression())).getExpression();
+ } else if (asBoolean(ctx.standardLambda())) {
+ expression = this.visitStandardLambda(ctx.standardLambda());
+ } else {
+ throw createParsingFailedException("Unsupported enhanced statement expression: " + ctx.getText(), ctx);
+ }
+
+ return this.configureAST(expression, ctx);
+ }
+
+
@Override
public Expression visitPathExpression(PathExpressionContext ctx) {
return this.configureAST(
@@ -2631,9 +2629,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
new BinaryExpression(
this.configureAST(new TupleExpression(leftExpr), ctx.left),
this.createGroovyToken(ctx.op),
- asBoolean(ctx.statementExpression())
- ? ((ExpressionStatement) this.visit(ctx.statementExpression())).getExpression()
- : this.visitStandardLambda(ctx.standardLambda())),
+ this.visitEnhancedStatementExpression(ctx.enhancedStatementExpression())),
ctx);
}
@@ -2660,9 +2656,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
new BinaryExpression(
leftExpr,
this.createGroovyToken(ctx.op),
- asBoolean(ctx.statementExpression())
- ? ((ExpressionStatement) this.visit(ctx.statementExpression())).getExpression()
- : this.visitStandardLambda(ctx.standardLambda())),
+ this.visitEnhancedStatementExpression(ctx.enhancedStatementExpression())),
ctx);
}