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

rfind working.

Browse Source
This commit is contained in:
Beman 2015-07-12 17:01:57 -04:00
parent 896577a68d
commit 61c02fdd7a
2 changed files with 64 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/boost/utility/string_view.hpp
View File

@ -227,11 +227,19 @@ namespace boost {
{ return find(basic_string_view(s), pos); } { return find(basic_string_view(s), pos); }
// rfind // rfind
size_type rfind(basic_string_view s, size_type pos = npos) size_type rfind(basic_string_view s, size_type pos = npos) const BOOST_NOEXCEPT {
const BOOST_NOEXCEPT { if (len_ < s.len_)
const_reverse_iterator iter = std::search ( this->crbegin (), this->crend (), return npos;
s.crbegin (), s.crend (), traits::eq ); if (pos > len_ - s.len_)
return iter == this->crend () ? npos : reverse_distance ( this->crbegin (), iter ); pos = len_ - s.len_;
if (s.len_ == 0u) // an empty string is always found
return pos;
for (const charT* cur = ptr_ + pos;; --cur) {
if (traits::compare(cur, s.ptr_, s.len_) == 0)
return cur - ptr_;
if (cur == ptr_)
return npos;
};
} }
size_type rfind(charT c, size_type pos = npos) const BOOST_NOEXCEPT size_type rfind(charT c, size_type pos = npos) const BOOST_NOEXCEPT
{ return rfind(basic_string_view(&c, 1), pos); } { return rfind(basic_string_view(&c, 1), pos); }

52
test/string_view_test3.cpp
View File

@ -35,7 +35,6 @@ namespace
BOOST_TEST_EQ(sv3.find(sv2), s3.find(s2)); BOOST_TEST_EQ(sv3.find(sv2), s3.find(s2));
BOOST_TEST_EQ(sv1.find(sv3, 7), s1.find(s3, 7)); BOOST_TEST_EQ(sv1.find(sv3, 7), s1.find(s3, 7));
BOOST_TEST_EQ(sv1.find(sv3, 5), s1.find(s3, 5)); BOOST_TEST_EQ(sv1.find(sv3, 5), s1.find(s3, 5));
//std::cout << s1.find(s3, 5) << std::endl;
BOOST_TEST_EQ(sv1.find(sv2), s1.find(s2)); BOOST_TEST_EQ(sv1.find(sv2), s1.find(s2));
for (std::string::size_type i = 0; i <= 8; ++i) for (std::string::size_type i = 0; i <= 8; ++i)
@ -70,6 +69,56 @@ namespace
BOOST_TEST_EQ(sv1.find("abc", i), s1.find("abc", i)); BOOST_TEST_EQ(sv1.find("abc", i), s1.find("abc", i));
} }
void rfind_test()
{
// rfind - test two modified and two new signatures
std::string s1("ababcab");
boost::string_view sv1(s1);
std::string s2("ab");
boost::string_view sv2(s2);
std::string s3;
boost::string_view sv3(s3);
// first signature
BOOST_TEST_EQ(sv3.rfind(sv3), s3.rfind(s3));
BOOST_TEST_EQ(sv2.rfind(sv3), s2.rfind(s3));
BOOST_TEST_EQ(sv3.rfind(sv2), s3.rfind(s2));
BOOST_TEST_EQ(sv1.rfind(sv3, 7), s1.rfind(s3, 7));
BOOST_TEST_EQ(sv1.rfind(sv3, 5), s1.rfind(s3, 5));
BOOST_TEST_EQ(sv1.rfind(sv2), s1.rfind(s2));
for (std::string::size_type i = s1.size(); i <= s1.size(); --i)
{
// std::cout << i << ": " << sv1.rfind(sv2, i) << " " << s1.rfind(s2, i) << std::endl;
BOOST_TEST_EQ(sv1.rfind(sv2, i), s1.rfind(s2, i));
}
for (std::string::size_type i = 0; i <= 8; ++i)
{
//std::cout << i << std::endl;
BOOST_TEST_EQ(sv1.rfind(sv3, i), s1.rfind(s3, i));
}
// second signature
for (std::string::size_type i = 0; i <= 8; ++i)
{
//std::cout << i << std::endl;
BOOST_TEST_EQ(sv1.rfind('b', i), s1.rfind('b', i));
}
// third signature
for (std::string::size_type i = 0; i <= 8; ++i)
for (std::string::size_type j = 0; j <= 4; ++j)
{
//std::cout << i << " " << j << std::endl;
BOOST_TEST_EQ(sv1.rfind("abc", i, j), s1.rfind("abc", i, j));
}
// fourth signature
BOOST_TEST_EQ(sv1.rfind("abc"), s1.rfind("abc"));
for (std::string::size_type i = 0; i <= 8; ++i)
BOOST_TEST_EQ(sv1.rfind("abc", i), s1.rfind("abc", i));
}
} // unnamed namespace } // unnamed namespace
int cpp_main(int argc, char* argv[]) int cpp_main(int argc, char* argv[])
@ -82,6 +131,7 @@ int cpp_main(int argc, char* argv[])
// compare, five new signatures // compare, five new signatures
find_test(); find_test();
rfind_test();
return boost::report_errors(); return boost::report_errors();
} }