Merge pull request #229 from scratchcpp/fix_list_tostring_digits

Fix #188: Join digits without spaces in List::toString()

Author: adazem009

src/scratch/list.cpp

@@ -43,14 +43,36 @@ bool List::contains(const Value &value) const
     return (indexOf(value) != -1);
 }
 
-/*! Joins the list items with spaces. */
+/*! Joins the list items with spaces or without any separator if there are only digits. */
 std::string List::toString() const
 {
     std::string ret;
-    for (int i = 0; i < size(); i++) {
-        ret.append(at(i).toString());
-        if (i + 1 < size())
-            ret.push_back(' ');
+    bool digits = true;
+
+    for (const auto &item : *this) {
+        if (item.type() == Value::Type::Integer) {
+            long num = item.toLong();
+
+            if (num < 0 || num >= 10) {
+                digits = false;
+                break;
+            }
+        } else {
+            digits = false;
+            break;
+        }
     }
+
+    if (digits) {
+        for (const auto &item : *this)
+            ret.append(item.toString());
+    } else {
+        for (int i = 0; i < size(); i++) {
+            ret.append(at(i).toString());
+            if (i + 1 < size())
+                ret.push_back(' ');
+        }
+    }
+
     return ret;
 }

test/engine/engine_test.cpp

@@ -422,7 +422,7 @@ TEST(EngineTest, Clones)
         if (i < 10)
             ASSERT_EQ((*list)[i].toInt(), 1);
         else
-            ASSERT_EQ((*list)[i].toString(), "1 2"); // TODO: Change this to "12" after #188 is fixed
+            ASSERT_EQ((*list)[i].toString(), "12");
     }
 }
 

test/scratch_classes/list_test.cpp

@@ -151,4 +151,22 @@ TEST(ListTest, ToString)
     list.push_back("áä");
     list.push_back("ľ š");
     ASSERT_EQ(list.toString(), "áä ľ š");
+
+    list.clear();
+    list.push_back(-2);
+    list.push_back(5);
+    list.push_back(8);
+    ASSERT_EQ(list.toString(), "-2 5 8");
+
+    list.clear();
+    list.push_back(2);
+    list.push_back(10);
+    list.push_back(8);
+    ASSERT_EQ(list.toString(), "2 10 8");
+
+    list.clear();
+    list.push_back(0);
+    list.push_back(9);
+    list.push_back(8);
+    ASSERT_EQ(list.toString(), "098");
 }