From 673e3c302c2d447e2191bdec1efc3980bedbbc18 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Wed, 6 Oct 2021 05:49:09 +0300 Subject: [PATCH] Add sv_rfind_test --- include/boost/core/string_view.hpp | 15 ++- test/Jamfile.v2 | 1 + test/sv_rfind_test.cpp | 169 +++++++++++++++++++++++++++++ 3 files changed, 181 insertions(+), 4 deletions(-) create mode 100644 test/sv_rfind_test.cpp diff --git a/include/boost/core/string_view.hpp b/include/boost/core/string_view.hpp index 818c90d..743443f 100644 --- a/include/boost/core/string_view.hpp +++ b/include/boost/core/string_view.hpp @@ -375,13 +375,20 @@ public: BOOST_CXX14_CONSTEXPR size_type rfind( Ch c, size_type pos = npos ) const BOOST_NOEXCEPT { - if( pos > size() ) + size_type n = size(); + + if( n == 0 ) { - pos = size(); + return npos; } - const_reverse_iterator r = std::find( rbegin() + pos, rend(), c ); - return r == rend()? npos: size() - 1 - ( r - rbegin() ); + if( pos > n - 1 ) + { + pos = n - 1; + } + + const_reverse_iterator r = std::find( rbegin() + n - 1 - pos, rend(), c ); + return r == rend()? npos: n - 1 - ( r - rbegin() ); } BOOST_CXX14_CONSTEXPR size_type rfind( Ch const* s, size_type pos, size_type n ) const BOOST_NOEXCEPT diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 3a8f892..11bbea6 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -258,6 +258,7 @@ run sv_compare_test.cpp ; run sv_starts_with_test.cpp ; run sv_ends_with_test.cpp ; run sv_find_test.cpp ; +run sv_rfind_test.cpp ; use-project /boost/core/swap : ./swap ; build-project ./swap ; diff --git a/test/sv_rfind_test.cpp b/test/sv_rfind_test.cpp new file mode 100644 index 0000000..65a0ee8 --- /dev/null +++ b/test/sv_rfind_test.cpp @@ -0,0 +1,169 @@ +// Copyright 2021 Peter Dimov +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + +#include +#include +#include + +int main() +{ + std::size_t const npos = boost::core::string_view::npos; + + { + boost::core::string_view sv( "" ); + + BOOST_TEST_EQ( sv.rfind( boost::core::string_view() ), 0 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view(), 1 ), 0 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view(), 0 ), 0 ); + + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "" ) ), 0 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "" ), 1 ), 0 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "" ), 0 ), 0 ); + + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "1" ) ), npos ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "1" ), 1 ), npos ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "1" ), 0 ), npos ); + + BOOST_TEST_EQ( sv.rfind( '1' ), npos ); + BOOST_TEST_EQ( sv.rfind( '1', 1 ), npos ); + BOOST_TEST_EQ( sv.rfind( '1', 0 ), npos ); + + BOOST_TEST_EQ( sv.rfind( "" ), 0 ); + BOOST_TEST_EQ( sv.rfind( "", 1 ), 0 ); + BOOST_TEST_EQ( sv.rfind( "", 0 ), 0 ); + + BOOST_TEST_EQ( sv.rfind( "1" ), npos ); + BOOST_TEST_EQ( sv.rfind( "1", 1 ), npos ); + BOOST_TEST_EQ( sv.rfind( "1", 0 ), npos ); + + BOOST_TEST_EQ( sv.rfind( "1", npos, 0 ), 0 ); + BOOST_TEST_EQ( sv.rfind( "1", 1, 0 ), 0 ); + BOOST_TEST_EQ( sv.rfind( "1", 0, 0 ), 0 ); + + BOOST_TEST_EQ( sv.rfind( "1", npos, 1 ), npos ); + BOOST_TEST_EQ( sv.rfind( "1", 1, 1 ), npos ); + BOOST_TEST_EQ( sv.rfind( "1", 0, 1 ), npos ); + } + + { + boost::core::string_view sv( "123123" ); + + BOOST_TEST_EQ( sv.rfind( boost::core::string_view() ), 6 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view(), 7 ), 6 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view(), 6 ), 6 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view(), 5 ), 5 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view(), 1 ), 1 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view(), 0 ), 0 ); + + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "" ) ), 6 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "" ), 7 ), 6 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "" ), 6 ), 6 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "" ), 5 ), 5 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "" ), 1 ), 1 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "" ), 0 ), 0 ); + + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "1" ) ), 3 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "1" ), 7 ), 3 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "1" ), 6 ), 3 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "1" ), 5 ), 3 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "1" ), 4 ), 3 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "1" ), 3 ), 3 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "1" ), 2 ), 0 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "1" ), 1 ), 0 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "1" ), 0 ), 0 ); + + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "23" ) ), 4 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "23" ), 7 ), 4 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "23" ), 6 ), 4 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "23" ), 5 ), 4 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "23" ), 4 ), 4 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "23" ), 3 ), 1 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "23" ), 2 ), 1 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "23" ), 1 ), 1 ); + BOOST_TEST_EQ( sv.rfind( boost::core::string_view( "23" ), 0 ), npos ); + + BOOST_TEST_EQ( sv.rfind( '1' ), 3 ); + BOOST_TEST_EQ( sv.rfind( '1', 7 ), 3 ); + BOOST_TEST_EQ( sv.rfind( '1', 6 ), 3 ); + BOOST_TEST_EQ( sv.rfind( '1', 5 ), 3 ); + BOOST_TEST_EQ( sv.rfind( '1', 4 ), 3 ); + BOOST_TEST_EQ( sv.rfind( '1', 3 ), 3 ); + BOOST_TEST_EQ( sv.rfind( '1', 2 ), 0 ); + BOOST_TEST_EQ( sv.rfind( '1', 1 ), 0 ); + BOOST_TEST_EQ( sv.rfind( '1', 0 ), 0 ); + + BOOST_TEST_EQ( sv.rfind( '3' ), 5 ); + BOOST_TEST_EQ( sv.rfind( '3', 7 ), 5 ); + BOOST_TEST_EQ( sv.rfind( '3', 6 ), 5 ); + BOOST_TEST_EQ( sv.rfind( '3', 5 ), 5 ); + BOOST_TEST_EQ( sv.rfind( '3', 4 ), 2 ); + BOOST_TEST_EQ( sv.rfind( '3', 3 ), 2 ); + BOOST_TEST_EQ( sv.rfind( '3', 2 ), 2 ); + BOOST_TEST_EQ( sv.rfind( '3', 1 ), npos ); + BOOST_TEST_EQ( sv.rfind( '3', 0 ), npos ); + + BOOST_TEST_EQ( sv.rfind( '9' ), npos ); + BOOST_TEST_EQ( sv.rfind( '9', 7 ), npos ); + BOOST_TEST_EQ( sv.rfind( '9', 6 ), npos ); + + BOOST_TEST_EQ( sv.rfind( "" ), 6 ); + BOOST_TEST_EQ( sv.rfind( "", 7 ), 6 ); + BOOST_TEST_EQ( sv.rfind( "", 6 ), 6 ); + BOOST_TEST_EQ( sv.rfind( "", 5 ), 5 ); + BOOST_TEST_EQ( sv.rfind( "", 1 ), 1 ); + BOOST_TEST_EQ( sv.rfind( "", 0 ), 0 ); + + BOOST_TEST_EQ( sv.rfind( "1" ), 3 ); + BOOST_TEST_EQ( sv.rfind( "1", 7 ), 3 ); + BOOST_TEST_EQ( sv.rfind( "1", 6 ), 3 ); + BOOST_TEST_EQ( sv.rfind( "1", 5 ), 3 ); + BOOST_TEST_EQ( sv.rfind( "1", 4 ), 3 ); + BOOST_TEST_EQ( sv.rfind( "1", 3 ), 3 ); + BOOST_TEST_EQ( sv.rfind( "1", 2 ), 0 ); + BOOST_TEST_EQ( sv.rfind( "1", 1 ), 0 ); + BOOST_TEST_EQ( sv.rfind( "1", 0 ), 0 ); + + BOOST_TEST_EQ( sv.rfind( "23" ), 4 ); + BOOST_TEST_EQ( sv.rfind( "23", 7 ), 4 ); + BOOST_TEST_EQ( sv.rfind( "23", 6 ), 4 ); + BOOST_TEST_EQ( sv.rfind( "23", 5 ), 4 ); + BOOST_TEST_EQ( sv.rfind( "23", 4 ), 4 ); + BOOST_TEST_EQ( sv.rfind( "23", 3 ), 1 ); + BOOST_TEST_EQ( sv.rfind( "23", 2 ), 1 ); + BOOST_TEST_EQ( sv.rfind( "23", 1 ), 1 ); + BOOST_TEST_EQ( sv.rfind( "23", 0 ), npos ); + + BOOST_TEST_EQ( sv.rfind( "123", npos, 0 ), 6 ); + BOOST_TEST_EQ( sv.rfind( "123", 7, 0 ), 6 ); + BOOST_TEST_EQ( sv.rfind( "123", 6, 0 ), 6 ); + BOOST_TEST_EQ( sv.rfind( "123", 5, 0 ), 5 ); + BOOST_TEST_EQ( sv.rfind( "123", 1, 0 ), 1 ); + BOOST_TEST_EQ( sv.rfind( "123", 0, 0 ), 0 ); + + BOOST_TEST_EQ( sv.rfind( "123", npos, 1 ), 3 ); + BOOST_TEST_EQ( sv.rfind( "123", 7, 1 ), 3 ); + BOOST_TEST_EQ( sv.rfind( "123", 6, 1 ), 3 ); + BOOST_TEST_EQ( sv.rfind( "123", 5, 1 ), 3 ); + BOOST_TEST_EQ( sv.rfind( "123", 4, 1 ), 3 ); + BOOST_TEST_EQ( sv.rfind( "123", 3, 1 ), 3 ); + BOOST_TEST_EQ( sv.rfind( "123", 2, 1 ), 0 ); + BOOST_TEST_EQ( sv.rfind( "123", 1, 1 ), 0 ); + BOOST_TEST_EQ( sv.rfind( "123", 0, 1 ), 0 ); + + BOOST_TEST_EQ( sv.rfind( "123", npos, 3 ), 3 ); + BOOST_TEST_EQ( sv.rfind( "123", 7, 3 ), 3 ); + BOOST_TEST_EQ( sv.rfind( "123", 6, 3 ), 3 ); + BOOST_TEST_EQ( sv.rfind( "123", 5, 3 ), 3 ); + BOOST_TEST_EQ( sv.rfind( "123", 4, 3 ), 3 ); + BOOST_TEST_EQ( sv.rfind( "123", 3, 3 ), 3 ); + BOOST_TEST_EQ( sv.rfind( "123", 2, 3 ), 0 ); + BOOST_TEST_EQ( sv.rfind( "123", 1, 3 ), 0 ); + BOOST_TEST_EQ( sv.rfind( "123", 0, 3 ), 0 ); + + BOOST_TEST_EQ( sv.rfind( "123123" ), 0 ); + BOOST_TEST_EQ( sv.rfind( "1231231" ), npos ); + } + + return boost::report_errors(); +}