King_DuckZ/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout synced 2025-08-03 12:49:50 +00:00
Code Issues Releases Wiki Activity

rename string_ref -> string_view (string_ref is deprecated)

Browse source
This commit is contained in:
bolero-MURAKAMI 2016-03-29 18:02:51 +09:00
parent 276b09f004
commit b5699163e8
25 changed files with 605 additions and 605 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/utility/CMakeLists.txt
View file

@ -1 +1 @@
subdirs( string_ref )
subdirs( string_view )

3
libs/utility/string_ref/test/CMakeLists.txt
View file

@ -1,3 +0,0 @@
add_executable( libs_utility_string_ref_test_string_ref string_ref.cpp )
set_target_properties( libs_utility_string_ref_test_string_ref PROPERTIES OUTPUT_NAME "string_ref" )
add_test( libs_utility_string_ref_test_string_ref string_ref )

0
libs/utility/string_ref/CMakeLists.txt → libs/utility/string_view/CMakeLists.txt
View file

3
libs/utility/string_view/test/CMakeLists.txt Normal file
View file

@ -0,0 +1,3 @@
add_executable( libs_utility_string_view_test_string_view string_view.cpp )
set_target_properties( libs_utility_string_view_test_string_view PROPERTIES OUTPUT_NAME "string_view" )
add_test( libs_utility_string_view_test_string_view string_view )

64
libs/utility/string_ref/test/string_ref.cpp → libs/utility/string_view/test/string_view.cpp
View file

