[groovy] 07/19: minor refactor

[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 1591c0231e603c0c5dcf8964e0831352f92b6038
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Sat Aug 22 04:34:28 2020 -0500

    minor refactor
    
    (cherry picked from commit e3a59d099a89ff6de35092c4639c6c0a7d0eb660)
---
 .../groovy/transform/tailrec/VariableExpressionReplacer.groovy      | 2 +-
 .../codehaus/groovy/classgen/asm/sc/StaticPropertyAccessHelper.java | 4 ++--
 .../codehaus/groovy/transform/sc/TemporaryVariableExpression.java   | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/groovy/org/codehaus/groovy/transform/tailrec/VariableExpressionReplacer.groovy b/src/main/groovy/org/codehaus/groovy/transform/tailrec/VariableExpressionReplacer.groovy
index ea2d601..b56f0bd 100644
--- a/src/main/groovy/org/codehaus/groovy/transform/tailrec/VariableExpressionReplacer.groovy
+++ b/src/main/groovy/org/codehaus/groovy/transform/tailrec/VariableExpressionReplacer.groovy
@@ -139,7 +139,7 @@ class VariableExpressionReplacer extends CodeVisitorSupport {
                 replaceExpression(node, propName, propClass, expr, newExpr)
             }
         } else {
-            Expression newExpr = expr.transformExpression(transformer)
+            Expression newExpr = transformer.transform(expr)
             replaceExpression(node, propName, propClass, expr, newExpr)
         }
     }
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticPropertyAccessHelper.java b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticPropertyAccessHelper.java
index ac30d6d..7a4182e 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticPropertyAccessHelper.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticPropertyAccessHelper.java
@@ -79,7 +79,7 @@ public abstract class StaticPropertyAccessHelper {
 
         @Override
         public Expression transformExpression(final ExpressionTransformer transformer) {
-            PoppingMethodCallExpression call = (PoppingMethodCallExpression) transformer.transform(this.call);
+            PoppingMethodCallExpression call = (PoppingMethodCallExpression) this.call.transformExpression(transformer);
             return new PoppingListOfExpressionsExpression(call.tmp, call);
         }
 
@@ -104,7 +104,7 @@ public abstract class StaticPropertyAccessHelper {
 
         @Override
         public Expression transformExpression(final ExpressionTransformer transformer) {
-            PoppingMethodCallExpression call = new PoppingMethodCallExpression(transformer.transform(getObjectExpression()), getMethodTarget(), (TemporaryVariableExpression) transformer.transform(tmp));
+            PoppingMethodCallExpression call = new PoppingMethodCallExpression(transformer.transform(getObjectExpression()), getMethodTarget(), (TemporaryVariableExpression) tmp.transformExpression(transformer));
             call.copyNodeMetaData(this);
             call.setSourcePosition(this);
             call.setSafe(isSafe());
diff --git a/src/main/java/org/codehaus/groovy/transform/sc/TemporaryVariableExpression.java b/src/main/java/org/codehaus/groovy/transform/sc/TemporaryVariableExpression.java
index b93a2a9..ef41205 100644
--- a/src/main/java/org/codehaus/groovy/transform/sc/TemporaryVariableExpression.java
+++ b/src/main/java/org/codehaus/groovy/transform/sc/TemporaryVariableExpression.java
@@ -45,7 +45,7 @@ public class TemporaryVariableExpression extends Expression {
 
     @Override
     public Expression transformExpression(final ExpressionTransformer transformer) {
-        TemporaryVariableExpression result = new TemporaryVariableExpression(expression.transformExpression(transformer));
+        TemporaryVariableExpression result = new TemporaryVariableExpression(transformer.transform(expression));
         result.copyNodeMetaData(this);
         return result;
     }
@@ -53,7 +53,7 @@ public class TemporaryVariableExpression extends Expression {
     @Override
     public void visit(final GroovyCodeVisitor visitor) {
         if (visitor instanceof AsmClassGenerator) {
-            if (variable==null) {
+            if (variable == null) {
                 AsmClassGenerator acg = (AsmClassGenerator) visitor;
                 WriterController controller = acg.getController();
                 variable = new ExpressionAsVariableSlot(controller, expression);
@@ -64,7 +64,7 @@ public class TemporaryVariableExpression extends Expression {
         }
     }
 
-    public void remove(WriterController controller) {
+    public void remove(final WriterController controller) {
         controller.getCompileStack().removeVar(variable.getIndex());
         variable = null;
     }