From 1449d2b61955db9d0ebb232e6ca4e3694fc2345d Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sat, 18 May 2002 22:52:51 +0200 Subject: [PATCH] basic_string.h (replace(i1, i2, _CharT* k1, _CharT* k2), [...]): New specializations to optimize for the common cases of pointers and iterators. 2002-05-18 Paolo Carlini Nathan Myers Philip Martin * include/bits/basic_string.h (replace(i1, i2, _CharT* k1, _CharT* k2), replace(i2, i2, const _CharT* k1, const _CharT* k2), replace(i1, i2, iterator k1, iterator k2, replace(i1, i2, const_iterator k1, const_iterator k2): New specializations to optimize for the common cases of pointers and iterators. (replace(pos, n1, s, n2)): Tweak. * include/bits/basic_string.tcc: Tweak comments. * testsuite/21_strings/replace.cc (test05): New tests. Co-Authored-By: Nathan Myers Co-Authored-By: Philip Martin From-SVN: r53595 --- libstdc++-v3/ChangeLog | 15 ++++++++ libstdc++-v3/include/bits/basic_string.h | 31 ++++++++++++++-- libstdc++-v3/include/bits/basic_string.tcc | 15 +++----- libstdc++-v3/testsuite/21_strings/replace.cc | 38 ++++++++++++++++++++ 4 files changed, 87 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 21f58fdb6e02..0dc6e6dd8584 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,18 @@ +2002-05-18 Paolo Carlini + Nathan Myers + Philip Martin + + * include/bits/basic_string.h + (replace(i1, i2, _CharT* k1, _CharT* k2), + replace(i2, i2, const _CharT* k1, const _CharT* k2), + replace(i1, i2, iterator k1, iterator k2, + replace(i1, i2, const_iterator k1, const_iterator k2): + New specializations to optimize for the common cases of + pointers and iterators. + (replace(pos, n1, s, n2)): Tweak. + * include/bits/basic_string.tcc: Tweak comments. + * testsuite/21_strings/replace.cc (test05): New tests. + 2002-05-18 Benjamin Kosnik * config/os/solaris/solaris2.5/bits/os_defines.h: Remove diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index e05a1c6ef614..a9c02ce37089 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -650,8 +650,11 @@ namespace std || less()(_M_data() + __size, __s)) return _M_replace_safe(_M_ibegin() + __pos, _M_ibegin() + __pos + __foldn1, __s, __s + __n2); - else return this->replace(_M_check(__pos), _M_fold(__pos, __n1), - __s, __s + __n2); + // Todo: optimized in-place replace. + else return + _M_replace(_M_ibegin() + __pos, _M_ibegin() + __pos + __foldn1, + __s, __s + __n2, + typename iterator_traits::iterator_category()); } basic_string& @@ -685,6 +688,30 @@ namespace std { return _M_replace(__i1, __i2, __k1, __k2, typename iterator_traits<_InputIterator>::iterator_category()); } + // Specializations for the common case of pointer and iterator: + // useful to avoid the overhead of temporary buffering in _M_replace. + basic_string& + replace(iterator __i1, iterator __i2, _CharT* __k1, _CharT* __k2) + { return this->replace(__i1 - _M_ibegin(), __i2 - __i1, + __k1, __k2 - __k1); } + + basic_string& + replace(iterator __i1, iterator __i2, const _CharT* __k1, const _CharT* __k2) + { return this->replace(__i1 - _M_ibegin(), __i2 - __i1, + __k1, __k2 - __k1); } + + basic_string& + replace(iterator __i1, iterator __i2, iterator __k1, iterator __k2) + { return this->replace(__i1 - _M_ibegin(), __i2 - __i1, + __k1.base(), __k2 - __k1); + } + + basic_string& + replace(iterator __i1, iterator __i2, const_iterator __k1, const_iterator __k2) + { return this->replace(__i1 - _M_ibegin(), __i2 - __i1, + __k1.base(), __k2 - __k1); + } + private: template basic_string& diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index 35a2f11f7e76..9a6ce501b000 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -498,13 +498,10 @@ namespace std // else nothing (in particular, avoid calling _M_mutate() unnecessarily.) } - // This is the general replace helper, which gets instantiated both - // for input-iterators and forward-iterators. It buffers internally and - // then calls _M_replace_safe. For input-iterators this is almost the - // best we can do, but for forward-iterators many optimizations could be - // conceived: f.i., when source and destination ranges do not overlap - // buffering is not really needed. In order to easily implement them, it - // could become useful to add an _M_replace(forward_iterator_tag) + + // This is the general replace helper, which currently gets instantiated both + // for input iterators and reverse iterators. It buffers internally and then + // calls _M_replace_safe. template template basic_string<_CharT, _Traits, _Alloc>& @@ -518,10 +515,8 @@ namespace std } // This is a special replace helper, which does not buffer internally - // and can be used in the "safe" situations involving forward-iterators, + // and can be used in "safe" situations involving forward iterators, // i.e., when source and destination ranges are known to not overlap. - // Presently, is called by _M_replace, by the various append and by - // the assigns. template template basic_string<_CharT, _Traits, _Alloc>& diff --git a/libstdc++-v3/testsuite/21_strings/replace.cc b/libstdc++-v3/testsuite/21_strings/replace.cc index 5d1bbf9f621b..944301937c57 100644 --- a/libstdc++-v3/testsuite/21_strings/replace.cc +++ b/libstdc++-v3/testsuite/21_strings/replace.cc @@ -154,11 +154,49 @@ test04() VERIFY(str01 == "cyd"); } +// Some more tests for +// template +// string& replace(iterator it1, iterator it2, InputIter j1, InputIter j2) +void +test05() +{ + bool test = true; + std::string str01 = "geogaddi"; + std::string str02; + + typedef std::string::iterator iterator; + typedef std::string::const_iterator const_iterator; + + iterator it1 = str01.begin(); + iterator it2 = str01.end(); + str02.replace(str02.begin(), str02.end(), it1, it2); + VERIFY(str02 == "geogaddi"); + + str02 = "boards"; + const_iterator c_it1 = str01.begin(); + const_iterator c_it2 = str01.end(); + str02.replace(str02.begin(), str02.end(), c_it1, c_it2); + VERIFY(str02 == "geogaddi"); + + str02 = "boards"; + const char* c_ptr1 = str01.c_str(); + const char* c_ptr2 = str01.c_str() + 8; + str02.replace(str02.begin(), str02.end(), c_ptr1, c_ptr2); + VERIFY(str02 == "geogaddi"); + + str02 = "boards"; + char* ptr1 = &*str01.begin(); + char* ptr2 = &*str01.end(); + str02.replace(str02.begin(), str02.end(), ptr1, ptr2); + VERIFY(str02 == "geogaddi"); +} + int main() { test01(); test02(); test03(); test04(); + test05(); return 0; } -- 2.47.2