Add value_stringToDoubleWithCheck() function

Author: adazem009

include/scratchcpp/value_functions.h

@@ -85,6 +85,7 @@ extern "C"
     LIBSCRATCHCPP_EXPORT StringPtr *value_doubleToStringPtr(double v);
     LIBSCRATCHCPP_EXPORT const StringPtr *value_boolToStringPtr(bool v);
     LIBSCRATCHCPP_EXPORT double value_stringToDouble(const StringPtr *s);
+    LIBSCRATCHCPP_EXPORT double value_stringToDoubleWithCheck(const StringPtr *s, bool *ok);
     LIBSCRATCHCPP_EXPORT bool value_stringToBool(const StringPtr *s);
 
     LIBSCRATCHCPP_EXPORT void value_add(const ValueData *v1, const ValueData *v2, ValueData *dst);

src/scratch/value_functions.cpp

@@ -501,6 +501,22 @@ extern "C"
         return value_stringToDoubleImpl(s->data, s->size);
     }
 
+    /*!
+     * Converts the given string to double.
+     * \param[out] ok Whether the conversion was successful.
+     */
+    double value_stringToDoubleWithCheck(const StringPtr *s, bool *ok)
+    {
+        *ok = true;
+
+        if (string_compare_case_sensitive(s, &INFINITY_STR) == 0)
+            return std::numeric_limits<double>::infinity();
+        else if (string_compare_case_sensitive(s, &NEGATIVE_INFINITY_STR) == 0)
+            return -std::numeric_limits<double>::infinity();
+
+        return value_stringToDoubleImpl(s->data, s->size, ok);
+    }
+
     /*! Converts the given string to boolean. */
     bool value_stringToBool(const StringPtr *s)
     {

test/scratch_classes/value_test.cpp

@@ -3387,6 +3387,57 @@ TEST(ValueTest, StringToDouble)
     ASSERT_EQ(value_stringToDouble(string_pool_new_assign("0b-1")), 0.0);
 }
 
+TEST(ValueTest, StringToDoubleWithCheck)
+{
+    bool ok;
+
+    ASSERT_EQ(value_stringToDoubleWithCheck(string_pool_new_assign("2147483647"), &ok), 2147483647.0);
+    ASSERT_TRUE(ok);
+
+    ASSERT_EQ(value_stringToDoubleWithCheck(string_pool_new_assign("-255.625"), &ok), -255.625);
+    ASSERT_TRUE(ok);
+
+    ASSERT_EQ(value_stringToDoubleWithCheck(string_pool_new_assign("0"), &ok), 0.0);
+    ASSERT_TRUE(ok);
+
+    ASSERT_EQ(value_stringToDoubleWithCheck(string_pool_new_assign("-0"), &ok), -0.0);
+    ASSERT_TRUE(ok);
+
+    ASSERT_EQ(value_stringToDoubleWithCheck(string_pool_new_assign("+.15"), &ok), 0.15);
+    ASSERT_TRUE(ok);
+
+    ASSERT_EQ(value_stringToDoubleWithCheck(string_pool_new_assign("0+5"), &ok), 0.0);
+    ASSERT_FALSE(ok);
+
+    ASSERT_EQ(value_stringToDoubleWithCheck(string_pool_new_assign("0-5"), &ok), 0.0);
+    ASSERT_FALSE(ok);
+
+    ASSERT_EQ(value_stringToDoubleWithCheck(string_pool_new_assign("1 2 3"), &ok), 0.0);
+    ASSERT_FALSE(ok);
+
+    ASSERT_EQ(value_stringToDoubleWithCheck(string_pool_new_assign("false"), &ok), 0.0);
+    ASSERT_FALSE(ok);
+
+    ASSERT_EQ(value_stringToDoubleWithCheck(string_pool_new_assign("true"), &ok), 0.0);
+    ASSERT_FALSE(ok);
+
+    double result = value_stringToDoubleWithCheck(string_pool_new_assign("Infinity"), &ok);
+    ASSERT_GT(result, 0);
+    ASSERT_TRUE(std::isinf(result));
+    ASSERT_TRUE(ok);
+
+    result = value_stringToDoubleWithCheck(string_pool_new_assign("-Infinity"), &ok);
+    ASSERT_LT(result, 0);
+    ASSERT_TRUE(std::isinf(result));
+    ASSERT_TRUE(ok);
+
+    ASSERT_EQ(value_stringToDoubleWithCheck(string_pool_new_assign("NaN"), &ok), 0.0);
+    ASSERT_FALSE(ok);
+
+    ASSERT_EQ(value_stringToDoubleWithCheck(string_pool_new_assign("something"), &ok), 0.0);
+    ASSERT_FALSE(ok);
+}
+
 TEST(ValueTest, StringToBool)
 {
     ASSERT_TRUE(value_stringToBool(string_pool_new_assign("2147483647")));