Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 17:16:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ATL][ATL_APITEST] Add CString::Tokenize + testcase

Browse source
This commit is contained in:
Mark Jansen 2020-09-06 21:30:23 +02:00
parent abbe656407
commit 58092fb4da
3 changed files with 154 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

64
sdk/lib/atl/cstringt.h
View file

@ -140,6 +140,20 @@ public:
return ::_wcsicmp(psz1, psz2);
}
static int __cdecl StringSpanIncluding(
_In_z_ LPCWSTR pszBlock,
_In_z_ LPCWSTR pszSet)
{
return (int)::wcsspn(pszBlock, pszSet);
}
static int __cdecl StringSpanExcluding(
_In_z_ LPCWSTR pszBlock,
_In_z_ LPCWSTR pszSet)
{
return (int)::wcscspn(pszBlock, pszSet);
}
static int __cdecl FormatV(
_In_opt_z_ LPWSTR pszDest,
_In_z_ LPCWSTR pszFormat,
@ -289,6 +303,20 @@ public:
return ::_stricmp(psz1, psz2);
}
static int __cdecl StringSpanIncluding(
_In_z_ LPCSTR pszBlock,
_In_z_ LPCSTR pszSet)
{
return (int)::strspn(pszBlock, pszSet);
}
static int __cdecl StringSpanExcluding(
_In_z_ LPCSTR pszBlock,
_In_z_ LPCSTR pszSet)
{
return (int)::strcspn(pszBlock, pszSet);
}
static int __cdecl FormatV(
_In_opt_z_ LPSTR pszDest,
_In_z_ LPCSTR pszFormat,
@ -804,6 +832,42 @@ public:
}
CStringT Tokenize(_In_z_ PCXSTR pszTokens, _Inout_ int& iStart) const
{
ATLASSERT(iStart >= 0);
if (iStart < 0)
AtlThrow(E_INVALIDARG);
if (!pszTokens || !pszTokens[0])
{
if (iStart < CThisSimpleString::GetLength())
{
return Mid(iStart);
}
iStart = -1;
return CStringT();
}
if (iStart < CThisSimpleString::GetLength())
{
int iRangeOffset = StringTraits::StringSpanIncluding(CThisSimpleString::GetString() + iStart, pszTokens);
if (iRangeOffset + iStart < CThisSimpleString::GetLength())
{
int iNewStart = iStart + iRangeOffset;
int nCount = StringTraits::StringSpanExcluding(CThisSimpleString::GetString() + iNewStart, pszTokens);
iStart = iNewStart + nCount + 1;
return Mid(iNewStart, nCount);
}
}
iStart = -1;
return CStringT();
}
static PCXSTR DefaultTrimChars()
{
static XCHAR str[] = { ' ', '\t', '\r', '\n', 0 };