Author: sebor
Date: Mon Sep 24 15:34:51 2007
New Revision: 579001
URL: http://svn.apache.org/viewvc?rev=579001&view=rev
Log:
2007-09-24 Travis Vitek <[EMAIL PROTECTED]>
STDCXX-492
* string (operator+=): Replace call to append with push_back
for performance.
(append): Avoid calling replace() from append if there is
sufficient buffer space available for performance.
(append): Simplify append overload, move it to header and then
inline it.
(append): Use _RWSTD_SIZE_T to avoid integer overflow problems
that could lead to heap corruption.
(push_back): Call replace() instead of append when buffer
reallocation required. cleanup. avoid integer overflow problem.
* string.cc (append): Moved append overload to header and make
it inline.
Modified:
incubator/stdcxx/trunk/include/string
incubator/stdcxx/trunk/include/string.cc
Modified: incubator/stdcxx/trunk/include/string
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/string?rev=579001&r1=579000&r2=579001&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/string (original)
+++ incubator/stdcxx/trunk/include/string Mon Sep 24 15:34:51 2007
@@ -289,7 +289,7 @@
}
basic_string& operator+= (value_type __c) {
- return append (size_type (1), __c);
+ return push_back (__c), *this;
}
basic_string& append (const basic_string&, size_type, size_type);
@@ -323,21 +323,18 @@
basic_string& append (size_type __n, value_type __c, int) {
// unnamed arg is used for overload resolution
- return replace (size (), size_type (), __n, __c);
+ return append (__n, __c);
}
#else // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
basic_string& append (const_pointer __first, const_pointer __last) {
- replace (size (), size_type (), __first, __last - __first);
- return *this;
+ return append (__first, __last - __first);
}
#endif // _RWSTD_NO_MEMBER_TEMPLATES
- basic_string& append (size_type __n, value_type __c) {
- return replace (size (), size_type (), __n, __c);
- }
+ basic_string& append (size_type, value_type);
// lwg issue 7
void push_back (value_type);
@@ -1085,19 +1082,21 @@
template <class _CharT, class _Traits , class _Allocator>
-inline void basic_string<_CharT, _Traits, _Allocator>::
+inline void
+basic_string<_CharT, _Traits, _Allocator>::
push_back (value_type __c)
{
- const size_type __size = size () + 1;
+ const size_type __size0 = size ();
+ const _RWSTD_SIZE_T __size1 = __size0 + 1;
- if ( capacity () < __size
- || size_type (1) < size_type (_C_pref ()->_C_get_ref ()))
- append (1, __c);
+ if ( capacity () < __size1
+ || size_type (1) < size_type (_C_pref ()->_C_get_ref ())) {
+ replace (size (), size_type (), 1, __c);
+ }
else {
- traits_type::assign (_C_data [size ()], __c);
- // append the terminating NUL character
- traits_type::assign (_C_data [__size], value_type ());
- _C_pref ()->_C_size._C_size = __size;
+ traits_type::assign (_C_data [__size0], __c);
+ traits_type::assign (_C_data [__size1], value_type ());
+ _C_pref ()->_C_size._C_size = __size1;
}
}
@@ -1194,17 +1193,55 @@
template <class _CharT, class _Traits, class _Allocator>
inline basic_string<_CharT, _Traits, _Allocator>&
basic_string<_CharT, _Traits, _Allocator>::
+append (const basic_string &__str, size_type __pos, size_type __n)
+{
+ _RWSTD_REQUIRES (__pos <= __str.size (),
+ (_RWSTD_ERROR_OUT_OF_RANGE,
+ _RWSTD_FUNC ("basic_string::append(const basic_string&,"
+ " size_type, size_type)"),
+ __pos, __str.size ()));
+
+ const size_type __rlen = _C_min (__str.size() - __pos, __n);
+
+ return append (__str.data () + __pos, __rlen);
+}
+
+
+template <class _CharT, class _Traits, class _Allocator>
+inline basic_string<_CharT, _Traits, _Allocator>&
+basic_string<_CharT, _Traits, _Allocator>::
append (const_pointer __s, size_type __n)
{
- const size_type __newsize = size () + __n;
+ const size_type __size0 = size ();
+ const _RWSTD_SIZE_T __size1 = __size0 + __n;
- if ( capacity () <= __newsize
+ if ( capacity () <= __size1
|| size_type (1) < size_type (_C_pref ()->_C_get_ref ()))
return replace (size (), size_type (), __s, __n);
- traits_type::copy (_C_data + size (), __s, __n);
- traits_type::assign (_C_data [__newsize], value_type ());
- _C_pref ()->_C_size._C_size = __newsize;
+ traits_type::copy (_C_data + __size0, __s, __n);
+ traits_type::assign (_C_data [__size1], value_type ());
+ _C_pref ()->_C_size._C_size = __size1;
+
+ return *this;
+}
+
+
+template <class _CharT, class _Traits, class _Allocator>
+inline basic_string<_CharT, _Traits, _Allocator>&
+basic_string<_CharT, _Traits, _Allocator>::
+append (size_type __n, value_type __c)
+{
+ const size_type __size0 = size ();
+ const _RWSTD_SIZE_T __size1 = __size0 + __n;
+
+ if ( capacity () < __size1
+ || size_type (1) < size_type (_C_pref ()->_C_get_ref ()))
+ return replace (size (), size_type (), __n, __c);
+
+ traits_type::assign (_C_data + __size0, __n, __c);
+ traits_type::assign (_C_data [__size1], value_type ());
+ _C_pref ()->_C_size._C_size = __size1;
return *this;
}
Modified: incubator/stdcxx/trunk/include/string.cc
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/string.cc?rev=579001&r1=579000&r2=579001&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/string.cc (original)
+++ incubator/stdcxx/trunk/include/string.cc Mon Sep 24 15:34:51 2007
@@ -241,34 +241,6 @@
template <class _CharT, class _Traits, class _Allocator>
basic_string<_CharT, _Traits, _Allocator>&
basic_string<_CharT, _Traits, _Allocator>::
-append (const basic_string &__str, size_type __pos, size_type __n)
-{
- _RWSTD_REQUIRES (__pos <= __str.size (),
- (_RWSTD_ERROR_OUT_OF_RANGE,
- _RWSTD_FUNC ("basic_string::append(const basic_string&,"
- " size_type, size_type)"),
- __pos, __str.size ()));
-
- if (__n > __str.size () - __pos)
- __n = __str.size () - __pos;
-
- const size_type __rlen = _C_min (__str.size() - __pos, __n);
-
- _RWSTD_REQUIRES (size () <= max_size () - __rlen,
- (_RWSTD_ERROR_LENGTH_ERROR,
- _RWSTD_FUNC ("basic_string::append(const basic_string&,"
- " size_type, size_type)"),
- size (), max_size () - __rlen));
-
- replace (size (), size_type (), __str.c_str () + __pos, __n);
-
- return *this;
-}
-
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::
assign (const basic_string &__str, size_type __pos, size_type __n)
{
_RWSTD_REQUIRES (__pos <= __str.size (),
