Remove obsolete value assignment and operator functions

Author: adazem009

include/scratchcpp/value.h

@@ -22,38 +22,18 @@ class LIBSCRATCHCPP_EXPORT Value
 {
     public:
         /*! Constructs a number Value. */
-        Value(float numberValue)
-        {
-            value_init(&m_data);
-            value_assign_float(&m_data, numberValue);
-        }
-
-        /*! Constructs a number Value. */
-        Value(double numberValue)
+        Value(double numberValue = 0.0)
         {
             value_init(&m_data);
             value_assign_double(&m_data, numberValue);
         }
 
         /*! Constructs a number Value. */
-        Value(int numberValue = 0)
+        template<typename T, typename = std::enable_if_t<std::is_integral<T>::value>>
+        Value(T numberValue)
         {
             value_init(&m_data);
-            value_assign_int(&m_data, numberValue);
-        }
-
-        /*! Constructs a number Value. */
-        Value(size_t numberValue)
-        {
-            value_init(&m_data);
-            value_assign_size_t(&m_data, numberValue);
-        }
-
-        /*! Constructs a number Value. */
-        Value(long numberValue)
-        {
-            value_init(&m_data);
-            value_assign_long(&m_data, numberValue);
+            value_assign_double(&m_data, numberValue);
         }
 
         /*! Constructs a boolean Value. */
@@ -181,27 +161,16 @@ class LIBSCRATCHCPP_EXPORT Value
         /*! Replaces the value with modulo of the value and the given value. */
         void mod(const Value &v) { value_mod(&m_data, &v.m_data, &m_data); }
 
-        const Value &operator=(float v)
-        {
-            value_assign_float(&m_data, v);
-            return *this;
-        }
-
         const Value &operator=(double v)
         {
             value_assign_double(&m_data, v);
             return *this;
         }
 
-        const Value &operator=(int v)
-        {
-            value_assign_int(&m_data, v);
-            return *this;
-        }
-
-        const Value &operator=(long v)
+        template<typename T, typename = std::enable_if_t<std::is_integral<T>::value>>
+        const Value &operator=(T v)
         {
-            value_assign_long(&m_data, v);
+            value_assign_double(&m_data, v);
             return *this;
         }
 

include/scratchcpp/value_functions.h

@@ -11,11 +11,7 @@ extern "C"
 
     LIBSCRATCHCPP_EXPORT void value_init(ValueData *v);
 
-    LIBSCRATCHCPP_EXPORT void value_assign_float(ValueData *v, float numberValue);
     LIBSCRATCHCPP_EXPORT void value_assign_double(ValueData *v, double numberValue);
-    LIBSCRATCHCPP_EXPORT void value_assign_int(ValueData *v, int numberValue);
-    LIBSCRATCHCPP_EXPORT void value_assign_size_t(ValueData *v, size_t numberValue);
-    LIBSCRATCHCPP_EXPORT void value_assign_long(ValueData *v, long numberValue);
     LIBSCRATCHCPP_EXPORT void value_assign_bool(ValueData *v, bool boolValue);
     LIBSCRATCHCPP_EXPORT void value_assign_string(ValueData *v, const std::string &stringValue);
     LIBSCRATCHCPP_EXPORT void value_assign_cstring(ValueData *v, const char *stringValue);

src/scratch/value_functions.cpp

@@ -33,23 +33,6 @@ extern "C"
 
     /* assign */
 
-    /*! Assigns number of type 'float' to the given value. */
-    void value_assign_float(ValueData *v, float numberValue)
-    {
-        value_free(v);
-
-        if (value_isInf(numberValue))
-            v->type = ValueType::Infinity;
-        else if (value_isNegativeInf(numberValue))
-            v->type = ValueType::NegativeInfinity;
-        else if (std::isnan(numberValue))
-            v->type = ValueType::NaN;
-        else {
-            v->type = ValueType::Number;
-            v->numberValue = value_floatToDouble(numberValue);
-        }
-    }
-
     /*! Assigns number of type 'double' to the given value. */
     void value_assign_double(ValueData *v, double numberValue)
     {
@@ -67,33 +50,6 @@ extern "C"
         }
     }
 
-    /*! Assigns number of type 'int' to the given value. */
-    void value_assign_int(ValueData *v, int numberValue)
-    {
-        value_free(v);
-
-        v->type = ValueType::Number;
-        v->numberValue = numberValue;
-    }
-
-    /*! Assigns number of type 'size_t' to the given value. */
-    void value_assign_size_t(ValueData *v, size_t numberValue)
-    {
-        value_free(v);
-
-        v->type = ValueType::Number;
-        v->numberValue = numberValue;
-    }
-
-    /*! Assigns number of type 'long' to the given value. */
-    void value_assign_long(ValueData *v, long numberValue)
-    {
-        value_free(v);
-
-        v->type = ValueType::Number;
-        v->numberValue = numberValue;
-    }
-
     /*! Assigns boolean to the given value. */
     void value_assign_bool(ValueData *v, bool boolValue)
     {

src/scratch/value_functions_p.h

@@ -38,20 +38,17 @@ inline unsigned int value_digitCount(T v)
     return i + j;
 }
 
-template<typename T>
-inline bool value_isInf(T v)
-{
-    return v > 0 && std::isinf(v);
-}
-
-template<typename T>
-inline bool value_isNegativeInf(T v)
-{
-    return v < 0 && std::isinf(v);
-}
-
 extern "C"
 {
+    inline bool value_isInf(double v)
+    {
+        return v > 0 && std::isinf(v);
+    }
+
+    inline bool value_isNegativeInf(double v)
+    {
+        return v < 0 && std::isinf(v);
+    }
 
     inline long value_convert_int_str(const char *str, int n, bool *ok)
     {