boost_mirror/utility
1
0
Fork 0
mirror of https://github.com/boostorg/utility.git synced 2025-05-11 13:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rfind (and other finders). Fixes bug https://svn.boost.org/trac/boost/ticket/9518

Browse Source
This commit is contained in:
Marshall Clow 2016-08-14 11:20:28 -07:00
parent 8392991c46
commit 39577f86d1
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/utility/string_ref.hpp
View File

@ -185,13 +185,13 @@ namespace boost {
size_type rfind(basic_string_ref s) const { size_type rfind(basic_string_ref s) const {
const_reverse_iterator iter = std::search ( this->crbegin (), this->crend (), const_reverse_iterator iter = std::search ( this->crbegin (), this->crend (),
s.crbegin (), s.crend (), traits::eq ); s.crbegin (), s.crend (), traits::eq );
return iter == this->crend () ? npos : reverse_distance ( this->crbegin (), iter ); return iter == this->crend () ? npos : (std::distance(iter, this->crend()) - s.size());
} }
size_type rfind(charT c) const { size_type rfind(charT c) const {
const_reverse_iterator iter = std::find_if ( this->crbegin (), this->crend (), const_reverse_iterator iter = std::find_if ( this->crbegin (), this->crend (),
detail::string_ref_traits_eq<charT, traits> ( c )); detail::string_ref_traits_eq<charT, traits> ( c ));
return iter == this->crend () ? npos : reverse_distance ( this->crbegin (), iter ); return iter == this->crend () ? npos : (this->size() - 1 - std::distance(this->crbegin(), iter));
} }
size_type find_first_of(charT c) const { return find (c); } size_type find_first_of(charT c) const { return find (c); }
@ -206,7 +206,7 @@ namespace boost {
size_type find_last_of(basic_string_ref s) const { size_type find_last_of(basic_string_ref s) const {
const_reverse_iterator iter = std::find_first_of const_reverse_iterator iter = std::find_first_of
( this->crbegin (), this->crend (), s.cbegin (), s.cend (), traits::eq ); ( this->crbegin (), this->crend (), s.cbegin (), s.cend (), traits::eq );
return iter == this->crend () ? npos : reverse_distance ( this->crbegin (), iter); return iter == this->crend () ? npos : (this->size() - 1 - std::distance(this->crbegin(), iter));
} }
size_type find_first_not_of(basic_string_ref s) const { size_type find_first_not_of(basic_string_ref s) const {
@ -223,21 +223,17 @@ namespace boost {
size_type find_last_not_of(basic_string_ref s) const { size_type find_last_not_of(basic_string_ref s) const {
const_reverse_iterator iter = find_not_of ( this->crbegin (), this->crend (), s ); const_reverse_iterator iter = find_not_of ( this->crbegin (), this->crend (), s );
return iter == this->crend () ? npos : reverse_distance ( this->crbegin (), iter ); return iter == this->crend () ? npos : (this->size() - 1 - std::distance(this->crbegin(), iter));
} }
size_type find_last_not_of(charT c) const { size_type find_last_not_of(charT c) const {
for ( const_reverse_iterator iter = this->crbegin (); iter != this->crend (); ++iter ) for ( const_reverse_iterator iter = this->crbegin (); iter != this->crend (); ++iter )
if ( !traits::eq ( c, *iter )) if ( !traits::eq ( c, *iter ))
return reverse_distance ( this->crbegin (), iter ); return this->size() - 1 - std::distance(this->crbegin(), iter);
return npos; return npos;
} }
private: private:
template <typename r_iter>
size_type reverse_distance ( r_iter first, r_iter last ) const {
return len_ - 1 - std::distance ( first, last );
}
template <typename Iterator> template <typename Iterator>
Iterator find_not_of ( Iterator first, Iterator last, basic_string_ref s ) const { Iterator find_not_of ( Iterator first, Iterator last, basic_string_ref s ) const {