(v2) Adding support for std::string_view to sf::String

Cleaned up formatting and added comments
khatharr · Mar 15, 2023 · 485d904 · 485d904
1 parent 641cf54
commit 485d904
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 3 deletions.
diff --git a/include/SFML/System/String.hpp b/include/SFML/System/String.hpp
@@ -33,6 +33,7 @@
 
 #include <locale>
 #include <string>
+#include <string_view>
 
 
 namespace sf
@@ -107,6 +108,18 @@ class SFML_SYSTEM_API String
     ////////////////////////////////////////////////////////////
     String(const char* ansiString, const std::locale& locale = std::locale());
 
+    ////////////////////////////////////////////////////////////
+    /// \brief Construct from an ANSI string and a locale
+    ///
+    /// The source string_view is converted to UTF-32 according
+    /// to the given locale.
+    ///
+    /// \param ansiString ANSI string to convert
+    /// \param locale     Locale to use for conversion
+    ///
+    ////////////////////////////////////////////////////////////
+    String(std::string_view ansiString, const std::locale& locale = std::locale());
+
     ////////////////////////////////////////////////////////////
     /// \brief Construct from an ANSI string and a locale
     ///
@@ -127,6 +140,14 @@ class SFML_SYSTEM_API String
     ////////////////////////////////////////////////////////////
     String(const wchar_t* wideString);
 
+    ////////////////////////////////////////////////////////////
+    /// \brief Construct from a wide string_view
+    ///
+    /// \param wideString Wide string to convert
+    ///
+    ////////////////////////////////////////////////////////////
+    String(std::wstring_view wideString);
+
     ////////////////////////////////////////////////////////////
     /// \brief Construct from a wide string
     ///
@@ -143,6 +164,14 @@ class SFML_SYSTEM_API String
     ////////////////////////////////////////////////////////////
     String(const std::uint32_t* utf32String);
 
+    ////////////////////////////////////////////////////////////
+    /// \brief Construct from an UTF-32 string_view
+    ///
+    /// \param utf32String UTF-32 string to assign
+    ///
+    ////////////////////////////////////////////////////////////
+    String(std::basic_string_view<std::uint32_t> utf32String);
+
     ////////////////////////////////////////////////////////////
     /// \brief Construct from an UTF-32 string
     ///

diff --git a/src/SFML/System/String.cpp b/src/SFML/System/String.cpp
@@ -75,13 +75,18 @@ String::String(const char* ansiString, const std::locale& locale)
 
 
 ////////////////////////////////////////////////////////////
-String::String(const std::string& ansiString, const std::locale& locale)
+String::String(std::string_view ansiString, const std::locale& locale)
 {
     m_string.reserve(ansiString.length() + 1);
     Utf32::fromAnsi(ansiString.begin(), ansiString.end(), std::back_inserter(m_string), locale);
 }
 
 
+////////////////////////////////////////////////////////////
+String::String(const std::string& ansiString, const std::locale& locale) : String(std::string_view(ansiString), locale)
+{
+}
+
 ////////////////////////////////////////////////////////////
 String::String(const wchar_t* wideString)
 {
@@ -98,13 +103,19 @@ String::String(const wchar_t* wideString)
 
 
 ////////////////////////////////////////////////////////////
-String::String(const std::wstring& wideString)
+String::String(std::wstring_view wideString)
 {
     m_string.reserve(wideString.length() + 1);
     Utf32::fromWide(wideString.begin(), wideString.end(), std::back_inserter(m_string));
 }
 
 
+////////////////////////////////////////////////////////////
+String::String(const std::wstring& wideString) : String(std::wstring_view(wideString))
+{
+}
+
+
 ////////////////////////////////////////////////////////////
 String::String(const std::uint32_t* utf32String)
 {
@@ -114,11 +125,16 @@ String::String(const std::uint32_t* utf32String)
 
 
 ////////////////////////////////////////////////////////////
-String::String(const std::basic_string<std::uint32_t>& utf32String) : m_string(utf32String)
+String::String(std::basic_string_view<std::uint32_t> utf32String) : m_string(utf32String)
 {
 }
 
 
+////////////////////////////////////////////////////////////
+String::String(const std::basic_string<std::uint32_t>& utf32String) : String(std::basic_string_view<std::uint32_t>(utf32String))
+{
+}
+
 ////////////////////////////////////////////////////////////
 String::String(const String& copy) = default;