Merge pull request #532 from scratchcpp/fix_value_tobool

Fix #517: Rewrite Value::toBool()

Author: adazem009

include/scratchcpp/value.h

@@ -320,23 +320,22 @@ class LIBSCRATCHCPP_EXPORT Value
         /*! Returns the boolean representation of the value. */
         bool toBool() const
         {
-            if (static_cast<int>(m_type) < 0) {
-                return false;
-            } else {
-                switch (m_type) {
-                    case Type::Bool:
-                        return m_boolValue;
-                    case Type::Integer:
-                        return m_intValue == 1 ? true : false;
-                    case Type::Double:
-                        return m_doubleValue == 1 ? true : false;
-                    case Type::String: {
-                        const std::string &str = m_stringValue;
-                        return (stringsEqual(str, "true") || str == "1");
-                    }
-                    default:
-                        return false;
-                }
+            switch (m_type) {
+                case Type::Bool:
+                    return m_boolValue;
+                case Type::Integer:
+                    return m_intValue != 0;
+                case Type::Double:
+                    return m_doubleValue != 0;
+                case Type::String:
+                    return !m_stringValue.empty() && !stringsEqual(m_stringValue, "false") && m_stringValue != "0";
+                case Type::Infinity:
+                case Type::NegativeInfinity:
+                    return true;
+                case Type::NaN:
+                    return false;
+                default:
+                    return false;
             }
         };
 

test/scratch_classes/value_test.cpp

@@ -1274,19 +1274,19 @@ TEST(ValueTest, ToDouble)
 TEST(ValueTest, ToBool)
 {
     Value v = 2147483647;
-    ASSERT_EQ(v.toBool(), false);
+    ASSERT_EQ(v.toBool(), true);
     v = -2147483647;
-    ASSERT_EQ(v.toBool(), false);
+    ASSERT_EQ(v.toBool(), true);
 
     v = 2.54;
-    ASSERT_EQ(v.toBool(), false);
+    ASSERT_EQ(v.toBool(), true);
     v = 2.54f;
-    ASSERT_EQ(v.toBool(), false);
+    ASSERT_EQ(v.toBool(), true);
 
     v = -2.54;
-    ASSERT_EQ(v.toBool(), false);
+    ASSERT_EQ(v.toBool(), true);
     v = -2.54f;
-    ASSERT_EQ(v.toBool(), false);
+    ASSERT_EQ(v.toBool(), true);
 
     v = false;
     ASSERT_EQ(v.toBool(), false);
@@ -1298,36 +1298,44 @@ TEST(ValueTest, ToBool)
     v = 1;
     ASSERT_EQ(v.toBool(), true);
     v = -1;
-    ASSERT_EQ(v.toBool(), false);
+    ASSERT_EQ(v.toBool(), true);
 
     v = "2147483647";
-    ASSERT_EQ(v.toBool(), false);
+    ASSERT_EQ(v.toBool(), true);
     v = "-2147483647";
-    ASSERT_EQ(v.toBool(), false);
+    ASSERT_EQ(v.toBool(), true);
 
     v = "255.625";
-    ASSERT_EQ(v.toBool(), false);
+    ASSERT_EQ(v.toBool(), true);
     v = "-255.625";
+    ASSERT_EQ(v.toBool(), true);
+
+    v = "0";
     ASSERT_EQ(v.toBool(), false);
 
     v = "false";
     ASSERT_EQ(v.toBool(), false);
     v = "true";
     ASSERT_EQ(v.toBool(), true);
+    v = "FaLsE";
+    ASSERT_EQ(v.toBool(), false);
+    v = "TrUe";
+    ASSERT_EQ(v.toBool(), true);
 
     v = "Infinity";
-    ASSERT_EQ(v.toBool(), false);
+    ASSERT_EQ(v.toBool(), true);
     v = "-Infinity";
-    ASSERT_EQ(v.toBool(), false);
+    ASSERT_EQ(v.toBool(), true);
     v = "NaN";
     ASSERT_EQ(v.toBool(), false);
 
     v = "something";
+    ASSERT_EQ(v.toBool(), true);
+    v = "";
     ASSERT_EQ(v.toBool(), false);
 
-    // TODO: Uncomment this (#517)
     // Hex
-    /*v = "0xafe";
+    v = "0xafe";
     ASSERT_TRUE(v.isString());
     ASSERT_TRUE(v.toBool());
 
@@ -1341,15 +1349,15 @@ TEST(ValueTest, ToBool)
 
     v = "0x0";
     ASSERT_TRUE(v.isString());
-    ASSERT_FALSE(v.toBool());
+    ASSERT_TRUE(v.toBool());
 
     v = "0XBaCD";
     ASSERT_TRUE(v.isString());
     ASSERT_TRUE(v.toBool());
 
     v = "0xAbG";
     ASSERT_TRUE(v.isString());
-    ASSERT_FALSE(v.toBool());
+    ASSERT_TRUE(v.toBool());
 
     // Octal
     v = "0o506";
@@ -1366,7 +1374,7 @@ TEST(ValueTest, ToBool)
 
     v = "0o5783";
     ASSERT_TRUE(v.isString());
-    ASSERT_FALSE(v.toBool());
+    ASSERT_TRUE(v.toBool());
 
     // Binary
     v = "0b101101";
@@ -1383,7 +1391,7 @@ TEST(ValueTest, ToBool)
 
     v = "0b100112001";
     ASSERT_TRUE(v.isString());
-    ASSERT_FALSE(v.toBool());*/
+    ASSERT_TRUE(v.toBool());
 }
 
 TEST(ValueTest, ToString)