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

Fix search from end in wxArrayString in STL build

Browse Source
This commit is contained in:
Pavel Tyunin
2022-01-17 18:57:21 +02:00
parent d7fe9667fc
commit f1607c9521
1 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/common/arrstr.cpp
View File

@@ -59,15 +59,24 @@ wxArrayString::wxArrayString(size_t sz, const wxString* a)
#if __cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(14) #if __cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(14)
int wxArrayString::Index(const wxString& str, bool bCase, bool WXUNUSED(bFromEnd)) const int wxArrayString::Index(const wxString& str, bool bCase, bool bFromEnd) const
{ {
int n = 0; int n = 0;
for ( const auto& s: *this ) if (!bFromEnd)
{ {
if ( s.IsSameAs(str, bCase) ) for ( const auto& s: *this )
return n; {
if ( s.IsSameAs(str, bCase) )
return n;
++n; ++n;
}
}
else
{
for( n = size()-1; n >= 0; --n )
if ((*this)[n].IsSameAs(str, bCase))
return n;
} }
return wxNOT_FOUND; return wxNOT_FOUND;
@@ -107,26 +116,50 @@ struct wxStringCmpNoCase
} }
}; };
int wxArrayString::Index(const wxString& str, bool bCase, bool WXUNUSED(bFromEnd)) const int wxArrayString::Index(const wxString& str, bool bCase, bool bFromEnd) const
{ {
wxArrayString::const_iterator it; if (!bFromEnd)
if (bCase)
{ {
it = std::find_if(begin(), end(), wxArrayString::const_iterator it;
std::not1(
std::bind2nd(
wxStringCmp(), str)));
}
else // !bCase
{
it = std::find_if(begin(), end(),
std::not1(
std::bind2nd(
wxStringCmpNoCase(), str)));
}
return it == end() ? wxNOT_FOUND : it - begin(); if (bCase)
{
it = std::find_if(begin(), end(),
std::not1(
std::bind2nd(
wxStringCmp(), str)));
}
else // !bCase
{
it = std::find_if(begin(), end(),
std::not1(
std::bind2nd(
wxStringCmpNoCase(), str)));
}
return it == end() ? wxNOT_FOUND : it - begin();
}
else // bFromEnd
{
wxArrayString::const_reverse_iterator it;
if (bCase)
{
it = std::find_if(rbegin(), rend(),
std::not1(
std::bind2nd(
wxStringCmp(), str)));
}
else // !bCase
{
it = std::find_if(rbegin(), rend(),
std::not1(
std::bind2nd(
wxStringCmpNoCase(), str)));
}
return it == rend() ? wxNOT_FOUND : it.base()-1 - begin();
}
} }
template<class F> template<class F>