This is the mail archive of the
libstdc++@sourceware.cygnus.com
mailing list for the libstdc++ project.
basic_string<>::_M_mutate - updated patch
- To: Benjamin Kosnik <bkoz@cygnus.com>
- Subject: basic_string<>::_M_mutate - updated patch
- From: Ryszard Kabatek <rysio@rumcajs.chemie.uni-halle.de>
- Date: Tue, 29 Jun 1999 13:46:04 +0200 (CEST)
- cc: libstdc++@sourceware.cygnus.com
- Reply-To: Ryszard Kabatek <kabatek@chemie.uni-halle.de>
Here is the updated patch for _M_mutate.
The new interface of _M_mutate is:
_M_mutate(size_type __pos, // at this position starts the change
size_type __len1, // the amount of characters to be replaced
size_type __len2) // with this amount of characters
The attachment contains the patch.
1999-06-29 Ryszard Kabatek <kabatek@chemie.uni-halle.de>
* bits/string.tcc: New implementation and interface of _M_mutate.
Adapt the change in all functions that call _M_mutate.
* bits/basic_string.h:
And here.
BTW. My patch with the specializations of the template member function
basic_string<>::_S_copy_chars for _CharT*, iterator and const_iterator,
that I sent some weeks ago, is still not installed.
Ryszard Kabatek
Martin-Luther University Halle-Wittenberg, Department of Physical Chemistry
Geusaer Str. 88, 06217 Merseburg, Germany
Tel. +49 3461 46 2487 (2466) Fax. +49 3461 46 2129
Index: bits/basic_string.h
===================================================================
RCS file: /cvs/libstdc++/libstdc++/bits/basic_string.h,v
retrieving revision 1.39
diff -c -2 -p -r1.39 basic_string.h
*** basic_string.h 1999/06/28 23:52:47 1.39
--- basic_string.h 1999/06/29 11:32:15
*************** namespace std {
*** 274,278 ****
void
! _M_mutate(size_type __nsize, size_type __keep, size_type __keep_end);
void
--- 274,278 ----
void
! _M_mutate(size_type __pos, size_type __len1, size_type __len2);
void
*************** namespace std {
*** 390,394 ****
void
! clear() { _M_mutate(0, 0, 0); }
bool
--- 390,394 ----
void
! clear() { _M_mutate(0, this->size(), 0); }
bool
Index: bits/string.tcc
===================================================================
RCS file: /cvs/libstdc++/libstdc++/bits/string.tcc,v
retrieving revision 1.43
diff -c -2 -p -r1.43 string.tcc
*** string.tcc 1999/06/28 23:52:49 1.43
--- string.tcc 1999/06/29 11:32:16
*************** namespace std
*** 242,246 ****
{
if (_M_rep()->_M_state > 0)
! _M_mutate(this->size(), this->size(), 0);
_M_rep()->_M_state = -1;
}
--- 242,246 ----
{
if (_M_rep()->_M_state > 0)
! _M_mutate(0, 0, 0);
_M_rep()->_M_state = -1;
}
*************** namespace std
*** 249,283 ****
void
basic_string<_CharT, _Traits, _Alloc>::
! _M_mutate(size_type __nsize, size_type __keep, size_type __keep_end)
{
! size_type __old_size = this->size();
! if (_M_rep()->_M_state <= 0 && __nsize <= __old_size)
! {
! // Work in-place
! _M_rep()->_M_state = 0;
! if (__keep_end && __nsize < __old_size)
! traits_type::move(_M_data() + __nsize - __keep_end,
! _M_data() + __old_size - __keep_end, __keep_end);
! }
! else
! {
! _Rep* __r = _Rep::_S_create(__nsize, get_allocator());
! try {
! if (__keep)
! traits_type::copy(__r->_M_refdata(), _M_data(), __keep);
! if (__keep_end)
! traits_type::copy(__r->_M_refdata() + __nsize - __keep_end,
! _M_data() + __old_size - __keep_end,
! __keep_end);
! }
! catch (...) {
! __r->_M_dispose(get_allocator());
! throw;
! }
! _M_rep()->_M_dispose(get_allocator());
! _M_data(__r->_M_refdata());
! }
! _M_rep()->_M_length = __nsize;
! (_M_data())[__nsize] = _CharT(); // grrr. (per 21.3.4)
// (you cannot leave those LWG people alone for a second.)
}
--- 249,286 ----
void
basic_string<_CharT, _Traits, _Alloc>::
! _M_mutate(size_type __pos, size_type __len1, size_type __len2)
{
! size_type __old_size = this->size();
! const size_type __new_size = __old_size + __len2 - __len1;
! const _CharT* __src = _M_data() + __pos + __len1;
! const size_type __how_much = __old_size - __pos - __len1;
!
! if (_M_rep()->_M_state > 0 || __new_size > capacity())
! // must reallocate
! {
! allocator_type __a = get_allocator();
! _Rep* __r = _Rep::_S_create(__new_size, __a);
! try {
! if (__pos)
! traits_type::copy(__r->_M_refdata(), _M_data(), __pos);
! if (__how_much)
! traits_type::copy(__r->_M_refdata() + __pos + __len2,
! __src, __how_much);
! }
! catch (...) {
! __r->_M_dispose(get_allocator());
! throw;
! }
! _M_rep()->_M_dispose(__a);
! _M_data(__r->_M_refdata());
! }
! else if (__how_much)
! {
! // Work in-place
! _M_rep()->_M_state = 0;
! traits_type::move(_M_data() + __pos + __len2, __src, __how_much);
! }
! _M_rep()->_M_length = __new_size;
! _M_data()[__new_size] = _CharT(); // grrr. (per 21.3.4)
// (you cannot leave those LWG people alone for a second.)
}
*************** namespace std
*** 288,292 ****
{
if (__res_arg > this->capacity())
! _M_mutate(__res_arg, this->size(), 0);
}
--- 291,299 ----
{
if (__res_arg > this->capacity())
! {
! size_type __old_size = this->size();
! _M_mutate(__old_size, 0, __res_arg - __old_size);
! _M_rep()->_M_length = __old_size;
! }
}
*************** namespace std
*** 424,430 ****
size_type __dist_max = this->max_size();
__LENGTHERROR(__dist_max <= size_type(__dist_new));
- size_type __newlen = (this->size() - __dist_old) + __dist_new;
size_type __off = __i1 - _M_ibegin();
! _M_mutate(__newlen, __off, _M_iend() - __i2);
// Invalidated __i1, __i2
if (__dist_new)
--- 431,436 ----
size_type __dist_max = this->max_size();
__LENGTHERROR(__dist_max <= size_type(__dist_new));
size_type __off = __i1 - _M_ibegin();
! _M_mutate(__off, __dist_old, __dist_new);
// Invalidated __i1, __i2
if (__dist_new)
*************** namespace std
*** 453,458 ****
size_type __off1 = __i1 - _M_ibegin();
__LENGTHERROR(max_size() - (this->size() - __n1) <= __n2);
! size_type __newlen = (this->size() - __n1) + __n2;
! _M_mutate (__newlen, __off1, _M_iend() - __i2);
// Invalidated __i1, __i2
if (__n2)
--- 459,463 ----
size_type __off1 = __i1 - _M_ibegin();
__LENGTHERROR(max_size() - (this->size() - __n1) <= __n2);
! _M_mutate (__off1, __n1, __n2);
// Invalidated __i1, __i2
if (__n2)