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 2021/11/23 18:22:03 UTC
[groovy] 01/02: minor edits
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit aef6637d2c51a98bd0fabfe4846c2af999632725
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Tue Nov 23 12:04:28 2021 -0600
minor edits
---
.../groovy/classgen/asm/WriterController.java | 4 +---
.../transform/sc/TemporaryVariableExpression.java | 21 ++++++++++-----------
.../transformers/BinaryExpressionTransformer.java | 10 +++++-----
3 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/WriterController.java b/src/main/java/org/codehaus/groovy/classgen/asm/WriterController.java
index a71bf44..a266571 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/WriterController.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/WriterController.java
@@ -43,8 +43,6 @@ import java.util.Map;
import static org.codehaus.groovy.ast.ClassHelper.isGeneratedFunction;
public class WriterController {
- private static final String RECORD_CLASS_NAME = "java.lang.Record";
-
private AsmClassGenerator acg;
private MethodVisitor methodVisitor;
private CompileStack compileStack;
@@ -136,7 +134,7 @@ public class WriterController {
this.typeChooser = new StatementMetaTypeChooser();
}
- private static ClassVisitor createClassVisitor(final ClassVisitor cv, CompilerConfiguration config) {
+ private static ClassVisitor createClassVisitor(final ClassVisitor cv, final CompilerConfiguration config) {
if (!config.isLogClassgen() || cv instanceof LoggableClassVisitor) {
return cv;
}
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 14e9521..37fcb85 100644
--- a/src/main/java/org/codehaus/groovy/transform/sc/TemporaryVariableExpression.java
+++ b/src/main/java/org/codehaus/groovy/transform/sc/TemporaryVariableExpression.java
@@ -43,11 +43,20 @@ public class TemporaryVariableExpression extends Expression {
public TemporaryVariableExpression(final Expression expression) {
this.expression = expression;
- setType(expression.getType());
putNodeMetaData(INFERRED_TYPE, expression.getNodeMetaData(INFERRED_TYPE));
}
@Override
+ public ClassNode getType() {
+ return expression.getType();
+ }
+
+ public void remove(final WriterController controller) {
+ controller.getCompileStack().removeVar(variable[0].getIndex());
+ variable[0] = null;
+ }
+
+ @Override
public Expression transformExpression(final ExpressionTransformer transformer) {
TemporaryVariableExpression result = new TemporaryVariableExpression(transformer.transform(expression));
result.copyNodeMetaData(this);
@@ -67,14 +76,4 @@ public class TemporaryVariableExpression extends Expression {
expression.visit(visitor);
}
}
-
- public void remove(final WriterController controller) {
- controller.getCompileStack().removeVar(variable[0].getIndex());
- variable[0] = null;
- }
-
- @Override
- public ClassNode getType() {
- return expression.getType();
- }
}
diff --git a/src/main/java/org/codehaus/groovy/transform/sc/transformers/BinaryExpressionTransformer.java b/src/main/java/org/codehaus/groovy/transform/sc/transformers/BinaryExpressionTransformer.java
index a66c233..b31d5fc 100644
--- a/src/main/java/org/codehaus/groovy/transform/sc/transformers/BinaryExpressionTransformer.java
+++ b/src/main/java/org/codehaus/groovy/transform/sc/transformers/BinaryExpressionTransformer.java
@@ -246,12 +246,12 @@ public class BinaryExpressionTransformer {
return staticCompilationTransformer.transform(ternaryX(isNullX(rightExpression), isNullX(leftExpression), call));
}
- private Expression transformRepeatedReference(final Expression expr) {
- if (expr instanceof ConstantExpression || expr instanceof VariableExpression
- && ((VariableExpression) expr).getAccessedVariable() instanceof Parameter) {
- return expr;
+ private Expression transformRepeatedReference(final Expression exp) {
+ if (exp instanceof ConstantExpression || exp instanceof VariableExpression
+ && ((VariableExpression) exp).getAccessedVariable() instanceof Parameter) {
+ return exp;
}
- return new TemporaryVariableExpression(expr);
+ return new TemporaryVariableExpression(exp);
}
private Expression transformEqualityComparison(final BinaryExpression bin, final boolean eq) {