You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2022/09/15 21:35:30 UTC

[groovy] branch GROOVY_3_0_X updated: GROOVY-10757: create expression for implicit-`this` method call receiver

This is an automated email from the ASF dual-hosted git repository.

emilles pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
     new 51239f8fd8 GROOVY-10757: create expression for implicit-`this` method call receiver
51239f8fd8 is described below

commit 51239f8fd8423ad5b736ce581dd321aa081a429b
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Thu Sep 15 16:12:17 2022 -0500

    GROOVY-10757: create expression for implicit-`this` method call receiver
---
 src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java          | 2 +-
 .../src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java b/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
index 402b6f0b74..304cf9c4f9 100644
--- a/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
+++ b/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
@@ -2462,7 +2462,7 @@ public class AntlrParserPlugin extends ASTHelper implements ParserPlugin, Groovy
             selector = objectNode.getNextSibling();
         } else {
             implicitThis = true;
-            objectExpression = VariableExpression.THIS_EXPRESSION;
+            objectExpression = new VariableExpression("this");
             selector = node;
         }
 
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 37051b1bdb..bc454c5984 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
@@ -3996,7 +3996,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> {
 
     // e.g. m(1, 2) or m 1, 2
     private MethodCallExpression createMethodCallExpression(final Expression baseExpr, final Expression arguments) {
-        Expression thisExpr = new VariableExpression("this");
+        Expression thisExpr = new VariableExpression(THIS_STR);
         thisExpr.setColumnNumber(baseExpr.getColumnNumber());
         thisExpr.setLineNumber(baseExpr.getLineNumber());