From 8ab8e36dcfaa88837e3cf0bccaf01c458d3c1fb2 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Wed, 17 Feb 2016 11:32:16 -0800 Subject: [PATCH] Remove the 'basic_string_ref template; use 'basic_string_view' instead. Keep the string_ref, etc typedefs around, though --- include/boost/utility/string_ref.hpp | 516 +--------------------- include/boost/utility/string_ref_fwd.hpp | 12 +- include/boost/utility/string_view_fwd.hpp | 2 +- test/Jamfile.v2 | 3 - test/string_ref_test1.cpp | 109 ----- test/string_ref_test2.cpp | 318 ------------- test/string_ref_test_io.cpp | 179 -------- 7 files changed, 10 insertions(+), 1129 deletions(-) delete mode 100644 test/string_ref_test1.cpp delete mode 100644 test/string_ref_test2.cpp delete mode 100644 test/string_ref_test_io.cpp diff --git a/include/boost/utility/string_ref.hpp b/include/boost/utility/string_ref.hpp index 8707157..df5dcbe 100644 --- a/include/boost/utility/string_ref.hpp +++ b/include/boost/utility/string_ref.hpp @@ -18,519 +18,9 @@ #include #include #include -#include +#include -#include -#include -#include -#include -#include -#include - -namespace boost { - - namespace detail { - // A helper functor because sometimes we don't have lambdas - template - class string_ref_traits_eq { - public: - string_ref_traits_eq ( charT ch ) : ch_(ch) {} - bool operator () ( charT val ) const { return traits::eq ( ch_, val ); } - charT ch_; - }; - } - - template - class basic_string_ref { - public: - // types - typedef charT value_type; - typedef const charT* pointer; - typedef const charT& reference; - typedef const charT& const_reference; - typedef pointer const_iterator; // impl-defined - typedef const_iterator iterator; - typedef std::reverse_iterator const_reverse_iterator; - typedef const_reverse_iterator reverse_iterator; - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; - static BOOST_CONSTEXPR_OR_CONST size_type npos = size_type(-1); - - // construct/copy - BOOST_CONSTEXPR basic_string_ref () - : ptr_(NULL), len_(0) {} - - BOOST_CONSTEXPR basic_string_ref (const basic_string_ref &rhs) - : ptr_(rhs.ptr_), len_(rhs.len_) {} - - basic_string_ref& operator=(const basic_string_ref &rhs) { - ptr_ = rhs.ptr_; - len_ = rhs.len_; - return *this; - } - - basic_string_ref(const charT* str) - : ptr_(str), len_(traits::length(str)) {} - - template - basic_string_ref(const std::basic_string& str) - : ptr_(str.data()), len_(str.length()) {} - - BOOST_CONSTEXPR basic_string_ref(const charT* str, size_type len) - : ptr_(str), len_(len) {} - -#ifndef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS - template - explicit operator std::basic_string() const { - return std::basic_string ( begin(), end()); - } -#endif - - std::basic_string to_string () const { - return std::basic_string ( begin(), end()); - } - - // iterators - BOOST_CONSTEXPR const_iterator begin() const { return ptr_; } - BOOST_CONSTEXPR const_iterator cbegin() const { return ptr_; } - BOOST_CONSTEXPR const_iterator end() const { return ptr_ + len_; } - BOOST_CONSTEXPR const_iterator cend() const { return ptr_ + len_; } - const_reverse_iterator rbegin() const { return const_reverse_iterator (end()); } - const_reverse_iterator crbegin() const { return const_reverse_iterator (end()); } - const_reverse_iterator rend() const { return const_reverse_iterator (begin()); } - const_reverse_iterator crend() const { return const_reverse_iterator (begin()); } - - // capacity - BOOST_CONSTEXPR size_type size() const { return len_; } - BOOST_CONSTEXPR size_type length() const { return len_; } - BOOST_CONSTEXPR size_type max_size() const { return len_; } - BOOST_CONSTEXPR bool empty() const { return len_ == 0; } - - // element access - BOOST_CONSTEXPR const charT& operator[](size_type pos) const { return ptr_[pos]; } - - const charT& at(size_t pos) const { - if ( pos >= len_ ) - BOOST_THROW_EXCEPTION( std::out_of_range ( "boost::string_ref::at" ) ); - return ptr_[pos]; - } - - BOOST_CONSTEXPR const charT& front() const { return ptr_[0]; } - BOOST_CONSTEXPR const charT& back() const { return ptr_[len_-1]; } - BOOST_CONSTEXPR const charT* data() const { return ptr_; } - - // modifiers - void clear() { len_ = 0; } - void remove_prefix(size_type n) { - if ( n > len_ ) - n = len_; - ptr_ += n; - len_ -= n; - } - - void remove_suffix(size_type n) { - if ( n > len_ ) - n = len_; - len_ -= n; - } - - - // basic_string_ref string operations - basic_string_ref substr(size_type pos, size_type n=npos) const { - if ( pos > size()) - BOOST_THROW_EXCEPTION( std::out_of_range ( "string_ref::substr" ) ); - if ( n == npos || pos + n > size()) - n = size () - pos; - return basic_string_ref ( data() + pos, n ); - } - - int compare(basic_string_ref x) const { - const int cmp = traits::compare ( ptr_, x.ptr_, (std::min)(len_, x.len_)); - return cmp != 0 ? cmp : ( len_ == x.len_ ? 0 : len_ < x.len_ ? -1 : 1 ); - } - - bool starts_with(charT c) const { return !empty() && traits::eq ( c, front()); } - bool starts_with(basic_string_ref x) const { - return len_ >= x.len_ && traits::compare ( ptr_, x.ptr_, x.len_ ) == 0; - } - - bool ends_with(charT c) const { return !empty() && traits::eq ( c, back()); } - bool ends_with(basic_string_ref x) const { - return len_ >= x.len_ && traits::compare ( ptr_ + len_ - x.len_, x.ptr_, x.len_ ) == 0; - } - - size_type find(basic_string_ref s) const { - const_iterator iter = std::search ( this->cbegin (), this->cend (), - s.cbegin (), s.cend (), traits::eq ); - return iter == this->cend () ? npos : std::distance ( this->cbegin (), iter ); - } - - size_type find(charT c) const { - const_iterator iter = std::find_if ( this->cbegin (), this->cend (), - detail::string_ref_traits_eq ( c )); - return iter == this->cend () ? npos : std::distance ( this->cbegin (), iter ); - } - - size_type rfind(basic_string_ref s) const { - const_reverse_iterator iter = std::search ( this->crbegin (), this->crend (), - s.crbegin (), s.crend (), traits::eq ); - return iter == this->crend () ? npos : reverse_distance ( this->crbegin (), iter ); - } - - size_type rfind(charT c) const { - const_reverse_iterator iter = std::find_if ( this->crbegin (), this->crend (), - detail::string_ref_traits_eq ( c )); - return iter == this->crend () ? npos : reverse_distance ( this->crbegin (), iter ); - } - - size_type find_first_of(charT c) const { return find (c); } - size_type find_last_of (charT c) const { return rfind (c); } - - size_type find_first_of(basic_string_ref s) const { - const_iterator iter = std::find_first_of - ( this->cbegin (), this->cend (), s.cbegin (), s.cend (), traits::eq ); - return iter == this->cend () ? npos : std::distance ( this->cbegin (), iter ); - } - - size_type find_last_of(basic_string_ref s) const { - const_reverse_iterator iter = std::find_first_of - ( this->crbegin (), this->crend (), s.cbegin (), s.cend (), traits::eq ); - return iter == this->crend () ? npos : reverse_distance ( this->crbegin (), iter); - } - - size_type find_first_not_of(basic_string_ref s) const { - const_iterator iter = find_not_of ( this->cbegin (), this->cend (), s ); - return iter == this->cend () ? npos : std::distance ( this->cbegin (), iter ); - } - - size_type find_first_not_of(charT c) const { - for ( const_iterator iter = this->cbegin (); iter != this->cend (); ++iter ) - if ( !traits::eq ( c, *iter )) - return std::distance ( this->cbegin (), iter ); - return npos; - } - - size_type find_last_not_of(basic_string_ref s) const { - const_reverse_iterator iter = find_not_of ( this->crbegin (), this->crend (), s ); - return iter == this->crend () ? npos : reverse_distance ( this->crbegin (), iter ); - } - - size_type find_last_not_of(charT c) const { - for ( const_reverse_iterator iter = this->crbegin (); iter != this->crend (); ++iter ) - if ( !traits::eq ( c, *iter )) - return reverse_distance ( this->crbegin (), iter ); - return npos; - } - - private: - template - size_type reverse_distance ( r_iter first, r_iter last ) const { - return len_ - 1 - std::distance ( first, last ); - } - - template - Iterator find_not_of ( Iterator first, Iterator last, basic_string_ref s ) const { - for ( ; first != last ; ++first ) - if ( 0 == traits::find ( s.ptr_, s.len_, *first )) - return first; - return last; - } - - - - const charT *ptr_; - std::size_t len_; - }; - - -// Comparison operators -// Equality - template - inline bool operator==(basic_string_ref x, basic_string_ref y) { - if ( x.size () != y.size ()) return false; - return x.compare(y) == 0; - } - - template - inline bool operator==(basic_string_ref x, const std::basic_string & y) { - return x == basic_string_ref(y); - } - - template - inline bool operator==(const std::basic_string & x, basic_string_ref y) { - return basic_string_ref(x) == y; - } - - template - inline bool operator==(basic_string_ref x, const charT * y) { - return x == basic_string_ref(y); - } - - template - inline bool operator==(const charT * x, basic_string_ref y) { - return basic_string_ref(x) == y; - } - -// Inequality - template - inline bool operator!=(basic_string_ref x, basic_string_ref y) { - if ( x.size () != y.size ()) return true; - return x.compare(y) != 0; - } - - template - inline bool operator!=(basic_string_ref x, const std::basic_string & y) { - return x != basic_string_ref(y); - } - - template - inline bool operator!=(const std::basic_string & x, basic_string_ref y) { - return basic_string_ref(x) != y; - } - - template - inline bool operator!=(basic_string_ref x, const charT * y) { - return x != basic_string_ref(y); - } - - template - inline bool operator!=(const charT * x, basic_string_ref y) { - return basic_string_ref(x) != y; - } - -// Less than - template - inline bool operator<(basic_string_ref x, basic_string_ref y) { - return x.compare(y) < 0; - } - - template - inline bool operator<(basic_string_ref x, const std::basic_string & y) { - return x < basic_string_ref(y); - } - - template - inline bool operator<(const std::basic_string & x, basic_string_ref y) { - return basic_string_ref(x) < y; - } - - template - inline bool operator<(basic_string_ref x, const charT * y) { - return x < basic_string_ref(y); - } - - template - inline bool operator<(const charT * x, basic_string_ref y) { - return basic_string_ref(x) < y; - } - -// Greater than - template - inline bool operator>(basic_string_ref x, basic_string_ref y) { - return x.compare(y) > 0; - } - - template - inline bool operator>(basic_string_ref x, const std::basic_string & y) { - return x > basic_string_ref(y); - } - - template - inline bool operator>(const std::basic_string & x, basic_string_ref y) { - return basic_string_ref(x) > y; - } - - template - inline bool operator>(basic_string_ref x, const charT * y) { - return x > basic_string_ref(y); - } - - template - inline bool operator>(const charT * x, basic_string_ref y) { - return basic_string_ref(x) > y; - } - -// Less than or equal to - template - inline bool operator<=(basic_string_ref x, basic_string_ref y) { - return x.compare(y) <= 0; - } - - template - inline bool operator<=(basic_string_ref x, const std::basic_string & y) { - return x <= basic_string_ref(y); - } - - template - inline bool operator<=(const std::basic_string & x, basic_string_ref y) { - return basic_string_ref(x) <= y; - } - - template - inline bool operator<=(basic_string_ref x, const charT * y) { - return x <= basic_string_ref(y); - } - - template - inline bool operator<=(const charT * x, basic_string_ref y) { - return basic_string_ref(x) <= y; - } - -// Greater than or equal to - template - inline bool operator>=(basic_string_ref x, basic_string_ref y) { - return x.compare(y) >= 0; - } - - template - inline bool operator>=(basic_string_ref x, const std::basic_string & y) { - return x >= basic_string_ref(y); - } - - template - inline bool operator>=(const std::basic_string & x, basic_string_ref y) { - return basic_string_ref(x) >= y; - } - - template - inline bool operator>=(basic_string_ref x, const charT * y) { - return x >= basic_string_ref(y); - } - - template - inline bool operator>=(const charT * x, basic_string_ref y) { - return basic_string_ref(x) >= y; - } - - namespace detail { - - template - inline void insert_fill_chars(std::basic_ostream& os, std::size_t n) { - enum { chunk_size = 8 }; - charT fill_chars[chunk_size]; - std::fill_n(fill_chars, static_cast< std::size_t >(chunk_size), os.fill()); - for (; n >= chunk_size && os.good(); n -= chunk_size) - os.write(fill_chars, static_cast< std::size_t >(chunk_size)); - if (n > 0 && os.good()) - os.write(fill_chars, n); - } - - template - void insert_aligned(std::basic_ostream& os, const basic_string_ref& str) { - const std::size_t size = str.size(); - const std::size_t alignment_size = static_cast< std::size_t >(os.width()) - size; - const bool align_left = (os.flags() & std::basic_ostream::adjustfield) == std::basic_ostream::left; - if (!align_left) { - detail::insert_fill_chars(os, alignment_size); - if (os.good()) - os.write(str.data(), size); - } - else { - os.write(str.data(), size); - if (os.good()) - detail::insert_fill_chars(os, alignment_size); - } - } - - } // namespace detail - - // Inserter - template - inline std::basic_ostream& - operator<<(std::basic_ostream& os, const basic_string_ref& str) { - if (os.good()) { - const std::size_t size = str.size(); - const std::size_t w = static_cast< std::size_t >(os.width()); - if (w <= size) - os.write(str.data(), size); - else - detail::insert_aligned(os, str); - os.width(0); - } - return os; - } - -#if 0 - // numeric conversions - // - // These are short-term implementations. - // In a production environment, I would rather avoid the copying. - // - inline int stoi (string_ref str, size_t* idx=0, int base=10) { - return std::stoi ( std::string(str), idx, base ); - } - - inline long stol (string_ref str, size_t* idx=0, int base=10) { - return std::stol ( std::string(str), idx, base ); - } - - inline unsigned long stoul (string_ref str, size_t* idx=0, int base=10) { - return std::stoul ( std::string(str), idx, base ); - } - - inline long long stoll (string_ref str, size_t* idx=0, int base=10) { - return std::stoll ( std::string(str), idx, base ); - } - - inline unsigned long long stoull (string_ref str, size_t* idx=0, int base=10) { - return std::stoull ( std::string(str), idx, base ); - } - - inline float stof (string_ref str, size_t* idx=0) { - return std::stof ( std::string(str), idx ); - } - - inline double stod (string_ref str, size_t* idx=0) { - return std::stod ( std::string(str), idx ); - } - - inline long double stold (string_ref str, size_t* idx=0) { - return std::stold ( std::string(str), idx ); - } - - inline int stoi (wstring_ref str, size_t* idx=0, int base=10) { - return std::stoi ( std::wstring(str), idx, base ); - } - - inline long stol (wstring_ref str, size_t* idx=0, int base=10) { - return std::stol ( std::wstring(str), idx, base ); - } - - inline unsigned long stoul (wstring_ref str, size_t* idx=0, int base=10) { - return std::stoul ( std::wstring(str), idx, base ); - } - - inline long long stoll (wstring_ref str, size_t* idx=0, int base=10) { - return std::stoll ( std::wstring(str), idx, base ); - } - - inline unsigned long long stoull (wstring_ref str, size_t* idx=0, int base=10) { - return std::stoull ( std::wstring(str), idx, base ); - } - - inline float stof (wstring_ref str, size_t* idx=0) { - return std::stof ( std::wstring(str), idx ); - } - - inline double stod (wstring_ref str, size_t* idx=0) { - return std::stod ( std::wstring(str), idx ); - } - - inline long double stold (wstring_ref str, size_t* idx=0) { - return std::stold ( std::wstring(str), idx ); - } -#endif - -} - -#if 0 -namespace std { - // Hashing - template<> struct hash; - template<> struct hash; - template<> struct hash; - template<> struct hash; -} -#endif +// The primary template has been changed to basic_string_view +// The convenience typedefs string_ref still exist. #endif diff --git a/include/boost/utility/string_ref_fwd.hpp b/include/boost/utility/string_ref_fwd.hpp index f58b98c..ead7b13 100644 --- a/include/boost/utility/string_ref_fwd.hpp +++ b/include/boost/utility/string_ref_fwd.hpp @@ -16,20 +16,20 @@ #define BOOST_STRING_REF_FWD_HPP #include -#include +#include +#include // for std::char_traits namespace boost { - template > class basic_string_ref; - typedef basic_string_ref > string_ref; - typedef basic_string_ref > wstring_ref; + typedef basic_string_view > string_ref; + typedef basic_string_view > wstring_ref; #ifndef BOOST_NO_CXX11_CHAR16_T - typedef basic_string_ref > u16string_ref; + typedef basic_string_view > u16string_ref; #endif #ifndef BOOST_NO_CXX11_CHAR32_T - typedef basic_string_ref > u32string_ref; + typedef basic_string_view > u32string_ref; #endif } diff --git a/include/boost/utility/string_view_fwd.hpp b/include/boost/utility/string_view_fwd.hpp index 3d2317a..3764f99 100644 --- a/include/boost/utility/string_view_fwd.hpp +++ b/include/boost/utility/string_view_fwd.hpp @@ -18,7 +18,7 @@ #define BOOST_STRING_VIEW_FWD_HPP #include -#include +#include // for std::char_traits namespace boost { diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index a2d5e4b..6e39ef6 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -27,9 +27,6 @@ test-suite utility [ run ../operators_test.cpp ../../test/build//boost_test_exec_monitor/static ] [ compile result_of_test.cpp ] [ run ../shared_iterator_test.cpp ] - [ run string_ref_test1.cpp unit_test_framework ] - [ run string_ref_test2.cpp unit_test_framework ] - [ run string_ref_test_io.cpp unit_test_framework ] [ run string_view_test1.cpp unit_test_framework ] [ run string_view_test2.cpp unit_test_framework ] [ run string_view_test_io.cpp unit_test_framework ] diff --git a/test/string_ref_test1.cpp b/test/string_ref_test1.cpp deleted file mode 100644 index f1d4df2..0000000 --- a/test/string_ref_test1.cpp +++ /dev/null @@ -1,109 +0,0 @@ -/* - Copyright (c) Marshall Clow 2012-2012. - - 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) - - For more information, see http://www.boost.org -*/ - -#include -#include -#include - -#include - -#define BOOST_TEST_MAIN -#include - -typedef boost::string_ref string_ref; - -// Should be equal -void interop ( const std::string &str, string_ref ref ) { -// BOOST_CHECK ( str == ref ); - BOOST_CHECK ( str.size () == ref.size ()); - BOOST_CHECK ( std::equal ( str.begin (), str.end (), ref.begin ())); - BOOST_CHECK ( std::equal ( str.rbegin (), str.rend (), ref.rbegin ())); - } - -void null_tests ( const char *p ) { -// All zero-length string-refs should be equal - string_ref sr1; // NULL, 0 - string_ref sr2 ( NULL, 0 ); - string_ref sr3 ( p, 0 ); - string_ref sr4 ( p ); - sr4.clear (); - - BOOST_CHECK ( sr1 == sr2 ); - BOOST_CHECK ( sr1 == sr3 ); - BOOST_CHECK ( sr2 == sr3 ); - BOOST_CHECK ( sr1 == sr4 ); - } - -// make sure that substrings work just like strings -void test_substr ( const std::string &str ) { - const size_t sz = str.size (); - string_ref ref ( str ); - -// Substrings at the end - for ( size_t i = 0; i <= sz; ++ i ) - interop ( str.substr ( i ), ref.substr ( i )); - -// Substrings at the beginning - for ( size_t i = 0; i <= sz; ++ i ) - interop ( str.substr ( 0, i ), ref.substr ( 0, i )); - -// All possible substrings - for ( size_t i = 0; i < sz; ++i ) - for ( size_t j = i; j < sz; ++j ) - interop ( str.substr ( i, j ), ref.substr ( i, j )); - } - -// make sure that removing prefixes and suffixes work just like strings -void test_remove ( const std::string &str ) { - const size_t sz = str.size (); - std::string work; - string_ref ref; - - for ( size_t i = 1; i <= sz; ++i ) { - work = str; - ref = str; - while ( ref.size () >= i ) { - interop ( work, ref ); - work.erase ( 0, i ); - ref.remove_prefix (i); - } - } - - for ( size_t i = 1; i < sz; ++ i ) { - work = str; - ref = str; - while ( ref.size () >= i ) { - interop ( work, ref ); - work.erase ( work.size () - i, i ); - ref.remove_suffix (i); - } - } - } - -const char *test_strings [] = { - "", - "1", - "ABCDEFGHIJKLMNOPQRSTUVWXYZ", - "0123456789", - NULL - }; - -BOOST_AUTO_TEST_CASE( test_main ) -{ - const char **p = &test_strings[0]; - - while ( *p != NULL ) { - interop ( *p, *p ); - test_substr ( *p ); - test_remove ( *p ); - null_tests ( *p ); - - p++; - } -} diff --git a/test/string_ref_test2.cpp b/test/string_ref_test2.cpp deleted file mode 100644 index 9559c67..0000000 --- a/test/string_ref_test2.cpp +++ /dev/null @@ -1,318 +0,0 @@ -/* - Copyright (c) Marshall Clow 2012-2012. - - 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) - - For more information, see http://www.boost.org -*/ - -#include -#include // for std::strchr - -#include - -#define BOOST_TEST_MAIN -#include - -typedef boost::string_ref string_ref; - -void ends_with ( const char *arg ) { - const size_t sz = std::strlen ( arg ); - string_ref sr ( arg ); - string_ref sr2 ( arg ); - const char *p = arg; - - while ( *p ) { - BOOST_CHECK ( sr.ends_with ( p )); - ++p; - } - - while ( !sr2.empty ()) { - BOOST_CHECK ( sr.ends_with ( sr2 )); - sr2.remove_prefix (1); - } - - sr2 = arg; - while ( !sr2.empty ()) { - BOOST_CHECK ( sr.ends_with ( sr2 )); - sr2.remove_prefix (1); - } - - char ch = sz == 0 ? '\0' : arg [ sz - 1 ]; - sr2 = arg; - if ( sz > 0 ) - BOOST_CHECK ( sr2.ends_with ( ch )); - BOOST_CHECK ( !sr2.ends_with ( ++ch )); - BOOST_CHECK ( sr2.ends_with ( string_ref ())); - } - -void starts_with ( const char *arg ) { - const size_t sz = std::strlen ( arg ); - string_ref sr ( arg ); - string_ref sr2 ( arg ); - const char *p = arg + std::strlen ( arg ) - 1; - while ( p >= arg ) { - std::string foo ( arg, p + 1 ); - BOOST_CHECK ( sr.starts_with ( foo )); - --p; - } - - while ( !sr2.empty ()) { - BOOST_CHECK ( sr.starts_with ( sr2 )); - sr2.remove_suffix (1); - } - - char ch = *arg; - sr2 = arg; - if ( sz > 0 ) - BOOST_CHECK ( sr2.starts_with ( ch )); - BOOST_CHECK ( !sr2.starts_with ( ++ch )); - BOOST_CHECK ( sr2.starts_with ( string_ref ())); - } - -void reverse ( const char *arg ) { -// Round trip - string_ref sr1 ( arg ); - std::string string1 ( sr1.rbegin (), sr1.rend ()); - string_ref sr2 ( string1 ); - std::string string2 ( sr2.rbegin (), sr2.rend ()); - - BOOST_CHECK ( std::equal ( sr2.rbegin (), sr2.rend (), arg )); - BOOST_CHECK ( string2 == arg ); - BOOST_CHECK ( std::equal ( sr1.begin (), sr1.end (), string2.begin ())); - } - -// This helper function eliminates signed vs. unsigned warnings -string_ref::size_type ptr_diff ( const char *res, const char *base ) { - BOOST_CHECK ( res >= base ); - return static_cast ( res - base ); - } - -void find ( const char *arg ) { - string_ref sr1; - string_ref sr2; - const char *p; - -// Look for each character in the string(searching from the start) - p = arg; - sr1 = arg; - while ( *p ) { - string_ref::size_type pos = sr1.find(*p); - BOOST_CHECK ( pos != string_ref::npos && ( pos <= ptr_diff ( p, arg ))); - ++p; - } - -// Look for each character in the string (searching from the end) - p = arg; - sr1 = arg; - while ( *p ) { - string_ref::size_type pos = sr1.rfind(*p); - BOOST_CHECK ( pos != string_ref::npos && pos < sr1.size () && ( pos >= ptr_diff ( p, arg ))); - ++p; - } - -// Look for pairs on characters (searching from the start) - sr1 = arg; - p = arg; - while ( *p && *(p+1)) { - string_ref sr3 ( p, 2 ); - string_ref::size_type pos = sr1.find ( sr3 ); - BOOST_CHECK ( pos != string_ref::npos && pos <= static_cast( p - arg )); - p++; - } - - sr1 = arg; - p = arg; -// for all possible chars, see if we find them in the right place. -// Note that strchr will/might do the _wrong_ thing if we search for NULL - for ( int ch = 1; ch < 256; ++ch ) { - string_ref::size_type pos = sr1.find(ch); - const char *strp = std::strchr ( arg, ch ); - BOOST_CHECK (( strp == NULL ) == ( pos == string_ref::npos )); - if ( strp != NULL ) - BOOST_CHECK ( ptr_diff ( strp, arg ) == pos ); - } - - sr1 = arg; - p = arg; -// for all possible chars, see if we find them in the right place. -// Note that strchr will/might do the _wrong_ thing if we search for NULL - for ( int ch = 1; ch < 256; ++ch ) { - string_ref::size_type pos = sr1.rfind(ch); - const char *strp = std::strrchr ( arg, ch ); - BOOST_CHECK (( strp == NULL ) == ( pos == string_ref::npos )); - if ( strp != NULL ) - BOOST_CHECK ( ptr_diff ( strp, arg ) == pos ); - } - - -// Find everything at the start - p = arg; - sr1 = arg; - while ( !sr1.empty ()) { - string_ref::size_type pos = sr1.find(*p); - BOOST_CHECK ( pos == 0 ); - sr1.remove_prefix (1); - ++p; - } - -// Find everything at the end - sr1 = arg; - p = arg + std::strlen ( arg ) - 1; - while ( !sr1.empty ()) { - string_ref::size_type pos = sr1.rfind(*p); - BOOST_CHECK ( pos == sr1.size () - 1 ); - sr1.remove_suffix (1); - --p; - } - -// Find everything at the start - sr1 = arg; - p = arg; - while ( !sr1.empty ()) { - string_ref::size_type pos = sr1.find_first_of(*p); - BOOST_CHECK ( pos == 0 ); - sr1.remove_prefix (1); - ++p; - } - - -// Find everything at the end - sr1 = arg; - p = arg + std::strlen ( arg ) - 1; - while ( !sr1.empty ()) { - string_ref::size_type pos = sr1.find_last_of(*p); - BOOST_CHECK ( pos == sr1.size () - 1 ); - sr1.remove_suffix (1); - --p; - } - -// Basic sanity checking for "find_first_of / find_first_not_of" - sr1 = arg; - sr2 = arg; - while ( !sr1.empty() ) { - BOOST_CHECK ( sr1.find_first_of ( sr2 ) == 0 ); - BOOST_CHECK ( sr1.find_first_not_of ( sr2 ) == string_ref::npos ); - sr1.remove_prefix ( 1 ); - } - - p = arg; - sr1 = arg; - while ( *p ) { - string_ref::size_type pos1 = sr1.find_first_of(*p); - string_ref::size_type pos2 = sr1.find_first_not_of(*p); - BOOST_CHECK ( pos1 != string_ref::npos && pos1 < sr1.size () && pos1 <= ptr_diff ( p, arg )); - if ( pos2 != string_ref::npos ) { - for ( size_t i = 0 ; i < pos2; ++i ) - BOOST_CHECK ( sr1[i] == *p ); - BOOST_CHECK ( sr1 [ pos2 ] != *p ); - } - - BOOST_CHECK ( pos2 != pos1 ); - ++p; - } - -// Basic sanity checking for "find_last_of / find_last_not_of" - sr1 = arg; - sr2 = arg; - while ( !sr1.empty() ) { - BOOST_CHECK ( sr1.find_last_of ( sr2 ) == ( sr1.size () - 1 )); - BOOST_CHECK ( sr1.find_last_not_of ( sr2 ) == string_ref::npos ); - sr1.remove_suffix ( 1 ); - } - - p = arg; - sr1 = arg; - while ( *p ) { - string_ref::size_type pos1 = sr1.find_last_of(*p); - string_ref::size_type pos2 = sr1.find_last_not_of(*p); - BOOST_CHECK ( pos1 != string_ref::npos && pos1 < sr1.size () && pos1 >= ptr_diff ( p, arg )); - BOOST_CHECK ( pos2 == string_ref::npos || pos1 < sr1.size ()); - if ( pos2 != string_ref::npos ) { - for ( size_t i = sr1.size () -1 ; i > pos2; --i ) - BOOST_CHECK ( sr1[i] == *p ); - BOOST_CHECK ( sr1 [ pos2 ] != *p ); - } - - BOOST_CHECK ( pos2 != pos1 ); - ++p; - } - - } - - -void to_string ( const char *arg ) { - string_ref sr1; - std::string str1; - std::string str2; - - str1.assign ( arg ); - sr1 = arg; -// str2 = sr1.to_string > (); - str2 = sr1.to_string (); - BOOST_CHECK ( str1 == str2 ); - -#ifndef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS - std::string str3 = static_cast ( sr1 ); - BOOST_CHECK ( str1 == str3 ); -#endif - } - -void compare ( const char *arg ) { - string_ref sr1; - std::string str1; - std::string str2 = str1; - - str1.assign ( arg ); - sr1 = arg; - BOOST_CHECK ( sr1 == sr1); // compare string_ref and string_ref - BOOST_CHECK ( sr1 == str1); // compare string and string_ref - BOOST_CHECK ( str1 == sr1 ); // compare string_ref and string - BOOST_CHECK ( sr1 == arg ); // compare string_ref and pointer - BOOST_CHECK ( arg == sr1 ); // compare pointer and string_ref - - if ( sr1.size () > 0 ) { - (*str1.rbegin())++; - BOOST_CHECK ( sr1 != str1 ); - BOOST_CHECK ( str1 != sr1 ); - BOOST_CHECK ( sr1 < str1 ); - BOOST_CHECK ( sr1 <= str1 ); - BOOST_CHECK ( str1 > sr1 ); - BOOST_CHECK ( str1 >= sr1 ); - - (*str1.rbegin()) -= 2; - BOOST_CHECK ( sr1 != str1 ); - BOOST_CHECK ( str1 != sr1 ); - BOOST_CHECK ( sr1 > str1 ); - BOOST_CHECK ( sr1 >= str1 ); - BOOST_CHECK ( str1 < sr1 ); - BOOST_CHECK ( str1 <= sr1 ); - } - } - -const char *test_strings [] = { - "", - "0", - "abc", - "AAA", // all the same - "adsfadadiaef;alkdg;aljt;j agl;sjrl;tjs;lga;lretj;srg[w349u5209dsfadfasdfasdfadsf", - "abc\0asdfadsfasf", - NULL - }; - -BOOST_AUTO_TEST_CASE( test_main ) -{ - const char **p = &test_strings[0]; - - while ( *p != NULL ) { - starts_with ( *p ); - ends_with ( *p ); - reverse ( *p ); - find ( *p ); - to_string ( *p ); - compare ( *p ); - - p++; - } -} diff --git a/test/string_ref_test_io.cpp b/test/string_ref_test_io.cpp deleted file mode 100644 index 72f5837..0000000 --- a/test/string_ref_test_io.cpp +++ /dev/null @@ -1,179 +0,0 @@ -/* - * Copyright Andrey Semashev 2013. - * 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) - */ -/*! - * \file string_ref_test_io.cpp - * \author Andrey Semashev - * \date 26.05.2013 - * - * \brief This header contains tests for stream operations of \c basic_string_ref. - */ - -#define BOOST_TEST_MODULE string_ref_test_io - -#include - -#include -#include -#include -#include -#include - -#include -#include -#include - -typedef boost::mpl::vector< - char -#if !defined(BOOST_NO_STD_WSTRING) && !defined(BOOST_NO_STD_WSTREAMBUF) && !defined(BOOST_NO_INTRINSIC_WCHAR_T) - , wchar_t -#endif -/* Current implementations seem to be missing codecvt facets to convert chars to char16_t and char32_t even though the types are available. -#if !defined(BOOST_NO_CXX11_CHAR16_T) - , char16_t -#endif -#if !defined(BOOST_NO_CXX11_CHAR32_T) - , char32_t -#endif -*/ ->::type char_types; - -static const char* test_strings[] = -{ - "begin", - "abcd", - "end" -}; - -//! The context with test data for particular character type -template< typename CharT > -struct context -{ - typedef CharT char_type; - typedef std::basic_string< char_type > string_type; - typedef std::basic_ostringstream< char_type > ostream_type; - - string_type begin, abcd, end; - - context() - { - boost::string_ref str = test_strings[0]; - std::copy(str.begin(), str.end(), std::back_inserter(begin)); - - str = test_strings[1]; - std::copy(str.begin(), str.end(), std::back_inserter(abcd)); - - str = test_strings[2]; - std::copy(str.begin(), str.end(), std::back_inserter(end)); - } -}; - -// Test regular output -BOOST_AUTO_TEST_CASE_TEMPLATE(string_ref_output, CharT, char_types) -{ - typedef CharT char_type; - typedef std::basic_ostringstream< char_type > ostream_type; - typedef boost::basic_string_ref< char_type > string_ref_type; - - context< char_type > ctx; - - ostream_type strm; - strm << string_ref_type(ctx.abcd); - BOOST_CHECK(strm.str() == ctx.abcd); -} - -// Test support for padding -BOOST_AUTO_TEST_CASE_TEMPLATE(padding, CharT, char_types) -{ - typedef CharT char_type; - typedef std::basic_ostringstream< char_type > ostream_type; - typedef boost::basic_string_ref< char_type > string_ref_type; - - context< char_type > ctx; - - // Test for padding - { - ostream_type strm_ref; - strm_ref << ctx.begin << std::setw(8) << string_ref_type(ctx.abcd) << ctx.end; - - ostream_type strm_correct; - strm_correct << ctx.begin << std::setw(8) << ctx.abcd << ctx.end; - - BOOST_CHECK(strm_ref.str() == strm_correct.str()); - } - - // Test for long padding - { - ostream_type strm_ref; - strm_ref << ctx.begin << std::setw(100) << string_ref_type(ctx.abcd) << ctx.end; - - ostream_type strm_correct; - strm_correct << ctx.begin << std::setw(100) << ctx.abcd << ctx.end; - - BOOST_CHECK(strm_ref.str() == strm_correct.str()); - } - - // Test that short width does not truncate the string - { - ostream_type strm_ref; - strm_ref << ctx.begin << std::setw(1) << string_ref_type(ctx.abcd) << ctx.end; - - ostream_type strm_correct; - strm_correct << ctx.begin << std::setw(1) << ctx.abcd << ctx.end; - - BOOST_CHECK(strm_ref.str() == strm_correct.str()); - } -} - -// Test support for padding fill -BOOST_AUTO_TEST_CASE_TEMPLATE(padding_fill, CharT, char_types) -{ - typedef CharT char_type; - typedef std::basic_ostringstream< char_type > ostream_type; - typedef boost::basic_string_ref< char_type > string_ref_type; - - context< char_type > ctx; - - ostream_type strm_ref; - strm_ref << ctx.begin << std::setfill(static_cast< char_type >('x')) << std::setw(8) << string_ref_type(ctx.abcd) << ctx.end; - - ostream_type strm_correct; - strm_correct << ctx.begin << std::setfill(static_cast< char_type >('x')) << std::setw(8) << ctx.abcd << ctx.end; - - BOOST_CHECK(strm_ref.str() == strm_correct.str()); -} - -// Test support for alignment -BOOST_AUTO_TEST_CASE_TEMPLATE(alignment, CharT, char_types) -{ - typedef CharT char_type; - typedef std::basic_ostringstream< char_type > ostream_type; - typedef boost::basic_string_ref< char_type > string_ref_type; - - context< char_type > ctx; - - // Left alignment - { - ostream_type strm_ref; - strm_ref << ctx.begin << std::left << std::setw(8) << string_ref_type(ctx.abcd) << ctx.end; - - ostream_type strm_correct; - strm_correct << ctx.begin << std::left << std::setw(8) << ctx.abcd << ctx.end; - - BOOST_CHECK(strm_ref.str() == strm_correct.str()); - } - - // Right alignment - { - ostream_type strm_ref; - strm_ref << ctx.begin << std::right << std::setw(8) << string_ref_type(ctx.abcd) << ctx.end; - - ostream_type strm_correct; - strm_correct << ctx.begin << std::right << std::setw(8) << ctx.abcd << ctx.end; - - BOOST_CHECK(strm_ref.str() == strm_correct.str()); - } -}