Merge pull request #236 from scratchcpp/fix_zero_and_nan_comparison

Fix #198: Fix comparison of 0 with NaN

Author: adazem009

include/scratchcpp/value.h

@@ -553,9 +553,12 @@ class LIBSCRATCHCPP_EXPORT Value
                         return doubleToString(d1) == v2.toString();
                     else
                         return stringsEqual(v1.toUtf16(), v2.toUtf16());
-                } else if (v1.isNumber() || v2.isNumber())
-                    return v1.toDouble() == v2.toDouble();
-                else if (v1.isBool() || v2.isBool())
+                } else if (v1.isNumber() || v2.isNumber()) {
+                    if (static_cast<int>(v1.m_type) < 0 || static_cast<int>(v2.m_type) < 0)
+                        return false;
+                    else
+                        return v1.toDouble() == v2.toDouble();
+                } else if (v1.isBool() || v2.isBool())
                     return ((v1.m_type != Type::NaN && v2.m_type != Type::NaN) && (v1.toBool() == v2.toBool()));
                 else
                     return false;

src/blocks/operatorblocks.cpp

@@ -257,7 +257,7 @@ unsigned int OperatorBlocks::op_ln(VirtualMachine *vm)
     const Value &v = *vm->getInput(0, 1);
     if (v < 0)
         vm->replaceReturnValue(Value(Value::SpecialValue::NaN), 1);
-    else if (v == 0)
+    else if (v == 0 || v.isNaN())
         vm->replaceReturnValue(Value(Value::SpecialValue::NegativeInfinity), 1);
     else if (!v.isInfinity())
         vm->replaceReturnValue(std::log(v.toDouble()), 1);
@@ -269,7 +269,7 @@ unsigned int OperatorBlocks::op_log(VirtualMachine *vm)
     const Value &v = *vm->getInput(0, 1);
     if (v < 0)
         vm->replaceReturnValue(Value(Value::SpecialValue::NaN), 1);
-    else if (v == 0)
+    else if (v == 0 || v.isNaN())
         vm->replaceReturnValue(Value(Value::SpecialValue::NegativeInfinity), 1);
     else if (!v.isInfinity())
         vm->replaceReturnValue(std::log10(v.toDouble()), 1);

test/scratch_classes/value_test.cpp

@@ -1873,9 +1873,8 @@ TEST(ValueTest, EqualityOperators)
         ASSERT_FALSE(v1 == v5);
         ASSERT_TRUE(v1 != v5);
 
-        // TODO: Enable this after #198 is fixed
-        /*ASSERT_FALSE(v2 == v5);
-        ASSERT_TRUE(v2 != v5);*/
+        ASSERT_FALSE(v2 == v5);
+        ASSERT_TRUE(v2 != v5);
     }
 
     {
@@ -2042,8 +2041,7 @@ TEST(ValueTest, EqualityOperators)
         ASSERT_FALSE(v3 == v7);
         ASSERT_TRUE(v3 != v7);
 
-        // TODO: Enable this after #198 is fixed
-        /*ASSERT_FALSE(v4 == v7);
-        ASSERT_TRUE(v4 != v7);*/
+        ASSERT_FALSE(v4 == v7);
+        ASSERT_TRUE(v4 != v7);
     }
 }