Use std::string_view where possible
Unfortunately, MSVC cannot deduce template parameters properly where `const std::basic_string_view<...>` is the parameter. It requires explicit type cast or explicit template type specification. Which kind of voids the whole purpose of using std::basic_string_view to make the client code simpler. Example: https://gist.github.com/rozmansi/493911be70bdac08dc6826c976c5bbe4 Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
parent
da9dcc9c1a
commit
f5bce32d06
@ -20,6 +20,8 @@
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <stdexcept>
|
||||
#include <string_view>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#ifdef _WIN32
|
||||
@ -286,10 +288,10 @@ namespace stdex
|
||||
/// \param[in,out] dst String to append to
|
||||
/// \param[in] src Source string
|
||||
///
|
||||
template<class _Traits_dst = std::char_traits<char>, class _Alloc_dst = std::allocator<char>, class _Traits_src = std::char_traits<char>, class _Alloc_src = std::allocator<char>>
|
||||
template<class _Traits_dst = std::char_traits<char>, class _Alloc_dst = std::allocator<char>>
|
||||
void url_unescape(
|
||||
_Inout_ std::basic_string<char, _Traits_dst, _Alloc_dst>& dst,
|
||||
_In_ const std::basic_string<char, _Traits_src, _Alloc_src>& src)
|
||||
_In_ const std::string_view src)
|
||||
{
|
||||
url_unescape(dst, src.data(), src.size());
|
||||
}
|
||||
@ -365,10 +367,10 @@ namespace stdex
|
||||
/// \param[in,out] dst String to append to
|
||||
/// \param[in] src Source string
|
||||
///
|
||||
template<class _Traits_dst = std::char_traits<char>, class _Alloc_dst = std::allocator<char>, class _Traits_src = std::char_traits<char>, class _Alloc_src = std::allocator<char>>
|
||||
template<class _Traits_dst = std::char_traits<char>, class _Alloc_dst = std::allocator<char>>
|
||||
void url_escape(
|
||||
_Inout_ std::basic_string<char, _Traits_dst, _Alloc_dst>& dst,
|
||||
_In_ const std::basic_string<char, _Traits_src, _Alloc_src>& src)
|
||||
_In_ const std::string_view src)
|
||||
{
|
||||
url_escape(dst, src.data(), src.size());
|
||||
}
|
||||
@ -1678,13 +1680,13 @@ namespace stdex
|
||||
|
||||
if (m_condition_start.match(source, i, num_chars)) {
|
||||
auto condition_src(replace_entities(source + m_condition_start.condition.start, m_condition_start.condition.size()));
|
||||
if (!stdex::strcmp(condition_src.c_str(), "CDATA"))
|
||||
if (condition_src == "CDATA")
|
||||
m_is_cdata = true;
|
||||
else if (!stdex::strcmp(condition_src.c_str(), "RCDATA"))
|
||||
else if (condition_src == "RCDATA")
|
||||
m_is_rcdata = true;
|
||||
if (m_num_invalid_conditions)
|
||||
m_num_invalid_conditions++;
|
||||
else if (!stdex::strcmp(condition_src.c_str(), "IGNORE"))
|
||||
else if (condition_src == "IGNORE")
|
||||
m_num_invalid_conditions++;
|
||||
else
|
||||
m_num_valid_conditions++;
|
||||
@ -1776,7 +1778,7 @@ namespace stdex
|
||||
str.reserve(content.charset.size());
|
||||
for (size_t j = content.charset.start; j < content.charset.end; ++j)
|
||||
str.push_back(static_cast<char>(source[j]));
|
||||
m_charset = stdex::charset_from_name(str.c_str());
|
||||
m_charset = stdex::charset_from_name(str);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
#include "string.hpp"
|
||||
#include <string.h>
|
||||
#include <exception>
|
||||
#include <string_view>
|
||||
#include <string>
|
||||
|
||||
namespace stdex
|
||||
@ -229,7 +230,7 @@ namespace stdex
|
||||
skip_lcub_rcub = (skip & sgml_lcub_rcub) == 0,
|
||||
skip_lsqb_rsqb = (skip & sgml_lsqb_rsqb) == 0;
|
||||
|
||||
size_t j = wcsnlen(dst, count_dst);
|
||||
size_t j = strnlen(dst, count_dst);
|
||||
count_src = strnlen(src, count_src);
|
||||
for (size_t i = 0; i < count_src;) {
|
||||
if (src[i] == '&') {
|
||||
@ -410,7 +411,7 @@ namespace stdex
|
||||
_In_ const mapping<size_t>& offset = mapping<size_t>(0, 0),
|
||||
_Inout_opt_ mapping_vector<size_t>* map = nullptr)
|
||||
{
|
||||
return sgml2str(src.c_str(), src.size(), skip, offset, map);
|
||||
return sgml2str(src.data(), src.size(), skip, offset, map);
|
||||
}
|
||||
|
||||
/// \cond internal
|
||||
@ -471,7 +472,7 @@ namespace stdex
|
||||
do_lcub_rcub = (what & sgml_lcub_rcub) == 0,
|
||||
do_lsqb_rsqb = (what & sgml_lsqb_rsqb) == 0;
|
||||
|
||||
count_src = wcsnlen(src, count_src);
|
||||
count_src = strnlen(src, count_src);
|
||||
dst.reserve(dst.size() + count_src);
|
||||
for (size_t i = 0; i < count_src;) {
|
||||
size_t n = glyphlen(src + i, count_src - i);
|
||||
@ -552,12 +553,13 @@ namespace stdex
|
||||
/// \param[in] src Unicode string
|
||||
/// \param[in] what Bitwise flag of stdex::sgml_* constants that force extra characters otherwise not converted to SGML
|
||||
///
|
||||
inline void str2sgmlcat(
|
||||
_Inout_ std::string& dst,
|
||||
_In_ const std::wstring& src,
|
||||
template <class _Traits = std::char_traits<char>, class _Ax = std::allocator<char>>
|
||||
void str2sgmlcat(
|
||||
_Inout_ std::basic_string<char, _Traits, _Ax>& dst,
|
||||
_In_ const std::wstring_view src,
|
||||
_In_ int what = 0)
|
||||
{
|
||||
str2sgmlcat(dst, src.c_str(), src.size(), what);
|
||||
str2sgmlcat(dst, src.data(), src.size(), what);
|
||||
}
|
||||
|
||||
///
|
||||
@ -595,7 +597,7 @@ namespace stdex
|
||||
do_lsqb_rsqb = (what & sgml_lsqb_rsqb) == 0;
|
||||
|
||||
size_t j = strnlen(dst, count_dst);
|
||||
count_src = wcsnlen(src, count_src);
|
||||
count_src = strnlen(src, count_src);
|
||||
for (size_t i = 0; i < count_src;) {
|
||||
size_t n = glyphlen(src + i, count_src - i);
|
||||
if (n == 1 &&
|
||||
@ -716,9 +718,10 @@ namespace stdex
|
||||
/// \param[in] src Unicode string
|
||||
/// \param[in] what Bitwise flag of stdex::sgml_* constants that force extra characters otherwise not converted to SGML
|
||||
///
|
||||
inline void str2sgmlcpy(
|
||||
_Inout_ std::string& dst,
|
||||
_In_ const std::wstring& src,
|
||||
template <class _Traits = std::char_traits<char>, class _Ax = std::allocator<char>>
|
||||
void str2sgmlcpy(
|
||||
_Inout_ std::basic_string<char, _Traits, _Ax>& dst,
|
||||
_In_ const std::wstring_view src,
|
||||
_In_ int what = 0)
|
||||
{
|
||||
str2sgmlcpy(dst, src.data(), src.size(), what);
|
||||
@ -773,9 +776,9 @@ namespace stdex
|
||||
/// \return SGML string
|
||||
///
|
||||
inline std::string str2sgml(
|
||||
_In_ const std::wstring& src,
|
||||
_In_ const std::wstring_view src,
|
||||
_In_ int what = 0)
|
||||
{
|
||||
return str2sgml(src.c_str(), src.size(), what);
|
||||
return str2sgml(src.data(), src.size(), what);
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -22,6 +22,7 @@
|
||||
#endif
|
||||
#include <regex>
|
||||
#include <stdexcept>
|
||||
#include <string_view>
|
||||
#include <string>
|
||||
|
||||
#if defined(_WIN32)
|
||||
@ -81,6 +82,11 @@ namespace stdex
|
||||
///
|
||||
using sys_string = sstring;
|
||||
|
||||
///
|
||||
/// String view for system functions
|
||||
///
|
||||
using sstring_view = std::basic_string_view<stdex::schar_t, std::char_traits<stdex::schar_t>>;
|
||||
|
||||
///
|
||||
/// Regular expressions for system strings
|
||||
///
|
||||
|
||||
@ -72,7 +72,7 @@ namespace stdex
|
||||
struct charset_less {
|
||||
bool operator()(_In_z_ const char* a, _In_z_ const char* b) const
|
||||
{
|
||||
return stdex::stricmp(a, b) < 0;
|
||||
return stricmp(a, b) < 0;
|
||||
}
|
||||
};
|
||||
static const std::map<const char*, charset_id, charset_less> charsets = {
|
||||
@ -172,7 +172,7 @@ namespace stdex
|
||||
_In_reads_or_z_opt_(count_src) const T_from* src, _In_ size_t count_src)
|
||||
{
|
||||
_Assume_(src || !count_src);
|
||||
count_src = stdex::strnlen<T_from>(src, count_src);
|
||||
count_src = strnlen<T_from>(src, count_src);
|
||||
if (!count_src) _Unlikely_
|
||||
return;
|
||||
|
||||
@ -511,7 +511,7 @@ namespace stdex
|
||||
#endif
|
||||
inline void strcat(
|
||||
_Inout_ std::wstring& dst,
|
||||
_In_ const std::string& src,
|
||||
_In_ const std::string_view src,
|
||||
_In_ charset_id charset = charset_id::system)
|
||||
{
|
||||
strcat(dst, src.data(), src.size(), charset);
|
||||
@ -520,7 +520,7 @@ namespace stdex
|
||||
_Deprecated_("Use stdex::strcat")
|
||||
inline void str2wstr(
|
||||
_Inout_ std::wstring& dst,
|
||||
_In_ const std::string& src,
|
||||
_In_ const std::string_view src,
|
||||
_In_ charset_id charset = charset_id::system)
|
||||
{
|
||||
strcat(dst, src, charset);
|
||||
@ -562,7 +562,7 @@ namespace stdex
|
||||
#endif
|
||||
inline void strcpy(
|
||||
_Inout_ std::wstring& dst,
|
||||
_In_ const std::string& src,
|
||||
_In_ const std::string_view src,
|
||||
_In_ charset_id charset = charset_id::system)
|
||||
{
|
||||
strcpy(dst, src.data(), src.size(), charset);
|
||||
@ -627,10 +627,10 @@ namespace stdex
|
||||
_Deprecated_("For better performance, consider a reusable charset_encoder")
|
||||
#endif
|
||||
inline std::wstring str2wstr(
|
||||
_In_ const std::string& src,
|
||||
_In_ const std::string_view src,
|
||||
_In_ charset_id charset = charset_id::system)
|
||||
{
|
||||
return str2wstr(src.c_str(), src.size(), charset);
|
||||
return str2wstr(src.data(), src.size(), charset);
|
||||
}
|
||||
|
||||
///
|
||||
@ -677,16 +677,16 @@ namespace stdex
|
||||
#endif
|
||||
inline void strcat(
|
||||
_Inout_ std::string& dst,
|
||||
_In_ const std::wstring& src,
|
||||
_In_ const std::wstring_view src,
|
||||
_In_ charset_id charset = charset_id::system)
|
||||
{
|
||||
strcat(dst, src.c_str(), src.size(), charset);
|
||||
strcat(dst, src.data(), src.size(), charset);
|
||||
}
|
||||
|
||||
_Deprecated_("Use stdex::strcat")
|
||||
inline void wstr2str(
|
||||
_Inout_ std::string& dst,
|
||||
_In_ const std::wstring& src,
|
||||
_In_ const std::wstring_view src,
|
||||
_In_ charset_id charset = charset_id::system)
|
||||
{
|
||||
strcat(dst, src, charset);
|
||||
@ -728,7 +728,7 @@ namespace stdex
|
||||
#endif
|
||||
inline void strcpy(
|
||||
_Inout_ std::string& dst,
|
||||
_In_ const std::wstring& src,
|
||||
_In_ const std::wstring_view src,
|
||||
_In_ charset_id charset = charset_id::system)
|
||||
{
|
||||
strcpy(dst, src.data(), src.size(), charset);
|
||||
@ -793,10 +793,10 @@ namespace stdex
|
||||
_Deprecated_("For better performance, consider a reusable charset_encoder")
|
||||
#endif
|
||||
inline std::string wstr2str(
|
||||
_In_ const std::wstring& src,
|
||||
_In_ const std::wstring_view src,
|
||||
_In_ charset_id charset = charset_id::system)
|
||||
{
|
||||
return wstr2str(src.c_str(), src.size(), charset);
|
||||
return wstr2str(src.data(), src.size(), charset);
|
||||
}
|
||||
|
||||
#ifdef _WIN32
|
||||
@ -814,7 +814,7 @@ namespace stdex
|
||||
_Inout_ std::basic_string<wchar_t, _Traits, _Alloc>& dst,
|
||||
_In_reads_or_z_opt_(count_src) const wchar_t* src, _In_ size_t count_src)
|
||||
{
|
||||
count_src = stdex::strnlen(src, count_src);
|
||||
count_src = strnlen(src, count_src);
|
||||
size_t count_dst = dst.size();
|
||||
dst.resize(count_dst + count_src);
|
||||
_Assume_(count_src + 1 < INT_MAX);
|
||||
@ -852,10 +852,10 @@ namespace stdex
|
||||
///
|
||||
/// \return Number of code units excluding zero terminator in the dst string after the operation.
|
||||
///
|
||||
template <class _Traits_dst = std::char_traits<wchar_t>, class _Alloc_dst = std::allocator<wchar_t>, class _Traits_src = std::char_traits<wchar_t>, class _Alloc_src = std::allocator<wchar_t>>
|
||||
template <class _Traits_dst = std::char_traits<wchar_t>, class _Alloc_dst = std::allocator<wchar_t>>
|
||||
size_t normalizecat(
|
||||
_Inout_ std::basic_string<wchar_t, _Traits_dst, _Alloc_dst>& dst,
|
||||
_In_ const std::basic_string<wchar_t, _Traits_src, _Alloc_src>& src)
|
||||
_In_ const std::wstring_view src)
|
||||
{
|
||||
return normalizecat(dst, src.data(), src.size());
|
||||
}
|
||||
@ -902,10 +902,10 @@ namespace stdex
|
||||
///
|
||||
/// \return Number of code units excluding zero terminator in the dst string after the operation.
|
||||
///
|
||||
template <class _Traits_dst = std::char_traits<wchar_t>, class _Alloc_dst = std::allocator<wchar_t>, class _Traits_src = std::char_traits<wchar_t>, class _Alloc_src = std::allocator<wchar_t>>
|
||||
template <class _Traits_dst = std::char_traits<wchar_t>, class _Alloc_dst = std::allocator<wchar_t>>
|
||||
size_t normalize(
|
||||
_Inout_ std::basic_string<wchar_t, _Traits_dst, _Alloc_dst>& dst,
|
||||
_In_ const std::basic_string<wchar_t, _Traits_src, _Alloc_src>& src)
|
||||
_In_ const std::wstring_view src)
|
||||
{
|
||||
return normalize(dst, src.data(), src.size());
|
||||
}
|
||||
@ -947,8 +947,7 @@ namespace stdex
|
||||
///
|
||||
/// \return Normalized string
|
||||
///
|
||||
template <class _Traits = std::char_traits<wchar_t>, class _Alloc = std::allocator<wchar_t>>
|
||||
std::wstring normalize(_In_ const std::basic_string<wchar_t, _Traits, _Alloc>& src)
|
||||
inline std::wstring normalize(_In_ const std::wstring_view src)
|
||||
{
|
||||
std::wstring dst;
|
||||
normalizecat(dst, src.data(), src.size());
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user