You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2019/11/05 16:50:02 UTC
[groovy] branch GROOVY_3_0_X updated (a0d436e -> 109cb71)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from a0d436e refactor code
new 0a131d8 minor edits
new 109cb71 Avoid potential invalid syntax (#1067)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/antlr/GroovyParser.g4 | 16 ++++++++-------
.../codehaus/groovy/classgen/ExtendedVerifier.java | 23 +++++++++-------------
.../apache/groovy/parser/antlr4/AstBuilder.java | 22 +++++----------------
3 files changed, 23 insertions(+), 38 deletions(-)
[groovy] 02/02: Avoid potential invalid syntax (#1067)
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 109cb71393423943c7355331867bf2c38ab4bc8e
Author: Daniel.Sun <su...@apache.org>
AuthorDate: Wed Nov 6 00:31:03 2019 +0800
Avoid potential invalid syntax (#1067)
(cherry picked from commit cd23b19909bc0e32e7cba405c8dd5cd990ad5c5c)
---
src/antlr/GroovyParser.g4 | 16 +++++++++-------
.../apache/groovy/parser/antlr4/AstBuilder.java | 22 +++++-----------------
2 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/src/antlr/GroovyParser.g4 b/src/antlr/GroovyParser.g4
index ba238c5..7d802fa 100644
--- a/src/antlr/GroovyParser.g4
+++ b/src/antlr/GroovyParser.g4
@@ -98,11 +98,17 @@ options {
// starting point for parsing a groovy file
compilationUnit
: nls
- packageDeclaration? sep? statements? EOF
+ packageDeclaration? sep? scriptStatements? EOF
;
-statements
- : statement (sep statement)* sep?
+scriptStatements
+ : scriptStatement (sep scriptStatement)* sep?
+ ;
+
+scriptStatement
+ : importDeclaration // Import statement. Can be used in any scope. Has "import x as y" also.
+ | typeDeclaration
+ | statement
;
packageDeclaration
@@ -667,12 +673,8 @@ statement
| identifier COLON nls statement #labeledStmtAlt
- // Import statement. Can be used in any scope. Has "import x as y" also.
- | importDeclaration #importStmtAlt
-
| assertStatement #assertStmtAlt
- | typeDeclaration #typeDeclarationStmtAlt
| localVariableDeclaration #localVariableDeclarationStmtAlt
// validate the method in the AstBuilder#visitMethodDeclaration, e.g. method without method body is not allowed
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 84c9824..51fd986 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
@@ -244,7 +244,6 @@ import static org.apache.groovy.parser.antlr4.GroovyLangParser.IdentifierContext
import static org.apache.groovy.parser.antlr4.GroovyLangParser.IdentifierPrmrAltContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.IfElseStatementContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.ImportDeclarationContext;
-import static org.apache.groovy.parser.antlr4.GroovyLangParser.ImportStmtAltContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.InclusiveOrExprAltContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.IndexPropertyArgsContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.IntegerLiteralAltContext;
@@ -306,11 +305,11 @@ import static org.apache.groovy.parser.antlr4.GroovyLangParser.ReturnStmtAltCont
import static org.apache.groovy.parser.antlr4.GroovyLangParser.ReturnTypeContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.STATIC;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.SUB;
+import static org.apache.groovy.parser.antlr4.GroovyLangParser.ScriptStatementsContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.ShiftExprAltContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.StandardLambdaExpressionContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.StandardLambdaParametersContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.StatementContext;
-import static org.apache.groovy.parser.antlr4.GroovyLangParser.StatementsContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.StringLiteralAltContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.StringLiteralContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.SuperPrmrAltContext;
@@ -329,7 +328,6 @@ import static org.apache.groovy.parser.antlr4.GroovyLangParser.TypeArgumentsOrDi
import static org.apache.groovy.parser.antlr4.GroovyLangParser.TypeBoundContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.TypeContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.TypeDeclarationContext;
-import static org.apache.groovy.parser.antlr4.GroovyLangParser.TypeDeclarationStmtAltContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.TypeListContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.TypeNamePairContext;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.TypeNamePairsContext;
@@ -449,7 +447,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
public ModuleNode visitCompilationUnit(CompilationUnitContext ctx) {
this.visit(ctx.packageDeclaration());
- this.visitStatements(ctx.statements())
+ this.visitScriptStatements(ctx.scriptStatements())
.forEach(e -> {
if (e instanceof DeclarationListStatement) { // local variable declaration
((DeclarationListStatement) e).getDeclarationStatements().forEach(moduleNode::addStatement);
@@ -481,12 +479,12 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
}
@Override
- public List<ASTNode> visitStatements(StatementsContext ctx) {
+ public List<ASTNode> visitScriptStatements(ScriptStatementsContext ctx) {
if (!asBoolean(ctx)) {
return Collections.emptyList();
}
- return ctx.statement().stream()
+ return ctx.scriptStatement().stream()
.map(e -> (ASTNode) visit(e))
.collect(Collectors.toList());
}
@@ -1092,16 +1090,6 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
}
@Override
- public ImportNode visitImportStmtAlt(ImportStmtAltContext ctx) {
- return configureAST(this.visitImportDeclaration(ctx.importDeclaration()), ctx);
- }
-
- @Override
- public ClassNode visitTypeDeclarationStmtAlt(TypeDeclarationStmtAltContext ctx) {
- return configureAST(this.visitTypeDeclaration(ctx.typeDeclaration()), ctx);
- }
-
- @Override
public Statement visitLocalVariableDeclarationStmtAlt(LocalVariableDeclarationStmtAltContext ctx) {
return configureAST(this.visitLocalVariableDeclaration(ctx.localVariableDeclaration()), ctx);
}
@@ -3065,7 +3053,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
&& Types.LEFT_SQUARE_BRACKET == ((BinaryExpression) leftExpr).getOperation().getType()) // e.g. map[a] = 123 OR map['a'] = 123 OR map["$a"] = 123
)
- ) {
+ ) {
throw createParsingFailedException("The LHS of an assignment should be a variable or a field accessing expression", ctx);
}
[groovy] 01/02: minor edits
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 0a131d8378716387a10e1abe5c6bd93deb687099
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Tue Nov 5 09:47:45 2019 -0600
minor edits
(cherry picked from commit 5744d8c71d4b7a9784499f484409137ae1d652d4)
---
.../codehaus/groovy/classgen/ExtendedVerifier.java | 23 +++++++++-------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/classgen/ExtendedVerifier.java b/src/main/java/org/codehaus/groovy/classgen/ExtendedVerifier.java
index 520ef4f..3402886 100644
--- a/src/main/java/org/codehaus/groovy/classgen/ExtendedVerifier.java
+++ b/src/main/java/org/codehaus/groovy/classgen/ExtendedVerifier.java
@@ -172,7 +172,7 @@ public class ExtendedVerifier extends ClassCodeVisitorSupport {
if (!visited.hasSourceRetention()) {
List<AnnotationNode> seen = nonSourceAnnotations.get(name);
if (seen == null) {
- seen = new ArrayList<AnnotationNode>();
+ seen = new ArrayList<>();
}
seen.add(visited);
nonSourceAnnotations.put(name, seen);
@@ -182,8 +182,7 @@ public class ExtendedVerifier extends ClassCodeVisitorSupport {
// Check if the annotation target is correct, unless it's the target annotating an annotation definition
// defining on which target elements the annotation applies
if (!isTargetAnnotation && !visited.isTargetAllowed(target)) {
- addError("Annotation @" + name + " is not allowed on element "
- + AnnotationNode.targetToName(target), visited);
+ addError("Annotation @" + name + " is not allowed on element " + AnnotationNode.targetToName(target), visited);
}
visitDeprecation(node, visited);
visitOverride(node, visited);
@@ -196,17 +195,12 @@ public class ExtendedVerifier extends ClassCodeVisitorSupport {
if (next.getValue().size() > 1) {
ClassNode repeatable = null;
AnnotationNode repeatee = next.getValue().get(0);
- List<AnnotationNode> repeateeAnnotations = repeatee.getClassNode().getAnnotations();
- for (AnnotationNode anno : repeateeAnnotations) {
- ClassNode annoClassNode = anno.getClassNode();
- if (annoClassNode.getName().equals("java.lang.annotation.Repeatable")) {
+ for (AnnotationNode anno : repeatee.getClassNode().getAnnotations()) {
+ if (anno.getClassNode().getName().equals("java.lang.annotation.Repeatable")) {
Expression value = anno.getMember("value");
- if (value instanceof ClassExpression) {
- ClassExpression ce = (ClassExpression) value;
- if (ce.getType() != null && ce.getType().isAnnotationDefinition()) {
- repeatable = ce.getType();
- break;
- }
+ if (value instanceof ClassExpression && value.getType().isAnnotationDefinition()) {
+ repeatable = value.getType();
+ break;
}
}
}
@@ -226,11 +220,12 @@ public class ExtendedVerifier extends ClassCodeVisitorSupport {
}
}
- List<Expression> annos = new ArrayList<Expression>();
+ List<Expression> annos = new ArrayList<>();
for (AnnotationNode an : next.getValue()) {
annos.add(new AnnotationConstantExpression(an));
}
collector.addMember("value", new ListExpression(annos));
+
node.addAnnotation(collector);
node.getAnnotations().removeAll(next.getValue());
}