@ -5,24 +5,24 @@
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
#ifndef SPROUT_LIBS_UTILITY_STRING_REF_TEST_STRING_REF_CPP
#define SPROUT_LIBS_UTILITY_STRING_REF_TEST_STRING_REF_CPP
#ifndef SPROUT_LIBS_UTILITY_STRING_VIEW_TEST_STRING_VIEW_CPP
#define SPROUT_LIBS_UTILITY_STRING_VIEW_TEST_STRING_VIEW_CPP
#include <sstream>
#include <type_traits>
#include <sprout/utility/string_ref.hpp>
#include <sprout/utility/string_view.hpp>
#include <sprout/string.hpp>
#include <sprout/container.hpp>
#include <testspr/tools.hpp>
namespace testspr {
static void string_ref_test() {
static void string_view_test() {
using namespace sprout;
{
SPROUT_STATIC_CONSTEXPR char cstr[] = "foobar1234";
SPROUT_STATIC_CONSTEXPR auto s = sprout::to_string("hogehoge");
SPROUT_STATIC_CONSTEXPR auto str1 = sprout::string_ref(cstr);
SPROUT_STATIC_CONSTEXPR auto str2 = sprout::string_ref(s);
SPROUT_STATIC_CONSTEXPR auto str1 = sprout::string_view(cstr);
SPROUT_STATIC_CONSTEXPR auto str2 = sprout::string_view(s);
// begin
TESTSPR_BOTH_ASSERT(cstr[0] == *str1.begin());
@ -53,7 +53,7 @@ namespace testspr {
// empty
TESTSPR_BOTH_ASSERT(!str1.empty());
TESTSPR_BOTH_ASSERT((sprout::string_ref().empty()));
TESTSPR_BOTH_ASSERT((sprout::string_view().empty()));
// max_size
TESTSPR_BOTH_ASSERT(str1.max_size() == 10);
@ -78,16 +78,16 @@ namespace testspr {
// swap
{
auto s1 = sprout::string_ref("abc");
auto s2 = sprout::string_ref("ABC");
auto s1 = sprout::string_view("abc");
auto s2 = sprout::string_view("ABC");
s1.swap(s2);
TESTSPR_ASSERT(s1[0] == 'A');
}
// operator=
{
auto s = sprout::string_ref("abc");
s = sprout::string_ref("ABC");
auto s = sprout::string_view("abc");
s = sprout::string_view("ABC");
TESTSPR_ASSERT(s.size() == 3);
TESTSPR_ASSERT(s[0] == 'A');
}
@ -106,7 +106,7 @@ namespace testspr {
// find
TESTSPR_BOTH_ASSERT(str1.find(str2) == npos);
TESTSPR_BOTH_ASSERT(str1.find(sprout::string_ref("bar")) == 3);
TESTSPR_BOTH_ASSERT(str1.find(sprout::string_view("bar")) == 3);
TESTSPR_BOTH_ASSERT(str1.find(str2.c_str()) == npos);
TESTSPR_BOTH_ASSERT(str1.find("bar") == 3);
TESTSPR_BOTH_ASSERT(str1.find(str2.c_str(), 0, 3) == npos);
@ -115,7 +115,7 @@ namespace testspr {
// rfind
TESTSPR_BOTH_ASSERT(str1.rfind(str2) == npos);
TESTSPR_BOTH_ASSERT(str1.rfind(sprout::string_ref("bar")) == 3);
TESTSPR_BOTH_ASSERT(str1.rfind(sprout::string_view("bar")) == 3);
TESTSPR_BOTH_ASSERT(str1.rfind(str2.c_str()) == npos);
TESTSPR_BOTH_ASSERT(str1.rfind("bar") == 3);
TESTSPR_BOTH_ASSERT(str1.rfind(str2.c_str(), npos, 3) == npos);
@ -123,8 +123,8 @@ namespace testspr {
TESTSPR_BOTH_ASSERT(str1.rfind('b') == 3);
// find_first_of
TESTSPR_BOTH_ASSERT(str1.find_first_of(sprout::string_ref("vwxyz")) == npos);
TESTSPR_BOTH_ASSERT(str1.find_first_of(sprout::string_ref("rab")) == 3);
TESTSPR_BOTH_ASSERT(str1.find_first_of(sprout::string_view("vwxyz")) == npos);
TESTSPR_BOTH_ASSERT(str1.find_first_of(sprout::string_view("rab")) == 3);
TESTSPR_BOTH_ASSERT(str1.find_first_of("vwxyz") == npos);
TESTSPR_BOTH_ASSERT(str1.find_first_of("rab") == 3);
TESTSPR_BOTH_ASSERT(str1.find_first_of("vwxyz", 0, 3) == npos);
@ -132,8 +132,8 @@ namespace testspr {
TESTSPR_BOTH_ASSERT(str1.find_first_of('b') == 3);
// find_last_of
TESTSPR_BOTH_ASSERT(str1.find_last_of(sprout::string_ref("vwxyz")) == npos);
TESTSPR_BOTH_ASSERT(str1.find_last_of(sprout::string_ref("rab")) == 5);
TESTSPR_BOTH_ASSERT(str1.find_last_of(sprout::string_view("vwxyz")) == npos);
TESTSPR_BOTH_ASSERT(str1.find_last_of(sprout::string_view("rab")) == 5);
TESTSPR_BOTH_ASSERT(str1.find_last_of("vwxyz") == npos);
TESTSPR_BOTH_ASSERT(str1.find_last_of("rab") == 5);
TESTSPR_BOTH_ASSERT(str1.find_last_of("vwxyz", npos, 3) == npos);
@ -142,7 +142,7 @@ namespace testspr {
// find_first_not_of
TESTSPR_BOTH_ASSERT(str1.find_first_not_of(str1) == npos);
TESTSPR_BOTH_ASSERT(str1.find_first_not_of(sprout::string_ref("foo")) == 3);
TESTSPR_BOTH_ASSERT(str1.find_first_not_of(sprout::string_view("foo")) == 3);
TESTSPR_BOTH_ASSERT(str1.find_first_not_of(str1.c_str()) == npos);
TESTSPR_BOTH_ASSERT(str1.find_first_not_of("foo") == 3);
TESTSPR_BOTH_ASSERT(str1.find_first_not_of(str1.c_str(), 0, 10) == npos);
@ -151,7 +151,7 @@ namespace testspr {
// find_last_not_of
TESTSPR_BOTH_ASSERT(str1.find_last_not_of(str1) == npos);
TESTSPR_BOTH_ASSERT(str1.find_last_not_of(sprout::string_ref("4321")) == 5);
TESTSPR_BOTH_ASSERT(str1.find_last_not_of(sprout::string_view("4321")) == 5);
TESTSPR_BOTH_ASSERT(str1.find_last_not_of(str1.c_str()) == npos);
TESTSPR_BOTH_ASSERT(str1.find_last_not_of("4321") == 5);
TESTSPR_BOTH_ASSERT(str1.find_last_not_of(str1.c_str(), npos, 10) == npos);
@ -174,14 +174,14 @@ namespace testspr {
// compare
TESTSPR_BOTH_ASSERT(str1.compare(str1) == 0);
TESTSPR_BOTH_ASSERT(str1.compare(sprout::string_ref("zzzz")) < 0);
TESTSPR_BOTH_ASSERT(str2.compare(sprout::string_ref("aaaa")) > 0);
TESTSPR_BOTH_ASSERT(str1.compare(0, 3, sprout::string_ref("foo")) == 0);
TESTSPR_BOTH_ASSERT(str1.compare(0, 3, sprout::string_ref("zzzz")) < 0);
TESTSPR_BOTH_ASSERT(str2.compare(0, 3, sprout::string_ref("aaaa")) > 0);
TESTSPR_BOTH_ASSERT(str1.compare(0, 3, sprout::string_ref("foo"), 0, 3) == 0);
TESTSPR_BOTH_ASSERT(str1.compare(0, 3, sprout::string_ref("zzzz"), 0, 3) < 0);
TESTSPR_BOTH_ASSERT(str2.compare(0, 3, sprout::string_ref("aaaa"), 0, 3) > 0);
TESTSPR_BOTH_ASSERT(str1.compare(sprout::string_view("zzzz")) < 0);
TESTSPR_BOTH_ASSERT(str2.compare(sprout::string_view("aaaa")) > 0);
TESTSPR_BOTH_ASSERT(str1.compare(0, 3, sprout::string_view("foo")) == 0);
TESTSPR_BOTH_ASSERT(str1.compare(0, 3, sprout::string_view("zzzz")) < 0);
TESTSPR_BOTH_ASSERT(str2.compare(0, 3, sprout::string_view("aaaa")) > 0);
TESTSPR_BOTH_ASSERT(str1.compare(0, 3, sprout::string_view("foo"), 0, 3) == 0);
TESTSPR_BOTH_ASSERT(str1.compare(0, 3, sprout::string_view("zzzz"), 0, 3) < 0);
TESTSPR_BOTH_ASSERT(str2.compare(0, 3, sprout::string_view("aaaa"), 0, 3) > 0);
TESTSPR_BOTH_ASSERT(str1.compare(str1.c_str()) == 0);
TESTSPR_BOTH_ASSERT(str1.compare("zzzz") < 0);
TESTSPR_BOTH_ASSERT(str1.compare("aaaa") > 0);
@ -217,9 +217,9 @@ namespace testspr {
TESTSPR_ASSERT(os.str() == cstr);
}
// is_string_ref
TESTSPR_BOTH_ASSERT(sprout::is_string_ref<decltype(str1)>::value);
TESTSPR_BOTH_ASSERT(!sprout::is_string_ref<int>::value);
// is_string_view
TESTSPR_BOTH_ASSERT(sprout::is_string_view<decltype(str1)>::value);
TESTSPR_BOTH_ASSERT(!sprout::is_string_view<int>::value);
// sprout::to_hash, sprout::hash
TESTSPR_BOTH_ASSERT(sprout::to_hash(str1) == sprout::hash<decltype(str1)>()(str1));
@ -229,8 +229,8 @@ namespace testspr {
} // namespace testspr
#ifndef TESTSPR_CPP_INCLUDE
# define TESTSPR_TEST_FUNCTION testspr::string_ref_test
# define TESTSPR_TEST_FUNCTION testspr::string_view_test
# include <testspr/include_main.hpp>
#endif
#endif // #ifndef SPROUT_LIBS_UTILITY_STRING_REF_TEST_STRING_REF_CPP
#endif // #ifndef SPROUT_LIBS_UTILITY_STRING_VIEW_TEST_STRING_VIEW_CPP