Fix GT and LT value comparison to match Scratch

Author: adazem009

src/engine/virtualmachine_p.cpp

@@ -537,20 +537,22 @@ unsigned int *VirtualMachinePrivate::run(unsigned int *pos, bool reset)
     OP(ASIN) :
     {
         const Value &v = *READ_REG(0, 1);
-        if (v < -1 || v > 1)
+        const double num = v.toDouble();
+        if (num < -1 || num > 1)
             REPLACE_RET_VALUE(std::numeric_limits<double>::quiet_NaN(), 1);
         else
-            REPLACE_RET_VALUE(std::asin(v.toDouble()) * 180 / pi, 1);
+            REPLACE_RET_VALUE(std::asin(num) * 180 / pi, 1);
         DISPATCH();
     }
 
     OP(ACOS) :
     {
         const Value &v = *READ_REG(0, 1);
-        if (v < -1 || v > 1)
+        const double num = v.toDouble();
+        if (num < -1 || num > 1)
             REPLACE_RET_VALUE(std::numeric_limits<double>::quiet_NaN(), 1);
         else
-            REPLACE_RET_VALUE(std::acos(v.toDouble()) * 180 / pi, 1);
+            REPLACE_RET_VALUE(std::acos(num) * 180 / pi, 1);
         DISPATCH();
     }
 

src/scratch/value_functions.cpp

@@ -372,93 +372,19 @@ extern "C"
     /*! Returns true if the given values are equal. */
     bool value_equals(const libscratchcpp::ValueData *v1, const libscratchcpp::ValueData *v2)
     {
-        // https://github.com/scratchfoundation/scratch-vm/blob/112989da0e7306eeb405a5c52616e41c2164af24/src/util/cast.js#L121-L150
-        assert(v1 && v2);
-
-        if (v1->type == ValueType::Number && v2->type == ValueType::Number) {
-            if (std::isnan(v1->numberValue) && std::isnan(v2->numberValue))
-                return true;
-
-            return v1->numberValue == v2->numberValue;
-        } else if (v1->type == ValueType::Bool && v2->type == ValueType::Bool)
-            return v1->boolValue == v2->boolValue;
-
-        bool ok;
-        double n1 = value_getNumber(v1, &ok);
-        double n2;
-
-        if (ok)
-            n2 = value_getNumber(v2, &ok);
-
-        if (!ok) {
-            // At least one argument can't be converted to a number
-            // Scratch compares strings as case insensitive
-            std::u16string s1, s2;
-            value_toUtf16(v1, &s1);
-            value_toUtf16(v2, &s2);
-            return value_u16StringsEqual(s1, s2);
-        }
-
-        // Handle the special case of Infinity
-        if ((static_cast<int>(v1->type) < 0) && (static_cast<int>(v2->type) < 0)) {
-            assert(!value_isNaN(v1));
-            assert(!value_isNaN(v2));
-            return v1->type == v2->type;
-        }
-
-        // Compare as numbers
-        return n1 == n2;
+        return value_compare(v1, v2) == 0;
     }
 
     /*! Returns true if the first value is greater than the second value. */
     bool value_greater(const libscratchcpp::ValueData *v1, const libscratchcpp::ValueData *v2)
     {
-        assert(v1 && v2);
-
-        if (v1->type == ValueType::Number && v2->type == ValueType::Number)
-            return v1->numberValue > v2->numberValue;
-        else if (v1->type == ValueType::Bool && v2->type == ValueType::Bool)
-            return v1->boolValue > v2->boolValue;
-
-        double n1, n2;
-
-        if (v1->type == ValueType::String)
-            n1 = value_stringToDouble(v1->stringValue);
-        else
-            n1 = value_toDouble(v1);
-
-        if (v2->type == ValueType::String)
-            n2 = value_stringToDouble(v2->stringValue);
-        else
-            n2 = value_toDouble(v2);
-
-        return n1 > n2;
+        return value_compare(v1, v2) > 0;
     }
 
     /*! Returns true if the first value is lower than the second value. */
     bool value_lower(const libscratchcpp::ValueData *v1, const libscratchcpp::ValueData *v2)
     {
-        assert(v1 && v2);
-
-        if (v1->type == ValueType::Number && v2->type == ValueType::Number)
-            return v1->numberValue < v2->numberValue;
-        else if (v1->type == ValueType::Bool && v2->type == ValueType::Bool)
-            return v1->boolValue < v2->boolValue;
-
-        return value_toDouble(v1) < value_toDouble(v2);
-        double n1, n2;
-
-        if (v1->type == ValueType::String)
-            n1 = value_stringToDouble(v1->stringValue);
-        else
-            n1 = value_toDouble(v1);
-
-        if (v2->type == ValueType::String)
-            n2 = value_stringToDouble(v2->stringValue);
-        else
-            n2 = value_toDouble(v2);
-
-        return n1 < n2;
+        return value_compare(v1, v2) < 0;
     }
 }
 

src/scratch/value_functions_p.h

@@ -539,6 +539,46 @@ extern "C"
         else
             return false;
     }
+
+    inline double value_compare(const ValueData *v1, const ValueData *v2)
+    {
+        // https://github.com/scratchfoundation/scratch-vm/blob/112989da0e7306eeb405a5c52616e41c2164af24/src/util/cast.js#L121-L150
+        assert(v1 && v2);
+
+        if (v1->type == ValueType::Number && v2->type == ValueType::Number && !std::isnan(v1->numberValue) && !std::isnan(v2->numberValue)) {
+            // Handle the special case of Infinity
+            if ((value_isInf(v1->numberValue) && value_isInf(v2->numberValue)) || (value_isNegativeInf(v1->numberValue) && value_isNegativeInf(v2->numberValue)))
+                return 0;
+
+            return v1->numberValue - v2->numberValue;
+        } else if (v1->type == ValueType::Bool && v2->type == ValueType::Bool)
+            return v1->boolValue - v2->boolValue;
+
+        bool ok;
+        double n1 = value_getNumber(v1, &ok);
+        double n2;
+
+        if (ok)
+            n2 = value_getNumber(v2, &ok);
+
+        if (!ok) {
+            // At least one argument can't be converted to a number
+            // Scratch compares strings as case insensitive
+            char *s1 = value_toCString(v1);
+            char *s2 = value_toCString(v2);
+            int ret = strcasecmp(s1, s2);
+            free(s1);
+            free(s2);
+            return ret;
+        }
+
+        // Handle the special case of Infinity
+        if ((value_isInf(n1) && value_isInf(n2)) || (value_isNegativeInf(n1) && value_isNegativeInf(n2)))
+            return 0;
+
+        // Compare as numbers
+        return n1 - n2;
+    }
 }
 
 } // namespace libscratchcpp