Value: Fix string assignment operator

Author: adazem009

src/scratch/value.cpp

@@ -53,25 +53,7 @@ Value::Value(const std::string &stringValue) :
     ValueVariant(stringValue),
     m_type(Type::String)
 {
-    if (stringValue.empty())
-        return;
-    else if (stringValue == "Infinity") {
-        m_type = Type::Infinity;
-        return;
-    } else if (stringValue == "-Infinity") {
-        m_type = Type::NegativeInfinity;
-        return;
-    } else if (stringValue == "NaN") {
-        m_type = Type::NaN;
-        return;
-    }
-
-    bool ok;
-    float f = stringToDouble(stringValue, &ok);
-    if (ok) {
-        *this = f;
-        m_type = Type::Number;
-    }
+    initString(stringValue);
 }
 
 /*! Constructs a string Value. */

src/scratch/value.h

@@ -289,13 +289,15 @@ class LIBSCRATCHCPP_EXPORT Value : public ValueVariant
         {
             m_type = Type::String;
             ValueVariant::operator=(v);
+            initString(v);
             return *this;
         }
 
         inline const Value &operator=(const char *v)
         {
             m_type = Type::String;
             ValueVariant::operator=(std::string(v));
+            initString(v);
             return *this;
         }
 
@@ -305,6 +307,31 @@ class LIBSCRATCHCPP_EXPORT Value : public ValueVariant
         static double stringToDouble(const std::string &s, bool *ok = nullptr);
         static long stringToLong(const std::string &s, bool *ok = nullptr);
 
+        inline void initString(const std::string &str)
+        {
+            if (str.empty())
+                return;
+            else if (str == "Infinity") {
+                m_type = Type::Infinity;
+                return;
+            } else if (str == "-Infinity") {
+                m_type = Type::NegativeInfinity;
+                return;
+            } else if (str == "NaN") {
+                m_type = Type::NaN;
+                return;
+            }
+
+            bool ok;
+            float f = stringToDouble(str, &ok);
+            if (ok) {
+                *this = f;
+                m_type = Type::Number;
+            }
+        }
+
+        inline void initString(const char *str) { initString(std::string(str)); }
+
         Type m_type;
 
         friend inline bool operator==(const Value &v1, const Value &v2)