Add string constructor to StringPtr

Author: adazem009

include/scratchcpp/stringptr.h

@@ -3,6 +3,7 @@
 #pragma once
 
 #include "global.h"
+#include "string_functions.h"
 
 namespace libscratchcpp
 {
@@ -14,6 +15,7 @@ extern "C"
     {
             // NOTE: Constructors and destructors only work in C++ code and are not supposed to be used in LLVM IR
             StringPtr() = default;
+            StringPtr(const std::string &str) { string_assign_cstring(this, str.c_str()); }
             StringPtr(const StringPtr &) = delete;
 
             ~StringPtr()

src/scratch/value_functions.cpp

@@ -454,12 +454,10 @@ extern "C"
     const StringPtr *value_boolToStringPtr(bool v)
     {
         if (v) {
-            static const std::u16string str = utf8::utf8to16(std::string("true"));
-            static const StringPtr ret = { const_cast<char16_t *>(str.c_str()) };
+            static const StringPtr ret("true");
             return &ret;
         } else {
-            static const std::u16string str = utf8::utf8to16(std::string("false"));
-            static const StringPtr ret = { const_cast<char16_t *>(str.c_str()) };
+            static const StringPtr ret("false");
             return &ret;
         }
     }

test/scratch_classes/CMakeLists.txt

@@ -121,6 +121,20 @@ target_link_libraries(
 
 gtest_discover_tests(value_test)
 
+# stringptr_test
+add_executable(
+  stringptr_test
+  stringptr_test.cpp
+)
+
+target_link_libraries(
+  stringptr_test
+  GTest::gtest_main
+  scratchcpp
+)
+
+gtest_discover_tests(stringptr_test)
+
 # string_functions_test
 add_executable(
   string_functions_test

test/scratch_classes/string_functions_test.cpp

@@ -8,10 +8,6 @@ using namespace libscratchcpp;
 TEST(StringFunctionsTest, AssignAlloc)
 {
     StringPtr str1;
-    ASSERT_FALSE(str1.data);
-    ASSERT_EQ(str1.size, 0);
-    ASSERT_EQ(str1.allocatedSize, 0);
-
     string_assign_cstring(&str1, "test");
     ASSERT_EQ(str1.size, 4);
     ASSERT_GE(str1.allocatedSize, 5);

test/scratch_classes/stringptr_test.cpp

@@ -0,0 +1,27 @@
+#include <scratchcpp/stringptr.h>
+
+#include "../common.h"
+
+using namespace libscratchcpp;
+
+TEST(StringPtrTest, DefaultConstructor)
+{
+    StringPtr str;
+    ASSERT_EQ(str.data, nullptr);
+    ASSERT_EQ(str.size, 0);
+    ASSERT_EQ(str.allocatedSize, 0);
+}
+
+TEST(StringPtrTest, StringConstructor)
+{
+    StringPtr str("test");
+    ASSERT_EQ(str.size, 4);
+    ASSERT_GE(str.allocatedSize, 5);
+    ASSERT_TRUE(str.data);
+
+    ASSERT_EQ(str.data[0], u't');
+    ASSERT_EQ(str.data[1], u'e');
+    ASSERT_EQ(str.data[2], u's');
+    ASSERT_EQ(str.data[3], u't');
+    ASSERT_EQ(str.data[4], u'\0');
+}