Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X e828fae28 -> f7b19f729
backport the implementation Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/f7b19f72 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/f7b19f72 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/f7b19f72 Branch: refs/heads/GROOVY_2_6_X Commit: f7b19f729416c50872cb961ff00031eec5647861 Parents: e828fae Author: sunlan <[email protected]> Authored: Sat Jun 24 14:28:30 2017 +0800 Committer: sunlan <[email protected]> Committed: Sat Jun 24 14:28:30 2017 +0800 ---------------------------------------------------------------------- .../org/apache/groovy/parser/antlr4/GroovyParser.g4 | 2 +- .../java/org/apache/groovy/parser/antlr4/AstBuilder.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/f7b19f72/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 6534a82..ee3854a 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 @@ -1094,7 +1094,7 @@ primary | SUPER #superPrmrAlt | parExpression #parenPrmrAlt | closure #closurePrmrAlt - | lambdaExpression #lambdaPrmrAlt + | lambdaExpression #lambdaPrmrAlt | list #listPrmrAlt | map #mapPrmrAlt | builtInType #typePrmrAlt http://git-wip-us.apache.org/repos/asf/groovy/blob/f7b19f72/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 7f82ff5..e2290c5 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 @@ -3448,10 +3448,10 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov @Override public List<List<AnnotationNode>> visitDims(DimsContext ctx) { - List<List<AnnotationNode>> dimList = - ctx.annotationsOpt().stream() - .map(this::visitAnnotationsOpt) - .collect(Collectors.toList()); + List<List<AnnotationNode>> dimList = new ArrayList<List<AnnotationNode>>(); + for (AnnotationsOptContext annotationsOptContext : ctx.annotationsOpt()) { + dimList.add(this.visitAnnotationsOpt(annotationsOptContext)); + } Collections.reverse(dimList); @@ -3786,7 +3786,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov public ClassNode visitAnnotatedQualifiedClassName(AnnotatedQualifiedClassNameContext ctx) { ClassNode classNode = this.visitQualifiedClassName(ctx.qualifiedClassName()); - this.visitAnnotationsOpt(ctx.annotationsOpt()).forEach(classNode::addAnnotation); + classNode.addAnnotations(this.visitAnnotationsOpt(ctx.annotationsOpt())); return classNode; }
