Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

overload wxStrpbrk() for more types and add tests for it

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-06-13 15:31:09 +00:00
parent 1757c449c4
commit 105260e89f
2 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/wxcrt.h
View File

@@ -630,22 +630,33 @@ inline const char *wxStrpbrk(const char *s, const char *accept)
{ return wxCRT_StrpbrkA(s, accept); } { return wxCRT_StrpbrkA(s, accept); }
inline const wchar_t *wxStrpbrk(const wchar_t *s, const wchar_t *accept) inline const wchar_t *wxStrpbrk(const wchar_t *s, const wchar_t *accept)
{ return wxCRT_StrpbrkW(s, accept); } { return wxCRT_StrpbrkW(s, accept); }
inline const char *wxStrpbrk(const char *s, const wxCharBuffer& accept)
{ return wxCRT_StrpbrkA(s, accept.data()); }
inline const char *wxStrpbrk(const char *s, const wxString& accept) inline const char *wxStrpbrk(const char *s, const wxString& accept)
{ return wxCRT_StrpbrkA(s, accept.mb_str()); } { return wxCRT_StrpbrkA(s, accept.mb_str()); }
inline const char *wxStrpbrk(const char *s, const wxCStrData& accept) inline const char *wxStrpbrk(const char *s, const wxCStrData& accept)
{ return wxCRT_StrpbrkA(s, accept.AsCharBuf()); } { return wxCRT_StrpbrkA(s, accept.AsCharBuf()); }
inline const wchar_t *wxStrpbrk(const wchar_t *s, const wxWCharBuffer& accept)
{ return wxCRT_StrpbrkW(s, accept.data()); }
inline const wchar_t *wxStrpbrk(const wchar_t *s, const wxString& accept) inline const wchar_t *wxStrpbrk(const wchar_t *s, const wxString& accept)
{ return wxCRT_StrpbrkW(s, accept.wc_str()); } { return wxCRT_StrpbrkW(s, accept.wc_str()); }
inline const wchar_t *wxStrpbrk(const wchar_t *s, const wxCStrData& accept) inline const wchar_t *wxStrpbrk(const wchar_t *s, const wxCStrData& accept)
{ return wxCRT_StrpbrkW(s, accept.AsWCharBuf()); } { return wxCRT_StrpbrkW(s, accept.AsWCharBuf()); }
inline const char *wxStrpbrk(const wxString& s, const wxString& accept) inline const char *wxStrpbrk(const wxString& s, const wxString& accept)
{ return wxCRT_StrpbrkA(s.c_str(), accept.mb_str()); } { return wxCRT_StrpbrkA(s.c_str(), accept.mb_str()); }
inline const char *wxStrpbrk(const wxString& s, const char *accept)
{ return wxCRT_StrpbrkA(s.c_str(), accept); }
inline const wchar_t *wxStrpbrk(const wxString& s, const wchar_t *accept)
{ return wxCRT_StrpbrkW(s.wc_str(), accept); }
inline const char *wxStrpbrk(const wxString& s, const wxCStrData& accept)
{ return wxCRT_StrpbrkA(s.c_str(), accept.AsCharBuf()); }
inline const char *wxStrpbrk(const wxCStrData& s, const wxString& accept) inline const char *wxStrpbrk(const wxCStrData& s, const wxString& accept)
{ return wxCRT_StrpbrkA(s.AsChar(), accept.mb_str()); } { return wxCRT_StrpbrkA(s.AsChar(), accept.mb_str()); }
inline const char *wxStrpbrk(const wxCStrData& s, const char *accept)
{ return wxCRT_StrpbrkA(s.AsChar(), accept); }
inline const wchar_t *wxStrpbrk(const wxCStrData& s, const wchar_t *accept)
{ return wxCRT_StrpbrkW(s.AsWChar(), accept); }
inline const char *wxStrpbrk(const wxCStrData& s, const wxCStrData& accept)
{ return wxCRT_StrpbrkA(s.AsChar(), accept.AsCharBuf()); }
template <typename S, typename T>
inline const T *wxStrpbrk(const S& s, const wxCharTypeBuffer<T>& accept)
{ return wxStrpbrk(s, accept.data()); }
/* inlined non-const versions */ /* inlined non-const versions */

32
tests/strings/crt.cpp
View File

@@ -47,12 +47,14 @@ private:
CPPUNIT_TEST( Strcmp ); CPPUNIT_TEST( Strcmp );
CPPUNIT_TEST( Strspn ); CPPUNIT_TEST( Strspn );
CPPUNIT_TEST( Strcspn ); CPPUNIT_TEST( Strcspn );
CPPUNIT_TEST( Strpbrk );
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
void SetGetEnv(); void SetGetEnv();
void Strcmp(); void Strcmp();
void Strspn(); void Strspn();
void Strcspn(); void Strcspn();
void Strpbrk();
DECLARE_NO_COPY_CLASS(CrtTestCase) DECLARE_NO_COPY_CLASS(CrtTestCase)
}; };
@@ -177,3 +179,33 @@ void CrtTestCase::Strcspn()
CPPUNIT_ASSERT_EQUAL( strWX.length(), wxStrcspn(strWX, "xy") ); CPPUNIT_ASSERT_EQUAL( strWX.length(), wxStrcspn(strWX, "xy") );
} }
void CrtTestCase::Strpbrk()
{
const wxString s(", ");
CPPUNIT_ASSERT_EQUAL( ',', *wxStrpbrk(strMB, ", ") );
CPPUNIT_ASSERT_EQUAL( L',', *wxStrpbrk(strWC, L", ") );
CPPUNIT_ASSERT_EQUAL( ',', *wxStrpbrk(strWX, ", ") );
CPPUNIT_ASSERT_EQUAL( L',', *wxStrpbrk(strWX, L", ") );
CPPUNIT_ASSERT_EQUAL( ',', *wxStrpbrk(strMB, s) );
CPPUNIT_ASSERT_EQUAL( L',', *wxStrpbrk(strWC, s) );
CPPUNIT_ASSERT_EQUAL( ',', *wxStrpbrk(strWX, s) );
CPPUNIT_ASSERT_EQUAL( ',', *wxStrpbrk(strWX.c_str(), s) );
CPPUNIT_ASSERT_EQUAL( ',', *wxStrpbrk(strMB, s.c_str()) );
CPPUNIT_ASSERT_EQUAL( L',', *wxStrpbrk(strWC, s.c_str()) );
CPPUNIT_ASSERT_EQUAL( ',', *wxStrpbrk(strWX, s.c_str()) );
CPPUNIT_ASSERT_EQUAL( ',', *wxStrpbrk(strWX.c_str(), s.c_str()) );
CPPUNIT_ASSERT_EQUAL( ',', *wxStrpbrk(strMB, s.mb_str()) );
CPPUNIT_ASSERT_EQUAL( L',', *wxStrpbrk(strWC, s.wc_str()) );
CPPUNIT_ASSERT_EQUAL( ',', *wxStrpbrk(strWX, s.mb_str()) );
CPPUNIT_ASSERT_EQUAL( L',', *wxStrpbrk(strWX, s.wc_str()) );
CPPUNIT_ASSERT_EQUAL( ',', *wxStrpbrk(strWX.c_str(), s.mb_str()) );
CPPUNIT_ASSERT_EQUAL( L',', *wxStrpbrk(strWX.c_str(), s.wc_str()) );
CPPUNIT_ASSERT_EQUAL( (const char *)NULL, wxStrpbrk(strWX, "xyz") );
CPPUNIT_ASSERT_EQUAL( (const wchar_t *)NULL, wxStrpbrk(strWX.c_str(), L"xyz") );
}