List: Set string size in toStringPtr()

Author: adazem009

include/scratchcpp/list.h

@@ -180,52 +180,52 @@ class LIBSCRATCHCPP_EXPORT List : public Entity
             }
 
             StringPtr *ret = string_pool_new();
-            size_t offset = 0;
+            ret->size = 0;
 
             if (digits) {
                 string_alloc(ret, size);
 
                 for (i = 0; i < strings.size(); i++) {
-                    memcpy(ret->data + offset, strings[i]->data, strings[i]->size * sizeof(char16_t));
-                    offset += strings[i]->size;
+                    memcpy(ret->data + ret->size, strings[i]->data, strings[i]->size * sizeof(char16_t));
+                    ret->size += strings[i]->size;
                     string_pool_free(strings[i]);
                 }
 
                 for (; i < m_size; i++) {
                     StringPtr *item = value_toStringPtr(&m_dataPtr->operator[](i));
                     size += item->size + 1;
                     string_alloc(ret, size);
-                    memcpy(ret->data + offset, item->data, item->size * sizeof(char16_t));
-                    offset += item->size;
+                    memcpy(ret->data + ret->size, item->data, item->size * sizeof(char16_t));
+                    ret->size += item->size;
                     string_pool_free(item);
                 }
             } else {
                 size += strings.size() - 1;
                 string_alloc(ret, size);
 
                 for (i = 0; i < strings.size(); i++) {
-                    memcpy(ret->data + offset, strings[i]->data, strings[i]->size * sizeof(char16_t));
-                    offset += strings[i]->size;
+                    memcpy(ret->data + ret->size, strings[i]->data, strings[i]->size * sizeof(char16_t));
+                    ret->size += strings[i]->size;
                     string_pool_free(strings[i]);
 
                     if (i + 1 < m_size)
-                        ret->data[offset++] = u' ';
+                        ret->data[ret->size++] = u' ';
                 }
 
                 for (; i < m_size; i++) {
                     StringPtr *item = value_toStringPtr(&m_dataPtr->operator[](i));
                     size += item->size + 1;
                     string_alloc(ret, size);
-                    memcpy(ret->data + offset, item->data, item->size * sizeof(char16_t));
-                    offset += item->size;
+                    memcpy(ret->data + ret->size, item->data, item->size * sizeof(char16_t));
+                    ret->size += item->size;
                     string_pool_free(item);
 
                     if (i + 1 < m_size)
-                        ret->data[offset++] = u' ';
+                        ret->data[ret->size++] = u' ';
                 }
             }
 
-            ret->data[offset] = u'\0';
+            ret->data[ret->size] = u'\0';
             return ret;
         }
 

test/scratch_classes/list_test.cpp

@@ -281,17 +281,20 @@ TEST(ListTest, ToString)
     List list("", "test list");
     StringPtr *str = list.toStringPtr();
     ASSERT_EQ(utf8::utf16to8(std::u16string(str->data)), "");
+    ASSERT_EQ(str->size, 0);
     ASSERT_EQ(list.toString(), "");
 
     list.append("");
     str = list.toStringPtr();
     ASSERT_EQ(utf8::utf16to8(std::u16string(str->data)), "");
+    ASSERT_EQ(str->size, 0);
     ASSERT_EQ(list.toString(), "");
 
     list.append("");
     list.append("");
     str = list.toStringPtr();
     ASSERT_EQ(utf8::utf16to8(std::u16string(str->data)), "  ");
+    ASSERT_EQ(str->size, 2);
     ASSERT_EQ(list.toString(), "  ");
 
     list.clear();
@@ -300,6 +303,7 @@ TEST(ListTest, ToString)
     list.append("item 3");
     str = list.toStringPtr();
     ASSERT_EQ(utf8::utf16to8(std::u16string(str->data)), "item1 i t e m 2 item 3");
+    ASSERT_EQ(str->size, 22);
     ASSERT_EQ(list.toString(), "item1 i t e m 2 item 3");
 
     list.clear();
@@ -309,13 +313,15 @@ TEST(ListTest, ToString)
     list.append(" c ");
     str = list.toStringPtr();
     ASSERT_EQ(utf8::utf16to8(std::u16string(str->data)), "  a   b  c ");
+    ASSERT_EQ(str->size, 11);
     ASSERT_EQ(list.toString(), "  a   b  c ");
 
     list.clear();
     list.append("áä");
     list.append("ľ š");
     str = list.toStringPtr();
     ASSERT_EQ(utf8::utf16to8(std::u16string(str->data)), "áä ľ š");
+    ASSERT_EQ(str->size, 6);
     ASSERT_EQ(list.toString(), "áä ľ š");
 
     list.clear();
@@ -324,6 +330,7 @@ TEST(ListTest, ToString)
     list.append(8);
     str = list.toStringPtr();
     ASSERT_EQ(utf8::utf16to8(std::u16string(str->data)), "-2 5 8");
+    ASSERT_EQ(str->size, 6);
     ASSERT_EQ(list.toString(), "-2 5 8");
 
     list.clear();
@@ -332,6 +339,7 @@ TEST(ListTest, ToString)
     list.append(8);
     str = list.toStringPtr();
     ASSERT_EQ(utf8::utf16to8(std::u16string(str->data)), "2 10 8");
+    ASSERT_EQ(str->size, 6);
     ASSERT_EQ(list.toString(), "2 10 8");
 
     list.clear();
@@ -340,20 +348,23 @@ TEST(ListTest, ToString)
     list.append(8);
     str = list.toStringPtr();
     ASSERT_EQ(utf8::utf16to8(std::u16string(str->data)), "098");
+    ASSERT_EQ(str->size, 3);
     ASSERT_EQ(list.toString(), "098");
 
     list.clear();
     list.append("true");
     list.append("false");
     str = list.toStringPtr();
     ASSERT_EQ(utf8::utf16to8(std::u16string(str->data)), "true false");
+    ASSERT_EQ(str->size, 10);
     ASSERT_EQ(list.toString(), "true false");
 
     list.clear();
     list.append(true);
     list.append(false);
     str = list.toStringPtr();
     ASSERT_EQ(utf8::utf16to8(std::u16string(str->data)), "true false");
+    ASSERT_EQ(str->size, 10);
     ASSERT_EQ(list.toString(), "true false");
 }