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

Merge branch 'arrstr_stl_fromend_fix' of https://github.com/pavel-t/wxWidgets

Browse Source 
Fix wxArrayString::Index(bFromEnd = true) in STL build.

See #22024.
This commit is contained in:
Vadim Zeitlin
2022-01-18 18:57:43 +01:00
parent 32eb4af061 f1607c9521
commit bf2c2b6343
2 changed files with 61 additions and 23 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)
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;
for ( const auto& s: *this )
if (!bFromEnd)
{
if ( s.IsSameAs(str, bCase) )
return n;
for ( const auto& s: *this )
{
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;
@@ -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 (bCase)
if (!bFromEnd)
{
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)));
}
wxArrayString::const_iterator it;
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>

7
tests/arrays/arrays.cpp
View File

@@ -288,6 +288,10 @@ TEST_CASE("wxArrayString", "[dynarray]")
CHECK( a1.Index( wxT("thermit"), /*bCase=*/true, /*fromEnd=*/true ) == 3 );
CHECK( a1.Index( wxT("alligator"), /*bCase=*/true, /*fromEnd=*/true ) == 4 );
a1.push_back(wxT("alligator"));
CHECK(a1.Index(wxT("alligator")) == 4);
CHECK(a1.Index(wxT("alligator"), /*bCase=*/true, /*fromEnd=*/true) == 5);
wxArrayString a5;
CHECK( a5.Add( wxT("x"), 1 ) == 0 );
@@ -759,13 +763,14 @@ TEST_CASE("wxDynArray::IndexFromEnd", "[dynarray]")
a.push_back(10);
a.push_back(1);
a.push_back(42);
a.push_back(42);
CHECK( a.Index(10) == 0 );
CHECK( a.Index(1) == 1 );
CHECK( a.Index(42) == 2 );
CHECK( a.Index(10, /*bFromEnd=*/true) == 0 );
CHECK( a.Index( 1, /*bFromEnd=*/true) == 1 );
CHECK( a.Index(42, /*bFromEnd=*/true) == 2 );
CHECK( a.Index(42, /*bFromEnd=*/true) == 3 );
}