Repository: groovy Updated Branches: refs/heads/parrot 0e608ee53 -> ad1786eb2
Fix GROOVY-5311: Wrong line/col info for GStrings Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e70f131c Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e70f131c Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e70f131c Branch: refs/heads/parrot Commit: e70f131cf2e16ecc01e96efcd2d8006217053a1d Parents: 0e608ee Author: sunlan <sun...@apache.org> Authored: Fri Jan 20 09:50:10 2017 +0800 Committer: sunlan <sun...@apache.org> Committed: Fri Jan 20 09:50:10 2017 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/e70f131c/subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java b/subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java index 84c5d77..c61a2c0 100644 --- a/subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java +++ b/subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java @@ -2980,7 +2980,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov if (asBoolean(ctx.LBRACE())) { if (asBoolean(ctx.statementExpression())) { - return this.configureAST(((ExpressionStatement) this.visit(ctx.statementExpression())).getExpression(), ctx); + return this.configureAST(((ExpressionStatement) this.visit(ctx.statementExpression())).getExpression(), ctx.statementExpression()); } else { // e.g. "${}" return this.configureAST(new ConstantExpression(null), ctx); }