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 2020/12/08 17:21:03 UTC
[groovy] branch master updated: token type should be
COMPARE_EQUAL/COMPARE_NOT_EQUAL not COMPARE_TO
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
The following commit(s) were added to refs/heads/master by this push:
new 12c6ffa token type should be COMPARE_EQUAL/COMPARE_NOT_EQUAL not COMPARE_TO
12c6ffa is described below
commit 12c6ffa08d50160f626afe618108dce6b63b4c04
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Tue Dec 8 11:20:50 2020 -0600
token type should be COMPARE_EQUAL/COMPARE_NOT_EQUAL not COMPARE_TO
https://github.com/groovy/groovy-eclipse/issues/1209
---
.../groovy/transform/sc/transformers/CompareToNullExpression.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/sc/transformers/CompareToNullExpression.java b/src/main/java/org/codehaus/groovy/transform/sc/transformers/CompareToNullExpression.java
index 5a661a9..6e1cecd 100644
--- a/src/main/java/org/codehaus/groovy/transform/sc/transformers/CompareToNullExpression.java
+++ b/src/main/java/org/codehaus/groovy/transform/sc/transformers/CompareToNullExpression.java
@@ -27,7 +27,6 @@ import org.codehaus.groovy.ast.expr.ExpressionTransformer;
import org.codehaus.groovy.classgen.AsmClassGenerator;
import org.codehaus.groovy.classgen.asm.WriterController;
import org.codehaus.groovy.syntax.Token;
-import org.codehaus.groovy.syntax.Types;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
@@ -40,10 +39,10 @@ import static org.objectweb.asm.Opcodes.IFNULL;
public class CompareToNullExpression extends BinaryExpression {
private final boolean equalsNull;
- public CompareToNullExpression(final Expression objectExpression, final boolean compareToNull) {
- super(objectExpression, new Token(Types.COMPARE_TO, compareToNull ? "==" : "!=", -1, -1), ConstantExpression.NULL);
+ public CompareToNullExpression(final Expression expression, final boolean equalsNull) {
+ super(expression, Token.newSymbol(equalsNull ? "==" : "!=", -1, -1), ConstantExpression.NULL);
super.setType(ClassHelper.boolean_TYPE);
- this.equalsNull = compareToNull;
+ this.equalsNull = equalsNull;
}
public Expression getObjectExpression() {