#421 fixes inconsistent equals behaviour

ezylang · Jan 15, 2024 · 50a122b · 50a122b
1 parent 3d8fb02
commit 50a122b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/com/ezylang/evalex/operators/booleans/InfixEqualsOperator.java b/src/main/java/com/ezylang/evalex/operators/booleans/InfixEqualsOperator.java
@@ -30,12 +30,12 @@ public class InfixEqualsOperator extends AbstractOperator {
   @Override
   public EvaluationValue evaluate(
       Expression expression, Token operatorToken, EvaluationValue... operands) {
+    if (operands[0].getDataType() != operands[1].getDataType()) {
+      return EvaluationValue.booleanValue(false);
+    }
     if (operands[0].isNullValue() && operands[1].isNullValue()) {
       return EvaluationValue.booleanValue(true);
     }
-    if (operands[0].isNullValue() || operands[1].isNullValue()) {
-      return EvaluationValue.booleanValue(false);
-    }
     return expression.convertValue(operands[0].compareTo(operands[1]) == 0);
   }
 }
diff --git a/src/main/java/com/ezylang/evalex/operators/booleans/InfixNotEqualsOperator.java b/src/main/java/com/ezylang/evalex/operators/booleans/InfixNotEqualsOperator.java
@@ -30,12 +30,12 @@ public class InfixNotEqualsOperator extends AbstractOperator {
   @Override
   public EvaluationValue evaluate(
       Expression expression, Token operatorToken, EvaluationValue... operands) {
+    if (operands[0].getDataType() != operands[1].getDataType()) {
+      return EvaluationValue.booleanValue(true);
+    }
     if (operands[0].isNullValue() && operands[1].isNullValue()) {
       return EvaluationValue.booleanValue(false);
     }
-    if (operands[0].isNullValue() || operands[1].isNullValue()) {
-      return EvaluationValue.booleanValue(true);
-    }
     return expression.convertValue(operands[0].compareTo(operands[1]) != 0);
   }
 }