_S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a,
input_iterator_tag)
{
+#ifndef _GLIBCXX_FULLY_DYNAMIC_STRING
if (__beg == __end && __a == _Alloc())
return _S_empty_rep()._M_refdata();
+#endif
// Avoid reallocation for common case.
- _CharT __buf[100];
+ _CharT __buf[128];
size_type __len = 0;
while (__beg != __end && __len < sizeof(__buf) / sizeof(_CharT))
{
++__beg;
}
_Rep* __r = _Rep::_S_create(__len, size_type(0), __a);
- traits_type::copy(__r->_M_refdata(), __buf, __len);
+ _M_copy(__r->_M_refdata(), __buf, __len);
try
{
while (__beg != __end)
{
// Allocate more space.
_Rep* __another = _Rep::_S_create(__len + 1, __len, __a);
- traits_type::copy(__another->_M_refdata(),
- __r->_M_refdata(), __len);
+ _M_copy(__another->_M_refdata(), __r->_M_refdata(), __len);
__r->_M_destroy(__a);
__r = __another;
}
__r->_M_destroy(__a);
__throw_exception_again;
}
- __r->_M_length = __len;
- __r->_M_refdata()[__len] = _Rep::_S_terminal; // grrr.
+ __r->_M_set_length_and_sharable(__len);
return __r->_M_refdata();
}
_S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a,
forward_iterator_tag)
{
+#ifndef _GLIBCXX_FULLY_DYNAMIC_STRING
if (__beg == __end && __a == _Alloc())
return _S_empty_rep()._M_refdata();
-
+#endif
// NB: Not required, but considered best practice.
- if (__builtin_expect(__is_null_pointer(__beg), 0))
+ if (__builtin_expect(__is_null_pointer(__beg) && __beg != __end, 0))
__throw_logic_error(__N("basic_string::_S_construct NULL not valid"));
const size_type __dnew = static_cast<size_type>(std::distance(__beg,
__r->_M_destroy(__a);
__throw_exception_again;
}
- __r->_M_length = __dnew;
- __r->_M_refdata()[__dnew] = _Rep::_S_terminal; // grrr.
+ __r->_M_set_length_and_sharable(__dnew);
return __r->_M_refdata();
}
basic_string<_CharT, _Traits, _Alloc>::
_S_construct(size_type __n, _CharT __c, const _Alloc& __a)
{
+#ifndef _GLIBCXX_FULLY_DYNAMIC_STRING
if (__n == 0 && __a == _Alloc())
return _S_empty_rep()._M_refdata();
-
+#endif
// Check for out_of_range and length_error exceptions.
_Rep* __r = _Rep::_S_create(__n, size_type(0), __a);
if (__n)
- traits_type::assign(__r->_M_refdata(), __n, __c);
+ _M_assign(__r->_M_refdata(), __n, __c);
- __r->_M_length = __n;
- __r->_M_refdata()[__n] = _Rep::_S_terminal; // grrr
+ __r->_M_set_length_and_sharable(__n);
return __r->_M_refdata();
}
template<typename _CharT, typename _Traits, typename _Alloc>
basic_string<_CharT, _Traits, _Alloc>::
basic_string(const basic_string& __str)
- : _M_dataplus(__str._M_rep()->_M_grab(_Alloc(), __str.get_allocator()),
- __str.get_allocator())
+ : _M_dataplus(__str._M_rep()->_M_grab(_Alloc(__str.get_allocator()),
+ __str.get_allocator()),
+ __str.get_allocator())
{ }
template<typename _CharT, typename _Traits, typename _Alloc>
template<typename _CharT, typename _Traits, typename _Alloc>
basic_string<_CharT, _Traits, _Alloc>&
basic_string<_CharT, _Traits, _Alloc>::
- assign(const basic_string& __str)
+ assign(const _CharT* __s, size_type __n)
{
- if (_M_rep() != __str._M_rep())
+ __glibcxx_requires_string_len(__s, __n);
+ _M_check_length(this->size(), __n, "basic_string::assign");
+ if (_M_rep()->_M_is_safe(_M_data(), __s) || _M_rep()->_M_is_shared())
+ return _M_replace_safe(size_type(0), this->size(), __s, __n);
+ else
{
- // XXX MT
- const allocator_type __a = this->get_allocator();
- _CharT* __tmp = __str._M_rep()->_M_grab(__a, __str.get_allocator());
- _M_rep()->_M_dispose(__a);
- _M_data(__tmp);
+ // Work in-place.
+ const size_type __pos = __s - _M_data();
+ if (__pos >= __n)
+ traits_type::copy(_M_data(), __s, __n);
+ else if (__pos)
+ traits_type::move(_M_data(), __s, __n);
+ _M_rep()->_M_set_length_and_sharable(__n);
+ return *this;
+ }
+ }
+
+ template<typename _CharT, typename _Traits, typename _Alloc>
+ basic_string<_CharT, _Traits, _Alloc>&
+ basic_string<_CharT, _Traits, _Alloc>::
+ append(const _CharT* __s, size_type __n)
+ {
+ __glibcxx_requires_string_len(__s, __n);
+ if (__n)
+ {
+ _M_check_length(size_type(0), __n, "basic_string::append");
+ const size_type __len = __n + this->size();
+ if (__len > this->capacity() || _M_rep()->_M_is_shared())
+ {
+ if (_M_rep()->_M_is_safe(_M_data(), __s))
+ this->reserve(__len);
+ else
+ {
+ const size_type __off = __s - _M_data();
+ this->reserve(__len);
+ __s = _M_data() + __off;
+ }
+ }
+ _M_copy(_M_data() + this->size(), __s, __n);
+ _M_rep()->_M_set_length_and_sharable(__len);
}
return *this;
}
- template<typename _CharT, typename _Traits, typename _Alloc>
- basic_string<_CharT, _Traits, _Alloc>&
- basic_string<_CharT, _Traits, _Alloc>::
- assign(const _CharT* __s, size_type __n)
- {
- __glibcxx_requires_string_len(__s, __n);
- if (__n > this->max_size())
- __throw_length_error(__N("basic_string::assign"));
- if (_M_rep()->_M_is_shared() || less<const _CharT*>()(__s, _M_data())
- || less<const _CharT*>()(_M_data() + this->size(), __s))
- return _M_replace_safe(size_type(0), this->size(), __s, __n);
- else
- {
- // Work in-place
- const size_type __pos = __s - _M_data();
- if (__pos >= __n)
- traits_type::copy(_M_data(), __s, __n);
- else if (__pos)
- traits_type::move(_M_data(), __s, __n);
- _M_rep()->_M_set_sharable();
- _M_rep()->_M_length = __n;
- _M_data()[__n] = _Rep::_S_terminal; // grr.
- return *this;
- }
- }
+ template<typename _CharT, typename _Traits, typename _Alloc>
+ basic_string<_CharT, _Traits, _Alloc>&
+ basic_string<_CharT, _Traits, _Alloc>::
+ append(const basic_string& __str, size_type __pos, size_type __n)
+ {
+ __str._M_check(__pos, "basic_string::append");
+ __n = __str._M_limit(__pos, __n);
+ if (__n)
+ {
+ const size_type __len = __n + this->size();
+ if (__len > this->capacity() || _M_rep()->_M_is_shared())
+ this->reserve(__len);
+ _M_copy(_M_data() + this->size(), __str._M_data() + __pos, __n);
+ _M_rep()->_M_set_length_and_sharable(__len);
+ }
+ return *this;
+ }
template<typename _CharT, typename _Traits, typename _Alloc>
basic_string<_CharT, _Traits, _Alloc>&
{
__glibcxx_requires_string_len(__s, __n);
_M_check(__pos, "basic_string::insert");
- if (this->max_size() - this->size() < __n)
- __throw_length_error(__N("basic_string::insert"));
- if (_M_rep()->_M_is_shared() || less<const _CharT*>()(__s, _M_data())
- || less<const _CharT*>()(_M_data() + this->size(), __s))
+ _M_check_length(size_type(0), __n, "basic_string::insert");
+ if (_M_rep()->_M_is_safe(_M_data(), __s) || _M_rep()->_M_is_shared())
return _M_replace_safe(__pos, size_type(0), __s, __n);
else
{
- // Work in-place. If _M_mutate reallocates the string, __s
- // does not point anymore to valid data, therefore we save its
- // offset, then we restore it.
+ // Work in-place.
const size_type __off = __s - _M_data();
_M_mutate(__pos, 0, __n);
__s = _M_data() + __off;
_CharT* __p = _M_data() + __pos;
if (__s + __n <= __p)
- traits_type::copy(__p, __s, __n);
+ _M_copy(__p, __s, __n);
else if (__s >= __p)
- traits_type::copy(__p, __s + __n, __n);
+ _M_copy(__p, __s + __n, __n);
else
{
const size_type __nleft = __p - __s;
- traits_type::copy(__p, __s, __nleft);
- traits_type::copy(__p + __nleft, __p + __n, __n - __nleft);
+ _M_copy(__p, __s, __nleft);
+ _M_copy(__p + __nleft, __p + __n, __n - __nleft);
}
return *this;
}
__glibcxx_requires_string_len(__s, __n2);
_M_check(__pos, "basic_string::replace");
__n1 = _M_limit(__pos, __n1);
- if (this->max_size() - (this->size() - __n1) < __n2)
- __throw_length_error(__N("basic_string::replace"));
+ _M_check_length(__n1, __n2, "basic_string::replace");
bool __left;
- if (_M_rep()->_M_is_shared() || less<const _CharT*>()(__s, _M_data())
- || less<const _CharT*>()(_M_data() + this->size(), __s))
+ if (_M_rep()->_M_is_safe(_M_data(), __s) || _M_rep()->_M_is_shared())
return _M_replace_safe(__pos, __n1, __s, __n2);
else if ((__left = __s + __n2 <= _M_data() + __pos)
|| _M_data() + __pos + __n1 <= __s)
{
// Work in-place: non-overlapping case.
- const size_type __off = __s - _M_data();
+ size_type __off = __s - _M_data();
+ __left ? __off : (__off += __n2 - __n1);
_M_mutate(__pos, __n1, __n2);
- if (__left)
- traits_type::copy(_M_data() + __pos,
- _M_data() + __off, __n2);
- else
- traits_type::copy(_M_data() + __pos,
- _M_data() + __off + __n2 - __n1, __n2);
+ _M_copy(_M_data() + __pos, _M_data() + __off, __n2);
return *this;
}
else
basic_string<_CharT, _Traits, _Alloc>::_Rep::
_M_destroy(const _Alloc& __a) throw ()
{
+#ifndef _GLIBCXX_FULLY_DYNAMIC_STRING
if (this == &_S_empty_rep())
- return;
+ return;
+#endif
const size_type __size = sizeof(_Rep_base) +
(this->_M_capacity + 1) * sizeof(_CharT);
_Raw_bytes_alloc(__a).deallocate(reinterpret_cast<char*>(this), __size);
template<typename _CharT, typename _Traits, typename _Alloc>
void
- basic_string<_CharT, _Traits, _Alloc>::_M_leak_hard()
+ basic_string<_CharT, _Traits, _Alloc>::
+ _M_leak_hard()
{
+#ifndef _GLIBCXX_FULLY_DYNAMIC_STRING
if (_M_rep() == &_S_empty_rep())
- return;
+ return;
+#endif
if (_M_rep()->_M_is_shared())
_M_mutate(0, 0, 0);
_M_rep()->_M_set_leaked();
{
const 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() == &_S_empty_rep()
- || _M_rep()->_M_is_shared() || __new_size > capacity())
+ if (__new_size > this->capacity() || _M_rep()->_M_is_shared())
{
// Must reallocate.
const allocator_type __a = get_allocator();
- _Rep* __r = _Rep::_S_create(__new_size, capacity(), __a);
+ _Rep* __r = _Rep::_S_create(__new_size, this->capacity(), __a);
if (__pos)
- traits_type::copy(__r->_M_refdata(), _M_data(), __pos);
+ _M_copy(__r->_M_refdata(), _M_data(), __pos);
if (__how_much)
- traits_type::copy(__r->_M_refdata() + __pos + __len2,
- __src, __how_much);
+ _M_copy(__r->_M_refdata() + __pos + __len2,
+ _M_data() + __pos + __len1, __how_much);
_M_rep()->_M_dispose(__a);
_M_data(__r->_M_refdata());
}
else if (__how_much && __len1 != __len2)
{
- // Work in-place
- traits_type::move(_M_data() + __pos + __len2, __src, __how_much);
+ // Work in-place.
+ _M_move(_M_data() + __pos + __len2,
+ _M_data() + __pos + __len1, __how_much);
}
- _M_rep()->_M_set_sharable();
- _M_rep()->_M_length = __new_size;
- _M_data()[__new_size] = _Rep::_S_terminal; // grrr. (per 21.3.4)
- // You cannot leave those LWG people alone for a second.
+ _M_rep()->_M_set_length_and_sharable(__new_size);
}
template<typename _CharT, typename _Traits, typename _Alloc>
void
- basic_string<_CharT, _Traits, _Alloc>::reserve(size_type __res)
+ basic_string<_CharT, _Traits, _Alloc>::
+ reserve(size_type __res)
{
if (__res != this->capacity() || _M_rep()->_M_is_shared())
{
- if (__res > this->max_size())
- __throw_length_error(__N("basic_string::reserve"));
// Make sure we don't shrink below the current size
if (__res < this->size())
__res = this->size();
}
template<typename _CharT, typename _Traits, typename _Alloc>
- void basic_string<_CharT, _Traits, _Alloc>::swap(basic_string& __s)
+ void
+ basic_string<_CharT, _Traits, _Alloc>::
+ swap(basic_string& __s)
{
if (_M_rep()->_M_is_leaked())
_M_rep()->_M_set_sharable();
_S_create(size_type __capacity, size_type __old_capacity,
const _Alloc& __alloc)
{
- typedef basic_string<_CharT, _Traits, _Alloc> __string_type;
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 83. String::npos vs. string::max_size()
if (__capacity > _S_max_size)
// low-balling it (especially when this algorithm is used with
// malloc implementations that allocate memory blocks rounded up
// to a size which is a power of 2).
- const size_type __pagesize = 4096; // must be 2^i * __subpagesize
- const size_type __subpagesize = 128; // should be >> __malloc_header_size
- const size_type __malloc_header_size = 4 * sizeof (void*);
+ const size_type __pagesize = 4096;
+ const size_type __malloc_header_size = 4 * sizeof(void*);
// The below implements an exponential growth policy, necessary to
// meet amortized linear time requirements of the library: see
// It's active for allocations requiring an amount of memory above
// system pagesize. This is consistent with the requirements of the
// standard: http://gcc.gnu.org/ml/libstdc++/2001-07/msg00130.html
-
- // The biggest string which fits in a memory page
- const size_type __page_capacity = ((__pagesize - __malloc_header_size
- - sizeof(_Rep) - sizeof(_CharT))
- / sizeof(_CharT));
-
- if (__capacity > __old_capacity && __capacity < 2 * __old_capacity
- && __capacity > __page_capacity)
+ if (__capacity > __old_capacity && __capacity < 2 * __old_capacity)
__capacity = 2 * __old_capacity;
// NB: Need an array of char_type[__capacity], plus a terminating
__capacity = _S_max_size;
__size = (__capacity + 1) * sizeof(_CharT) + sizeof(_Rep);
}
- else if (__size > __subpagesize)
- {
- const size_type __extra = __subpagesize - __adj_size % __subpagesize;
- __capacity += __extra / sizeof(_CharT);
- __size = (__capacity + 1) * sizeof(_CharT) + sizeof(_Rep);
- }
// NB: Might throw, but no worries about a leak, mate: _Rep()
// does not throw.
void* __place = _Raw_bytes_alloc(__alloc).allocate(__size);
_Rep *__p = new (__place) _Rep;
__p->_M_capacity = __capacity;
- __p->_M_set_sharable(); // One reference.
- __p->_M_length = 0;
return __p;
}
_Rep* __r = _Rep::_S_create(__requested_cap, this->_M_capacity,
__alloc);
if (this->_M_length)
- traits_type::copy(__r->_M_refdata(), _M_refdata(),
- this->_M_length);
+ _M_copy(__r->_M_refdata(), _M_refdata(), this->_M_length);
- __r->_M_length = this->_M_length;
- __r->_M_refdata()[this->_M_length] = _Rep::_S_terminal;
+ __r->_M_set_length_and_sharable(this->_M_length);
return __r->_M_refdata();
}
template<typename _CharT, typename _Traits, typename _Alloc>
void
- basic_string<_CharT, _Traits, _Alloc>::resize(size_type __n, _CharT __c)
+ basic_string<_CharT, _Traits, _Alloc>::
+ resize(size_type __n, _CharT __c)
{
- if (__n > max_size())
- __throw_length_error(__N("basic_string::resize"));
const size_type __size = this->size();
+ _M_check_length(__size, __n, "basic_string::resize");
if (__size < __n)
this->append(__n - __size, __c);
else if (__n < __size)
{
const basic_string __s(__k1, __k2);
const size_type __n1 = __i2 - __i1;
- if (this->max_size() - (this->size() - __n1) < __s.size())
- __throw_length_error(__N("basic_string::_M_replace_dispatch"));
+ _M_check_length(__n1, __s.size(), "basic_string::_M_replace_dispatch");
return _M_replace_safe(__i1 - _M_ibegin(), __n1, __s._M_data(),
__s.size());
}
-
- template<typename _CharT, typename _Traits, typename _Alloc>
- basic_string<_CharT, _Traits, _Alloc>&
- basic_string<_CharT, _Traits, _Alloc>::
- append(const basic_string& __str)
- {
- // Iff appending itself, string needs to pre-reserve the
- // correct size so that _M_mutate does not clobber the
- // pointer __str._M_data() formed here.
- const size_type __size = __str.size();
- const size_type __len = __size + this->size();
- if (__len > this->capacity())
- this->reserve(__len);
- return _M_replace_safe(this->size(), size_type(0), __str._M_data(),
- __str.size());
- }
-
- template<typename _CharT, typename _Traits, typename _Alloc>
- basic_string<_CharT, _Traits, _Alloc>&
- basic_string<_CharT, _Traits, _Alloc>::
- append(const basic_string& __str, size_type __pos, size_type __n)
- {
- // Iff appending itself, string needs to pre-reserve the
- // correct size so that _M_mutate does not clobber the
- // pointer __str._M_data() formed here.
- __str._M_check(__pos, "basic_string::append");
- __n = __str._M_limit(__pos, __n);
- const size_type __len = __n + this->size();
- if (__len > this->capacity())
- this->reserve(__len);
- return _M_replace_safe(this->size(), size_type(0), __str._M_data()
- + __pos, __n);
- }
-
- template<typename _CharT, typename _Traits, typename _Alloc>
- basic_string<_CharT, _Traits, _Alloc>&
- basic_string<_CharT, _Traits, _Alloc>::
- append(const _CharT* __s, size_type __n)
- {
- __glibcxx_requires_string_len(__s, __n);
- const size_type __len = __n + this->size();
- if (__len > this->capacity())
- this->reserve(__len);
- return _M_replace_safe(this->size(), size_type(0), __s, __n);
- }
-
+
template<typename _CharT, typename _Traits, typename _Alloc>
basic_string<_CharT, _Traits, _Alloc>
operator+(const _CharT* __lhs,
__n = _M_limit(__pos, __n);
__glibcxx_requires_string_len(__s, __n);
if (__n)
- traits_type::copy(__s, _M_data() + __pos, __n);
+ _M_copy(__s, _M_data() + __pos, __n);
// 21.3.5.7 par 3: do not append null. (good.)
return __n;
}
find(const _CharT* __s, size_type __pos, size_type __n) const
{
__glibcxx_requires_string_len(__s, __n);
+ size_type __ret = npos;
const size_type __size = this->size();
- const _CharT* __data = _M_data();
- for (; __pos + __n <= __size; ++__pos)
- if (traits_type::compare(__data + __pos, __s, __n) == 0)
- return __pos;
- return npos;
+ if (__pos + __n <= __size)
+ {
+ const _CharT* __data = _M_data();
+ const _CharT* __p = std::search(__data + __pos, __data + __size,
+ __s, __s + __n, traits_type::eq);
+ if (__p != __data + __size || __n == 0)
+ __ret = __p - __data;
+ }
+ return __ret;
}
template<typename _CharT, typename _Traits, typename _Alloc>
basic_string<_CharT, _Traits, _Alloc>::
find(_CharT __c, size_type __pos) const
{
- const size_type __size = this->size();
size_type __ret = npos;
+ const size_type __size = this->size();
if (__pos < __size)
{
const _CharT* __data = _M_data();
projects / gcc.git / blobdiff