fix

effekseer · Jul 23, 2023 · 6ea515a · 6ea515a
1 parent 60031b0
commit 6ea515a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/Dev/Cpp/Effekseer/Effekseer/Utils/String.h b/Dev/Cpp/Effekseer/Effekseer/Utils/String.h
@@ -141,6 +141,11 @@ class FixedSizeString
 		return data_[i];
 	}
 
+	T back() const
+	{
+		return data_[size_ - 1];
+	}
+
 	const T* data() const
 	{
 		return data_.data();
@@ -151,6 +156,18 @@ class FixedSizeString
 		return size_;
 	}
 
+	FixedSizeString<T, N>& operator+=(const T& c)
+	{
+		if (size_ < data_.size() - 2)
+		{
+			data_[size_] = c;
+			data_[size_ + 1] = 0;
+			size_ += 1;
+		}
+
+		return *this;
+	}
+
 	bool operator==(const FixedSizeString<T, N>& rhs) const
 	{
 		return size() == rhs.size() && Traits::compare(data(), rhs.data(), size()) == 0;
@@ -462,7 +479,7 @@ class PathHelper
 		std::basic_string<T> ret = path1;
 		if (!IsSeparator(ret.back()))
 		{
-			ret += StringHelper::To<T>("/");
+			ret += static_cast<T>('/');
 		}
 		ret += path2;
 

diff --git a/Dev/Cpp/Test/Runtime/String.cpp b/Dev/Cpp/Test/Runtime/String.cpp
@@ -17,6 +17,16 @@ void FixedSizeStringTest()
 	TEST_EQUAL_STR((std::u16string(u"12345").substr(0, 2)), (Effekseer::FixedSizeString<char16_t, 5>(u"12345").substr(0, 2).data()));
 	TEST_EQUAL_STR((std::u16string(u"12345").substr(1)), (Effekseer::FixedSizeString<char16_t, 5>(u"12345").substr(1).data()));
 	TEST_EQUAL_STR((std::u16string(u"12345").substr(1, 2)), (Effekseer::FixedSizeString<char16_t, 5>(u"12345").substr(1, 2).data()));
+
+	TEST_EQUAL_STR((std::u16string(u"1234").back()), (Effekseer::FixedSizeString<char16_t, 4>(u"1234").back()));
+
+	{
+		auto v1 = std::u16string(u"1234");
+		auto v2 = Effekseer::FixedSizeString<char16_t, 8>(u"1234");
+		v1 += '5';
+		v2 += '5';
+		TEST_EQUAL_STR(v1, v2.data());
+	}
 }
 
 void StringAndPathHelperTest()
@@ -87,6 +97,9 @@ void StringAndPathHelperTest()
 	TEST_EQUAL_STR((std::u16string(u"/b/a")), (Effekseer::PathHelper::Combine(std::u16string(u"/b"), std::u16string(u"a"))));
 
 	TEST_EQUAL_STR((std::u16string(u"/b/a/")), (Effekseer::PathHelper::Combine(std::u16string(u"/b/"), std::u16string(u"a/"))));
+
+	std::string str;
+	str += 'a';
 }
 
 #if defined(__linux__) || defined(__APPLE__) || defined(WIN32)