2005-07-06 01:07:18 +02:00
|
|
|
// Versatile string -*- C++ -*-
|
|
|
|
|
2008-06-29 17:46:50 +02:00
|
|
|
// Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
2005-07-06 01:07:18 +02:00
|
|
|
//
|
|
|
|
// This file is part of the GNU ISO C++ Library. This library is free
|
|
|
|
// software; you can redistribute it and/or modify it under the
|
|
|
|
// terms of the GNU General Public License as published by the
|
|
|
|
// Free Software Foundation; either version 2, or (at your option)
|
|
|
|
// any later version.
|
|
|
|
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License for more details.
|
|
|
|
|
|
|
|
// You should have received a copy of the GNU General Public License along
|
|
|
|
// with this library; see the file COPYING. If not, write to the Free
|
2005-08-17 04:28:44 +02:00
|
|
|
// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
2005-07-06 01:07:18 +02:00
|
|
|
// USA.
|
|
|
|
|
|
|
|
// As a special exception, you may use this file as part of a free software
|
|
|
|
// library without restriction. Specifically, if other files instantiate
|
|
|
|
// templates or use macros or inline functions from this file, or you compile
|
|
|
|
// this file and link it with other files to produce an executable, this
|
|
|
|
// file does not by itself cause the resulting executable to be covered by
|
|
|
|
// the GNU General Public License. This exception does not however
|
|
|
|
// invalidate any other reasons why the executable file might be covered by
|
|
|
|
// the GNU General Public License.
|
|
|
|
|
|
|
|
/** @file ext/vstring.h
|
|
|
|
* This file is a GNU extension to the Standard C++ Library.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _VSTRING_H
|
|
|
|
#define _VSTRING_H 1
|
|
|
|
|
|
|
|
#pragma GCC system_header
|
|
|
|
|
2008-07-21 21:40:39 +02:00
|
|
|
#include <initializer_list>
|
2005-07-06 01:07:18 +02:00
|
|
|
#include <ext/vstring_util.h>
|
|
|
|
#include <ext/rc_string_base.h>
|
|
|
|
#include <ext/sso_string_base.h>
|
|
|
|
|
2005-12-19 01:56:05 +01:00
|
|
|
_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @class __versa_string vstring.h
|
|
|
|
* @brief Managing sequences of characters and character-like objects.
|
|
|
|
*/
|
|
|
|
|
|
|
|
// Template class __versa_string
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
class __versa_string
|
|
|
|
: private _Base<_CharT, _Traits, _Alloc>
|
|
|
|
{
|
|
|
|
typedef _Base<_CharT, _Traits, _Alloc> __vstring_base;
|
|
|
|
typedef typename __vstring_base::_CharT_alloc_type _CharT_alloc_type;
|
|
|
|
|
|
|
|
// Types:
|
|
|
|
public:
|
|
|
|
typedef _Traits traits_type;
|
|
|
|
typedef typename _Traits::char_type value_type;
|
|
|
|
typedef _Alloc allocator_type;
|
|
|
|
typedef typename _CharT_alloc_type::size_type size_type;
|
|
|
|
typedef typename _CharT_alloc_type::difference_type difference_type;
|
|
|
|
typedef typename _CharT_alloc_type::reference reference;
|
|
|
|
typedef typename _CharT_alloc_type::const_reference const_reference;
|
|
|
|
typedef typename _CharT_alloc_type::pointer pointer;
|
|
|
|
typedef typename _CharT_alloc_type::const_pointer const_pointer;
|
|
|
|
typedef __gnu_cxx::__normal_iterator<pointer, __versa_string> iterator;
|
|
|
|
typedef __gnu_cxx::__normal_iterator<const_pointer, __versa_string>
|
|
|
|
const_iterator;
|
|
|
|
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
|
|
|
|
typedef std::reverse_iterator<iterator> reverse_iterator;
|
|
|
|
|
2005-10-19 16:25:31 +02:00
|
|
|
// Data Member (public):
|
2005-07-06 01:07:18 +02:00
|
|
|
/// Value returned by various member functions when they fail.
|
|
|
|
static const size_type npos = static_cast<size_type>(-1);
|
|
|
|
|
|
|
|
private:
|
|
|
|
size_type
|
|
|
|
_M_check(size_type __pos, const char* __s) const
|
|
|
|
{
|
|
|
|
if (__pos > this->size())
|
|
|
|
std::__throw_out_of_range(__N(__s));
|
|
|
|
return __pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_M_check_length(size_type __n1, size_type __n2, const char* __s) const
|
|
|
|
{
|
|
|
|
if (this->max_size() - (this->size() - __n1) < __n2)
|
|
|
|
std::__throw_length_error(__N(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
// NB: _M_limit doesn't check for a bad __pos value.
|
|
|
|
size_type
|
|
|
|
_M_limit(size_type __pos, size_type __off) const
|
|
|
|
{
|
|
|
|
const bool __testoff = __off < this->size() - __pos;
|
|
|
|
return __testoff ? __off : this->size() - __pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
// True if _Rep and source do not overlap.
|
|
|
|
bool
|
|
|
|
_M_disjunct(const _CharT* __s) const
|
|
|
|
{
|
|
|
|
return (std::less<const _CharT*>()(__s, this->_M_data())
|
|
|
|
|| std::less<const _CharT*>()(this->_M_data()
|
|
|
|
+ this->size(), __s));
|
|
|
|
}
|
|
|
|
|
|
|
|
// For the internal use we have functions similar to `begin'/`end'
|
|
|
|
// but they do not call _M_leak.
|
|
|
|
iterator
|
|
|
|
_M_ibegin() const
|
|
|
|
{ return iterator(this->_M_data()); }
|
|
|
|
|
|
|
|
iterator
|
|
|
|
_M_iend() const
|
|
|
|
{ return iterator(this->_M_data() + this->_M_length()); }
|
|
|
|
|
|
|
|
public:
|
|
|
|
// Construct/copy/destroy:
|
|
|
|
// NB: We overload ctors in some cases instead of using default
|
|
|
|
// arguments, per 17.4.4.4 para. 2 item 2.
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Default constructor creates an empty string.
|
|
|
|
*/
|
|
|
|
__versa_string()
|
|
|
|
: __vstring_base() { }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Construct an empty string using allocator @a a.
|
|
|
|
*/
|
|
|
|
explicit
|
|
|
|
__versa_string(const _Alloc& __a)
|
|
|
|
: __vstring_base(__a) { }
|
|
|
|
|
|
|
|
// NB: per LWG issue 42, semantics different from IS:
|
|
|
|
/**
|
|
|
|
* @brief Construct string with copy of value of @a str.
|
|
|
|
* @param str Source string.
|
|
|
|
*/
|
|
|
|
__versa_string(const __versa_string& __str)
|
|
|
|
: __vstring_base(__str) { }
|
|
|
|
|
2007-10-16 17:20:09 +02:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
/**
|
|
|
|
* @brief String move constructor.
|
|
|
|
* @param str Source string.
|
|
|
|
*
|
|
|
|
* The newly-constructed %string contains the exact contents of @a str.
|
|
|
|
* The contents of @a str are a valid, but unspecified string.
|
|
|
|
*/
|
|
|
|
__versa_string(__versa_string&& __str)
|
|
|
|
: __vstring_base(std::forward<__vstring_base>(__str)) { }
|
2008-07-21 21:40:39 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Construct string from an initializer list.
|
|
|
|
* @param l std::initializer_list of characters.
|
|
|
|
* @param a Allocator to use (default is default allocator).
|
|
|
|
*/
|
|
|
|
__versa_string(std::initializer_list<_CharT> __l, const _Alloc& __a = _Alloc())
|
|
|
|
: __vstring_base(__l, __a) { }
|
2007-10-16 17:20:09 +02:00
|
|
|
#endif
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Construct string as copy of a substring.
|
|
|
|
* @param str Source string.
|
|
|
|
* @param pos Index of first character to copy from.
|
|
|
|
* @param n Number of characters to copy (default remainder).
|
|
|
|
*/
|
|
|
|
__versa_string(const __versa_string& __str, size_type __pos,
|
|
|
|
size_type __n = npos)
|
|
|
|
: __vstring_base(__str._M_data()
|
|
|
|
+ __str._M_check(__pos,
|
|
|
|
"__versa_string::__versa_string"),
|
|
|
|
__str._M_data() + __str._M_limit(__pos, __n)
|
|
|
|
+ __pos, _Alloc()) { }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Construct string as copy of a substring.
|
|
|
|
* @param str Source string.
|
|
|
|
* @param pos Index of first character to copy from.
|
|
|
|
* @param n Number of characters to copy.
|
|
|
|
* @param a Allocator to use.
|
|
|
|
*/
|
|
|
|
__versa_string(const __versa_string& __str, size_type __pos,
|
|
|
|
size_type __n, const _Alloc& __a)
|
|
|
|
: __vstring_base(__str._M_data()
|
|
|
|
+ __str._M_check(__pos,
|
|
|
|
"__versa_string::__versa_string"),
|
|
|
|
__str._M_data() + __str._M_limit(__pos, __n)
|
|
|
|
+ __pos, __a) { }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Construct string initialized by a character array.
|
|
|
|
* @param s Source character array.
|
|
|
|
* @param n Number of characters to copy.
|
|
|
|
* @param a Allocator to use (default is default allocator).
|
|
|
|
*
|
|
|
|
* NB: @a s must have at least @a n characters, '\0' has no special
|
|
|
|
* meaning.
|
|
|
|
*/
|
|
|
|
__versa_string(const _CharT* __s, size_type __n,
|
|
|
|
const _Alloc& __a = _Alloc())
|
|
|
|
: __vstring_base(__s, __s + __n, __a) { }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Construct string as copy of a C string.
|
|
|
|
* @param s Source C string.
|
|
|
|
* @param a Allocator to use (default is default allocator).
|
|
|
|
*/
|
|
|
|
__versa_string(const _CharT* __s, const _Alloc& __a = _Alloc())
|
|
|
|
: __vstring_base(__s, __s ? __s + traits_type::length(__s) :
|
|
|
|
__s + npos, __a) { }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Construct string as multiple characters.
|
|
|
|
* @param n Number of characters.
|
|
|
|
* @param c Character to use.
|
|
|
|
* @param a Allocator to use (default is default allocator).
|
|
|
|
*/
|
|
|
|
__versa_string(size_type __n, _CharT __c, const _Alloc& __a = _Alloc())
|
|
|
|
: __vstring_base(__n, __c, __a) { }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Construct string as copy of a range.
|
|
|
|
* @param beg Start of range.
|
|
|
|
* @param end End of range.
|
|
|
|
* @param a Allocator to use (default is default allocator).
|
|
|
|
*/
|
|
|
|
template<class _InputIterator>
|
|
|
|
__versa_string(_InputIterator __beg, _InputIterator __end,
|
|
|
|
const _Alloc& __a = _Alloc())
|
|
|
|
: __vstring_base(__beg, __end, __a) { }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Destroy the string instance.
|
|
|
|
*/
|
|
|
|
~__versa_string() { }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Assign the value of @a str to this string.
|
|
|
|
* @param str Source string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator=(const __versa_string& __str)
|
|
|
|
{ return this->assign(__str); }
|
|
|
|
|
2007-10-16 17:20:09 +02:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
/**
|
|
|
|
* @brief String move assignment operator.
|
|
|
|
* @param str Source string.
|
|
|
|
*
|
|
|
|
* The contents of @a str are moved into this string (without copying).
|
|
|
|
* @a str is a valid, but unspecified string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator=(__versa_string&& __str)
|
|
|
|
{
|
|
|
|
if (this != &__str)
|
|
|
|
this->swap(__str);
|
|
|
|
return *this;
|
|
|
|
}
|
2008-07-21 21:40:39 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Set value to string constructed from initializer list.
|
|
|
|
* @param l std::initializer_list.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator=(std::initializer_list<_CharT> __l)
|
|
|
|
{
|
|
|
|
this->assign (__l.begin(), __l.end());
|
|
|
|
return *this;
|
|
|
|
}
|
2007-10-16 17:20:09 +02:00
|
|
|
#endif
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Copy contents of @a s into this string.
|
|
|
|
* @param s Source null-terminated string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator=(const _CharT* __s)
|
|
|
|
{ return this->assign(__s); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Set value to string of length 1.
|
|
|
|
* @param c Source character.
|
|
|
|
*
|
|
|
|
* Assigning to a character makes this string length 1 and
|
|
|
|
* (*this)[0] == @a c.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator=(_CharT __c)
|
|
|
|
{
|
|
|
|
this->assign(1, __c);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Iterators:
|
|
|
|
/**
|
|
|
|
* Returns a read/write iterator that points to the first character in
|
|
|
|
* the %string. Unshares the string.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
begin()
|
|
|
|
{
|
|
|
|
this->_M_leak();
|
|
|
|
return iterator(this->_M_data());
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) iterator that points to the first
|
|
|
|
* character in the %string.
|
|
|
|
*/
|
|
|
|
const_iterator
|
|
|
|
begin() const
|
|
|
|
{ return const_iterator(this->_M_data()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read/write iterator that points one past the last
|
|
|
|
* character in the %string. Unshares the string.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
end()
|
|
|
|
{
|
|
|
|
this->_M_leak();
|
|
|
|
return iterator(this->_M_data() + this->size());
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) iterator that points one past the
|
|
|
|
* last character in the %string.
|
|
|
|
*/
|
|
|
|
const_iterator
|
|
|
|
end() const
|
|
|
|
{ return const_iterator(this->_M_data() + this->size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read/write reverse iterator that points to the last
|
|
|
|
* character in the %string. Iteration is done in reverse element
|
|
|
|
* order. Unshares the string.
|
|
|
|
*/
|
|
|
|
reverse_iterator
|
|
|
|
rbegin()
|
|
|
|
{ return reverse_iterator(this->end()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) reverse iterator that points
|
|
|
|
* to the last character in the %string. Iteration is done in
|
|
|
|
* reverse element order.
|
|
|
|
*/
|
|
|
|
const_reverse_iterator
|
|
|
|
rbegin() const
|
|
|
|
{ return const_reverse_iterator(this->end()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read/write reverse iterator that points to one before the
|
|
|
|
* first character in the %string. Iteration is done in reverse
|
|
|
|
* element order. Unshares the string.
|
|
|
|
*/
|
|
|
|
reverse_iterator
|
|
|
|
rend()
|
|
|
|
{ return reverse_iterator(this->begin()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) reverse iterator that points
|
|
|
|
* to one before the first character in the %string. Iteration
|
|
|
|
* is done in reverse element order.
|
|
|
|
*/
|
|
|
|
const_reverse_iterator
|
|
|
|
rend() const
|
|
|
|
{ return const_reverse_iterator(this->begin()); }
|
|
|
|
|
set.h (set<>::cbegin, [...]): Add.
2007-10-15 Paolo Carlini <pcarlini@suse.de>
* include/debug/set.h (set<>::cbegin, cend, crbegin, crend): Add.
* include/debug/multiset.h (set<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/vector (vector<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/map.h (map<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/deque (deque<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/list (list<>::cbegin, cend, crbegin, crend):
Likewise.
* include/debug/multimap.h (multimap<>::cbegin, cend, crbegin,
crend): Likewise.
* include/tr1_impl/array (array<>::cbegin, cend, crbegin, crend):
Likewise.
* include/ext/vstring.h (__versa_string<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_list.h (list<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_map.h (map<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_set.h (set<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_multimap.h (multimap<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_vector.h (vector<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_deque.h (deque<>::cbegin, cend, crbegin, crend):
Likewise.
* include/bits/stl_multiset.h (multiset<>::cbegin, cend, crbegin,
crend): Likewise.
* include/bits/stl_bvector.h (vector<bool>::cbegin, cend, crbegin,
crend): Likewise.
* include/tr1_impl/hashtable (_Hashtable<>::cbegin, cend): Add.
* testsuite/ext/vstring/requirements/citerators.cc: Add.
* testsuite/23_containers/unordered_map/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/multimap/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/set/requirements/citerators.cc: Likewise.
* testsuite/23_containers/unordered_multimap/requirements/
citerators.cc: Likewise.
* testsuite/23_containers/unordered_set/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/vector/requirements/citerators.cc: Likewise.
* testsuite/23_containers/vector/bool/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/deque/requirements/citerators.cc: Likewise.
* testsuite/23_containers/multiset/requirements/citerators.cc:
Likewise.
* testsuite/23_containers/list/requirements/citerators.cc: Likewise.
* testsuite/23_containers/unordered_multiset/requirements/
citerators.cc: Likewise.
* testsuite/23_containers/map/requirements/citerators.cc: Likewise.
* testsuite/23_containers/array/requirements/citerators.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Adjust dg-error lines.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.
From-SVN: r129370
2007-10-15 22:51:53 +02:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) iterator that points to the first
|
|
|
|
* character in the %string.
|
|
|
|
*/
|
|
|
|
const_iterator
|
|
|
|
cbegin() const
|
|
|
|
{ return const_iterator(this->_M_data()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) iterator that points one past the
|
|
|
|
* last character in the %string.
|
|
|
|
*/
|
|
|
|
const_iterator
|
|
|
|
cend() const
|
|
|
|
{ return const_iterator(this->_M_data() + this->size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) reverse iterator that points
|
|
|
|
* to the last character in the %string. Iteration is done in
|
|
|
|
* reverse element order.
|
|
|
|
*/
|
|
|
|
const_reverse_iterator
|
|
|
|
crbegin() const
|
|
|
|
{ return const_reverse_iterator(this->end()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) reverse iterator that points
|
|
|
|
* to one before the first character in the %string. Iteration
|
|
|
|
* is done in reverse element order.
|
|
|
|
*/
|
|
|
|
const_reverse_iterator
|
|
|
|
crend() const
|
|
|
|
{ return const_reverse_iterator(this->begin()); }
|
|
|
|
#endif
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
public:
|
|
|
|
// Capacity:
|
|
|
|
/// Returns the number of characters in the string, not including any
|
|
|
|
/// null-termination.
|
|
|
|
size_type
|
|
|
|
size() const
|
|
|
|
{ return this->_M_length(); }
|
|
|
|
|
|
|
|
/// Returns the number of characters in the string, not including any
|
|
|
|
/// null-termination.
|
|
|
|
size_type
|
|
|
|
length() const
|
|
|
|
{ return this->_M_length(); }
|
|
|
|
|
|
|
|
/// Returns the size() of the largest possible %string.
|
|
|
|
size_type
|
|
|
|
max_size() const
|
2005-10-19 16:25:31 +02:00
|
|
|
{ return this->_M_max_size(); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Resizes the %string to the specified number of characters.
|
|
|
|
* @param n Number of characters the %string should contain.
|
|
|
|
* @param c Character to fill any new elements.
|
|
|
|
*
|
|
|
|
* This function will %resize the %string to the specified
|
|
|
|
* number of characters. If the number is smaller than the
|
|
|
|
* %string's current size the %string is truncated, otherwise
|
|
|
|
* the %string is extended and new elements are set to @a c.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
resize(size_type __n, _CharT __c);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Resizes the %string to the specified number of characters.
|
|
|
|
* @param n Number of characters the %string should contain.
|
|
|
|
*
|
|
|
|
* This function will resize the %string to the specified length. If
|
|
|
|
* the new size is smaller than the %string's current size the %string
|
|
|
|
* is truncated, otherwise the %string is extended and new characters
|
|
|
|
* are default-constructed. For basic types such as char, this means
|
|
|
|
* setting them to 0.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
resize(size_type __n)
|
|
|
|
{ this->resize(__n, _CharT()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the total number of characters that the %string can hold
|
|
|
|
* before needing to allocate more memory.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
capacity() const
|
|
|
|
{ return this->_M_capacity(); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Attempt to preallocate enough memory for specified number of
|
|
|
|
* characters.
|
|
|
|
* @param res_arg Number of characters required.
|
|
|
|
* @throw std::length_error If @a res_arg exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* This function attempts to reserve enough memory for the
|
|
|
|
* %string to hold the specified number of characters. If the
|
|
|
|
* number requested is more than max_size(), length_error is
|
|
|
|
* thrown.
|
|
|
|
*
|
|
|
|
* The advantage of this function is that if optimal code is a
|
|
|
|
* necessity and the user can determine the string length that will be
|
|
|
|
* required, the user can reserve the memory in %advance, and thus
|
|
|
|
* prevent a possible reallocation of memory and copying of %string
|
|
|
|
* data.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
reserve(size_type __res_arg = 0)
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
{ this->_M_reserve(__res_arg); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Erases the string, making it empty.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
clear()
|
2006-08-18 17:42:05 +02:00
|
|
|
{ this->_M_clear(); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns true if the %string is empty. Equivalent to *this == "".
|
|
|
|
*/
|
|
|
|
bool
|
|
|
|
empty() const
|
|
|
|
{ return this->size() == 0; }
|
|
|
|
|
|
|
|
// Element access:
|
|
|
|
/**
|
|
|
|
* @brief Subscript access to the data contained in the %string.
|
|
|
|
* @param pos The index of the character to access.
|
|
|
|
* @return Read-only (constant) reference to the character.
|
|
|
|
*
|
|
|
|
* This operator allows for easy, array-style, data access.
|
|
|
|
* Note that data access with this operator is unchecked and
|
|
|
|
* out_of_range lookups are not defined. (For checked lookups
|
|
|
|
* see at().)
|
|
|
|
*/
|
|
|
|
const_reference
|
|
|
|
operator[] (size_type __pos) const
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_ASSERT(__pos <= this->size());
|
|
|
|
return this->_M_data()[__pos];
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Subscript access to the data contained in the %string.
|
|
|
|
* @param pos The index of the character to access.
|
|
|
|
* @return Read/write reference to the character.
|
|
|
|
*
|
|
|
|
* This operator allows for easy, array-style, data access.
|
|
|
|
* Note that data access with this operator is unchecked and
|
|
|
|
* out_of_range lookups are not defined. (For checked lookups
|
|
|
|
* see at().) Unshares the string.
|
|
|
|
*/
|
|
|
|
reference
|
|
|
|
operator[](size_type __pos)
|
|
|
|
{
|
2006-03-28 14:54:04 +02:00
|
|
|
// allow pos == size() as v3 extension:
|
|
|
|
_GLIBCXX_DEBUG_ASSERT(__pos <= this->size());
|
|
|
|
// but be strict in pedantic mode:
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(__pos < this->size());
|
2005-07-06 01:07:18 +02:00
|
|
|
this->_M_leak();
|
|
|
|
return this->_M_data()[__pos];
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Provides access to the data contained in the %string.
|
|
|
|
* @param n The index of the character to access.
|
|
|
|
* @return Read-only (const) reference to the character.
|
|
|
|
* @throw std::out_of_range If @a n is an invalid index.
|
|
|
|
*
|
|
|
|
* This function provides for safer data access. The parameter is
|
|
|
|
* first checked that it is in the range of the string. The function
|
|
|
|
* throws out_of_range if the check fails.
|
|
|
|
*/
|
|
|
|
const_reference
|
|
|
|
at(size_type __n) const
|
|
|
|
{
|
|
|
|
if (__n >= this->size())
|
|
|
|
std::__throw_out_of_range(__N("__versa_string::at"));
|
|
|
|
return this->_M_data()[__n];
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Provides access to the data contained in the %string.
|
|
|
|
* @param n The index of the character to access.
|
|
|
|
* @return Read/write reference to the character.
|
|
|
|
* @throw std::out_of_range If @a n is an invalid index.
|
|
|
|
*
|
|
|
|
* This function provides for safer data access. The parameter is
|
|
|
|
* first checked that it is in the range of the string. The function
|
|
|
|
* throws out_of_range if the check fails. Success results in
|
|
|
|
* unsharing the string.
|
|
|
|
*/
|
|
|
|
reference
|
|
|
|
at(size_type __n)
|
|
|
|
{
|
|
|
|
if (__n >= this->size())
|
|
|
|
std::__throw_out_of_range(__N("__versa_string::at"));
|
|
|
|
this->_M_leak();
|
|
|
|
return this->_M_data()[__n];
|
|
|
|
}
|
|
|
|
|
2007-10-17 02:46:27 +02:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
/**
|
|
|
|
* Returns a read/write reference to the data at the first
|
|
|
|
* element of the %string.
|
|
|
|
*/
|
|
|
|
reference
|
|
|
|
front()
|
|
|
|
{ return *begin(); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) reference to the data at the first
|
|
|
|
* element of the %string.
|
|
|
|
*/
|
|
|
|
const_reference
|
|
|
|
front() const
|
|
|
|
{ return *begin(); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read/write reference to the data at the last
|
|
|
|
* element of the %string.
|
|
|
|
*/
|
|
|
|
reference
|
|
|
|
back()
|
|
|
|
{ return *(end() - 1); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) reference to the data at the
|
|
|
|
* last element of the %string.
|
|
|
|
*/
|
|
|
|
const_reference
|
|
|
|
back() const
|
|
|
|
{ return *(end() - 1); }
|
|
|
|
#endif
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
// Modifiers:
|
|
|
|
/**
|
|
|
|
* @brief Append a string to this string.
|
|
|
|
* @param str The string to append.
|
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator+=(const __versa_string& __str)
|
|
|
|
{ return this->append(__str); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Append a C string.
|
|
|
|
* @param s The C string to append.
|
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator+=(const _CharT* __s)
|
|
|
|
{ return this->append(__s); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Append a character.
|
|
|
|
* @param c The character to append.
|
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator+=(_CharT __c)
|
|
|
|
{
|
|
|
|
this->push_back(__c);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2008-07-21 21:40:39 +02:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
/**
|
|
|
|
* @brief Append an initializer_list of characters.
|
|
|
|
* @param l The initializer_list of characters to be appended.
|
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
operator+=(std::initializer_list<_CharT> __l)
|
|
|
|
{ return this->append(__l.begin(), __l.end()); }
|
|
|
|
#endif // __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Append a string to this string.
|
|
|
|
* @param str The string to append.
|
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
append(const __versa_string& __str)
|
|
|
|
{ return _M_append(__str._M_data(), __str.size()); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Append a substring.
|
|
|
|
* @param str The string to append.
|
|
|
|
* @param pos Index of the first character of str to append.
|
|
|
|
* @param n The number of characters to append.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::out_of_range if @a pos is not a valid index.
|
|
|
|
*
|
|
|
|
* This function appends @a n characters from @a str starting at @a pos
|
|
|
|
* to this string. If @a n is is larger than the number of available
|
|
|
|
* characters in @a str, the remainder of @a str is appended.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
append(const __versa_string& __str, size_type __pos, size_type __n)
|
|
|
|
{ return _M_append(__str._M_data()
|
|
|
|
+ __str._M_check(__pos, "__versa_string::append"),
|
|
|
|
__str._M_limit(__pos, __n)); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Append a C substring.
|
|
|
|
* @param s The C string to append.
|
|
|
|
* @param n The number of characters to append.
|
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
append(const _CharT* __s, size_type __n)
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string_len(__s, __n);
|
|
|
|
_M_check_length(size_type(0), __n, "__versa_string::append");
|
|
|
|
return _M_append(__s, __n);
|
|
|
|
}
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Append a C string.
|
|
|
|
* @param s The C string to append.
|
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
append(const _CharT* __s)
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
const size_type __n = traits_type::length(__s);
|
|
|
|
_M_check_length(size_type(0), __n, "__versa_string::append");
|
|
|
|
return _M_append(__s, __n);
|
2005-07-06 01:07:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Append multiple characters.
|
|
|
|
* @param n The number of characters to append.
|
|
|
|
* @param c The character to use.
|
|
|
|
* @return Reference to this string.
|
|
|
|
*
|
|
|
|
* Appends n copies of c to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
append(size_type __n, _CharT __c)
|
|
|
|
{ return _M_replace_aux(this->size(), size_type(0), __n, __c); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
2008-07-21 21:40:39 +02:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
/**
|
|
|
|
* @brief Append an initializer_list of characters.
|
|
|
|
* @param l The initializer_list of characters to append.
|
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
append(std::initializer_list<_CharT> __l)
|
|
|
|
{ return this->append(__l.begin(), __l.end()); }
|
|
|
|
#endif // __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Append a range of characters.
|
|
|
|
* @param first Iterator referencing the first character to append.
|
|
|
|
* @param last Iterator marking the end of the range.
|
|
|
|
* @return Reference to this string.
|
|
|
|
*
|
|
|
|
* Appends characters in the range [first,last) to this string.
|
|
|
|
*/
|
|
|
|
template<class _InputIterator>
|
|
|
|
__versa_string&
|
|
|
|
append(_InputIterator __first, _InputIterator __last)
|
|
|
|
{ return this->replace(_M_iend(), _M_iend(), __first, __last); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Append a single character.
|
|
|
|
* @param c Character to append.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
push_back(_CharT __c)
|
|
|
|
{
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
const size_type __size = this->size();
|
|
|
|
if (__size + 1 > this->capacity() || this->_M_is_shared())
|
|
|
|
this->_M_mutate(__size, size_type(0), 0, size_type(1));
|
|
|
|
traits_type::assign(this->_M_data()[__size], __c);
|
|
|
|
this->_M_set_length(__size + 1);
|
2005-07-06 01:07:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Set value to contents of another string.
|
|
|
|
* @param str Source string to use.
|
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
assign(const __versa_string& __str)
|
|
|
|
{
|
|
|
|
this->_M_assign(__str);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Set value to a substring of a string.
|
|
|
|
* @param str The string to use.
|
|
|
|
* @param pos Index of the first character of str.
|
|
|
|
* @param n Number of characters to use.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::out_of_range if @a pos is not a valid index.
|
|
|
|
*
|
|
|
|
* This function sets this string to the substring of @a str consisting
|
|
|
|
* of @a n characters at @a pos. If @a n is is larger than the number
|
|
|
|
* of available characters in @a str, the remainder of @a str is used.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
assign(const __versa_string& __str, size_type __pos, size_type __n)
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
{ return _M_replace(size_type(0), this->size(), __str._M_data()
|
|
|
|
+ __str._M_check(__pos, "__versa_string::assign"),
|
|
|
|
__str._M_limit(__pos, __n)); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Set value to a C substring.
|
|
|
|
* @param s The C string to use.
|
|
|
|
* @param n Number of characters to use.
|
|
|
|
* @return Reference to this string.
|
|
|
|
*
|
|
|
|
* This function sets the value of this string to the first @a n
|
|
|
|
* characters of @a s. If @a n is is larger than the number of
|
|
|
|
* available characters in @a s, the remainder of @a s is used.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
assign(const _CharT* __s, size_type __n)
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string_len(__s, __n);
|
|
|
|
return _M_replace(size_type(0), this->size(), __s, __n);
|
|
|
|
}
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Set value to contents of a C string.
|
|
|
|
* @param s The C string to use.
|
|
|
|
* @return Reference to this string.
|
|
|
|
*
|
|
|
|
* This function sets the value of this string to the value of @a s.
|
|
|
|
* The data is copied, so there is no dependence on @a s once the
|
|
|
|
* function returns.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
assign(const _CharT* __s)
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
return _M_replace(size_type(0), this->size(), __s,
|
|
|
|
traits_type::length(__s));
|
2005-07-06 01:07:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Set value to multiple characters.
|
|
|
|
* @param n Length of the resulting string.
|
|
|
|
* @param c The character to use.
|
|
|
|
* @return Reference to this string.
|
|
|
|
*
|
|
|
|
* This function sets the value of this string to @a n copies of
|
|
|
|
* character @a c.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
assign(size_type __n, _CharT __c)
|
|
|
|
{ return _M_replace_aux(size_type(0), this->size(), __n, __c); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Set value to a range of characters.
|
|
|
|
* @param first Iterator referencing the first character to append.
|
|
|
|
* @param last Iterator marking the end of the range.
|
|
|
|
* @return Reference to this string.
|
|
|
|
*
|
|
|
|
* Sets value of string to characters in the range [first,last).
|
|
|
|
*/
|
|
|
|
template<class _InputIterator>
|
|
|
|
__versa_string&
|
|
|
|
assign(_InputIterator __first, _InputIterator __last)
|
|
|
|
{ return this->replace(_M_ibegin(), _M_iend(), __first, __last); }
|
|
|
|
|
2008-07-21 21:40:39 +02:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
/**
|
|
|
|
* @brief Set value to an initializer_list of characters.
|
|
|
|
* @param l The initializer_list of characters to assign.
|
|
|
|
* @return Reference to this string.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
assign(std::initializer_list<_CharT> __l)
|
|
|
|
{ return this->assign(__l.begin(), __l.end()); }
|
|
|
|
#endif // __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Insert multiple characters.
|
|
|
|
* @param p Iterator referencing location in string to insert at.
|
|
|
|
* @param n Number of characters to insert
|
|
|
|
* @param c The character to insert.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Inserts @a n copies of character @a c starting at the position
|
|
|
|
* referenced by iterator @a p. If adding characters causes the length
|
|
|
|
* to exceed max_size(), length_error is thrown. The value of the
|
|
|
|
* string doesn't change if an error is thrown.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
insert(iterator __p, size_type __n, _CharT __c)
|
|
|
|
{ this->replace(__p, __p, __n, __c); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Insert a range of characters.
|
|
|
|
* @param p Iterator referencing location in string to insert at.
|
|
|
|
* @param beg Start of range.
|
|
|
|
* @param end End of range.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Inserts characters in range [beg,end). If adding characters causes
|
|
|
|
* the length to exceed max_size(), length_error is thrown. The value
|
|
|
|
* of the string doesn't change if an error is thrown.
|
|
|
|
*/
|
|
|
|
template<class _InputIterator>
|
|
|
|
void
|
|
|
|
insert(iterator __p, _InputIterator __beg, _InputIterator __end)
|
|
|
|
{ this->replace(__p, __p, __beg, __end); }
|
|
|
|
|
2008-07-21 21:40:39 +02:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
/**
|
|
|
|
* @brief Insert an initializer_list of characters.
|
|
|
|
* @param p Iterator referencing location in string to insert at.
|
|
|
|
* @param l The initializer_list of characters to insert.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
insert(iterator __p, std::initializer_list<_CharT> __l)
|
|
|
|
{ this->insert(__p, __l.begin(), __l.end()); }
|
|
|
|
#endif // __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Insert value of a string.
|
|
|
|
* @param pos1 Iterator referencing location in string to insert at.
|
|
|
|
* @param str The string to insert.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Inserts value of @a str starting at @a pos1. If adding characters
|
|
|
|
* causes the length to exceed max_size(), length_error is thrown. The
|
|
|
|
* value of the string doesn't change if an error is thrown.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
insert(size_type __pos1, const __versa_string& __str)
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
{ return this->replace(__pos1, size_type(0),
|
|
|
|
__str._M_data(), __str.size()); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Insert a substring.
|
|
|
|
* @param pos1 Iterator referencing location in string to insert at.
|
|
|
|
* @param str The string to insert.
|
|
|
|
* @param pos2 Start of characters in str to insert.
|
|
|
|
* @param n Number of characters to insert.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
* @throw std::out_of_range If @a pos1 > size() or
|
|
|
|
* @a pos2 > @a str.size().
|
|
|
|
*
|
|
|
|
* Starting at @a pos1, insert @a n character of @a str beginning with
|
|
|
|
* @a pos2. If adding characters causes the length to exceed
|
|
|
|
* max_size(), length_error is thrown. If @a pos1 is beyond the end of
|
|
|
|
* this string or @a pos2 is beyond the end of @a str, out_of_range is
|
|
|
|
* thrown. The value of the string doesn't change if an error is
|
|
|
|
* thrown.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
insert(size_type __pos1, const __versa_string& __str,
|
|
|
|
size_type __pos2, size_type __n)
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
{ return this->replace(__pos1, size_type(0), __str._M_data()
|
|
|
|
+ __str._M_check(__pos2, "__versa_string::insert"),
|
|
|
|
__str._M_limit(__pos2, __n)); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Insert a C substring.
|
|
|
|
* @param pos Iterator referencing location in string to insert at.
|
|
|
|
* @param s The C string to insert.
|
|
|
|
* @param n The number of characters to insert.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
* @throw std::out_of_range If @a pos is beyond the end of this
|
|
|
|
* string.
|
|
|
|
*
|
|
|
|
* Inserts the first @a n characters of @a s starting at @a pos. If
|
|
|
|
* adding characters causes the length to exceed max_size(),
|
|
|
|
* length_error is thrown. If @a pos is beyond end(), out_of_range is
|
|
|
|
* thrown. The value of the string doesn't change if an error is
|
|
|
|
* thrown.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
insert(size_type __pos, const _CharT* __s, size_type __n)
|
|
|
|
{ return this->replace(__pos, size_type(0), __s, __n); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Insert a C string.
|
|
|
|
* @param pos Iterator referencing location in string to insert at.
|
|
|
|
* @param s The C string to insert.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
* @throw std::out_of_range If @a pos is beyond the end of this
|
|
|
|
* string.
|
|
|
|
*
|
|
|
|
* Inserts the first @a n characters of @a s starting at @a pos. If
|
|
|
|
* adding characters causes the length to exceed max_size(),
|
|
|
|
* length_error is thrown. If @a pos is beyond end(), out_of_range is
|
|
|
|
* thrown. The value of the string doesn't change if an error is
|
|
|
|
* thrown.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
insert(size_type __pos, const _CharT* __s)
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
return this->replace(__pos, size_type(0), __s,
|
|
|
|
traits_type::length(__s));
|
2005-07-06 01:07:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Insert multiple characters.
|
|
|
|
* @param pos Index in string to insert at.
|
|
|
|
* @param n Number of characters to insert
|
|
|
|
* @param c The character to insert.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
* @throw std::out_of_range If @a pos is beyond the end of this
|
|
|
|
* string.
|
|
|
|
*
|
|
|
|
* Inserts @a n copies of character @a c starting at index @a pos. If
|
|
|
|
* adding characters causes the length to exceed max_size(),
|
|
|
|
* length_error is thrown. If @a pos > length(), out_of_range is
|
|
|
|
* thrown. The value of the string doesn't change if an error is
|
|
|
|
* thrown.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
insert(size_type __pos, size_type __n, _CharT __c)
|
|
|
|
{ return _M_replace_aux(_M_check(__pos, "__versa_string::insert"),
|
|
|
|
size_type(0), __n, __c); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Insert one character.
|
|
|
|
* @param p Iterator referencing position in string to insert at.
|
|
|
|
* @param c The character to insert.
|
|
|
|
* @return Iterator referencing newly inserted char.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Inserts character @a c at position referenced by @a p. If adding
|
|
|
|
* character causes the length to exceed max_size(), length_error is
|
|
|
|
* thrown. If @a p is beyond end of string, out_of_range is thrown.
|
|
|
|
* The value of the string doesn't change if an error is thrown.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
insert(iterator __p, _CharT __c)
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(__p >= _M_ibegin() && __p <= _M_iend());
|
|
|
|
const size_type __pos = __p - _M_ibegin();
|
|
|
|
_M_replace_aux(__pos, size_type(0), size_type(1), __c);
|
|
|
|
this->_M_set_leaked();
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
return iterator(this->_M_data() + __pos);
|
2005-07-06 01:07:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Remove characters.
|
|
|
|
* @param pos Index of first character to remove (default 0).
|
|
|
|
* @param n Number of characters to remove (default remainder).
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::out_of_range If @a pos is beyond the end of this
|
|
|
|
* string.
|
|
|
|
*
|
|
|
|
* Removes @a n characters from this string starting at @a pos. The
|
|
|
|
* length of the string is reduced by @a n. If there are < @a n
|
|
|
|
* characters to remove, the remainder of the string is truncated. If
|
|
|
|
* @a p is beyond end of string, out_of_range is thrown. The value of
|
|
|
|
* the string doesn't change if an error is thrown.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
erase(size_type __pos = 0, size_type __n = npos)
|
|
|
|
{
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
this->_M_erase(_M_check(__pos, "__versa_string::erase"),
|
|
|
|
_M_limit(__pos, __n));
|
2005-07-06 01:07:18 +02:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Remove one character.
|
|
|
|
* @param position Iterator referencing the character to remove.
|
|
|
|
* @return iterator referencing same location after removal.
|
|
|
|
*
|
|
|
|
* Removes the character at @a position from this string. The value
|
|
|
|
* of the string doesn't change if an error is thrown.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
erase(iterator __position)
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(__position >= _M_ibegin()
|
|
|
|
&& __position < _M_iend());
|
|
|
|
const size_type __pos = __position - _M_ibegin();
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
this->_M_erase(__pos, size_type(1));
|
2005-07-06 01:07:18 +02:00
|
|
|
this->_M_set_leaked();
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
return iterator(this->_M_data() + __pos);
|
2005-07-06 01:07:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Remove a range of characters.
|
|
|
|
* @param first Iterator referencing the first character to remove.
|
|
|
|
* @param last Iterator referencing the end of the range.
|
|
|
|
* @return Iterator referencing location of first after removal.
|
|
|
|
*
|
|
|
|
* Removes the characters in the range [first,last) from this string.
|
|
|
|
* The value of the string doesn't change if an error is thrown.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
erase(iterator __first, iterator __last)
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(__first >= _M_ibegin() && __first <= __last
|
|
|
|
&& __last <= _M_iend());
|
|
|
|
const size_type __pos = __first - _M_ibegin();
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
this->_M_erase(__pos, __last - __first);
|
2005-07-06 01:07:18 +02:00
|
|
|
this->_M_set_leaked();
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
return iterator(this->_M_data() + __pos);
|
2005-07-06 01:07:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace characters with value from another string.
|
|
|
|
* @param pos Index of first character to replace.
|
|
|
|
* @param n Number of characters to be replaced.
|
|
|
|
* @param str String to insert.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::out_of_range If @a pos is beyond the end of this
|
|
|
|
* string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Removes the characters in the range [pos,pos+n) from this string.
|
|
|
|
* In place, the value of @a str is inserted. If @a pos is beyond end
|
|
|
|
* of string, out_of_range is thrown. If the length of the result
|
|
|
|
* exceeds max_size(), length_error is thrown. The value of the string
|
|
|
|
* doesn't change if an error is thrown.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
replace(size_type __pos, size_type __n, const __versa_string& __str)
|
|
|
|
{ return this->replace(__pos, __n, __str._M_data(), __str.size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace characters with value from another string.
|
|
|
|
* @param pos1 Index of first character to replace.
|
|
|
|
* @param n1 Number of characters to be replaced.
|
|
|
|
* @param str String to insert.
|
|
|
|
* @param pos2 Index of first character of str to use.
|
|
|
|
* @param n2 Number of characters from str to use.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::out_of_range If @a pos1 > size() or @a pos2 >
|
|
|
|
* str.size().
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Removes the characters in the range [pos1,pos1 + n) from this
|
|
|
|
* string. In place, the value of @a str is inserted. If @a pos is
|
|
|
|
* beyond end of string, out_of_range is thrown. If the length of the
|
|
|
|
* result exceeds max_size(), length_error is thrown. The value of the
|
|
|
|
* string doesn't change if an error is thrown.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
replace(size_type __pos1, size_type __n1, const __versa_string& __str,
|
|
|
|
size_type __pos2, size_type __n2)
|
|
|
|
{
|
|
|
|
return this->replace(__pos1, __n1, __str._M_data()
|
|
|
|
+ __str._M_check(__pos2,
|
|
|
|
"__versa_string::replace"),
|
|
|
|
__str._M_limit(__pos2, __n2));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace characters with value of a C substring.
|
|
|
|
* @param pos Index of first character to replace.
|
|
|
|
* @param n1 Number of characters to be replaced.
|
|
|
|
* @param s C string to insert.
|
|
|
|
* @param n2 Number of characters from @a s to use.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::out_of_range If @a pos1 > size().
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Removes the characters in the range [pos,pos + n1) from this string.
|
|
|
|
* In place, the first @a n2 characters of @a s are inserted, or all
|
|
|
|
* of @a s if @a n2 is too large. If @a pos is beyond end of string,
|
|
|
|
* out_of_range is thrown. If the length of result exceeds max_size(),
|
|
|
|
* length_error is thrown. The value of the string doesn't change if
|
|
|
|
* an error is thrown.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
replace(size_type __pos, size_type __n1, const _CharT* __s,
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
size_type __n2)
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string_len(__s, __n2);
|
|
|
|
return _M_replace(_M_check(__pos, "__versa_string::replace"),
|
|
|
|
_M_limit(__pos, __n1), __s, __n2);
|
|
|
|
}
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace characters with value of a C string.
|
|
|
|
* @param pos Index of first character to replace.
|
|
|
|
* @param n1 Number of characters to be replaced.
|
|
|
|
* @param s C string to insert.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::out_of_range If @a pos > size().
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Removes the characters in the range [pos,pos + n1) from this string.
|
|
|
|
* In place, the first @a n characters of @a s are inserted. If @a
|
|
|
|
* pos is beyond end of string, out_of_range is thrown. If the length
|
|
|
|
* of result exceeds max_size(), length_error is thrown. The value of
|
|
|
|
* the string doesn't change if an error is thrown.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
replace(size_type __pos, size_type __n1, const _CharT* __s)
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
|
|
|
return this->replace(__pos, __n1, __s, traits_type::length(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace characters with multiple characters.
|
|
|
|
* @param pos Index of first character to replace.
|
|
|
|
* @param n1 Number of characters to be replaced.
|
|
|
|
* @param n2 Number of characters to insert.
|
|
|
|
* @param c Character to insert.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::out_of_range If @a pos > size().
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Removes the characters in the range [pos,pos + n1) from this string.
|
|
|
|
* In place, @a n2 copies of @a c are inserted. If @a pos is beyond
|
|
|
|
* end of string, out_of_range is thrown. If the length of result
|
|
|
|
* exceeds max_size(), length_error is thrown. The value of the string
|
|
|
|
* doesn't change if an error is thrown.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
replace(size_type __pos, size_type __n1, size_type __n2, _CharT __c)
|
|
|
|
{ return _M_replace_aux(_M_check(__pos, "__versa_string::replace"),
|
|
|
|
_M_limit(__pos, __n1), __n2, __c); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace range of characters with string.
|
|
|
|
* @param i1 Iterator referencing start of range to replace.
|
|
|
|
* @param i2 Iterator referencing end of range to replace.
|
|
|
|
* @param str String value to insert.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Removes the characters in the range [i1,i2). In place, the value of
|
|
|
|
* @a str is inserted. If the length of result exceeds max_size(),
|
|
|
|
* length_error is thrown. The value of the string doesn't change if
|
|
|
|
* an error is thrown.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
replace(iterator __i1, iterator __i2, const __versa_string& __str)
|
|
|
|
{ return this->replace(__i1, __i2, __str._M_data(), __str.size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace range of characters with C substring.
|
|
|
|
* @param i1 Iterator referencing start of range to replace.
|
|
|
|
* @param i2 Iterator referencing end of range to replace.
|
|
|
|
* @param s C string value to insert.
|
|
|
|
* @param n Number of characters from s to insert.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Removes the characters in the range [i1,i2). In place, the first @a
|
|
|
|
* n characters of @a s are inserted. If the length of result exceeds
|
|
|
|
* max_size(), length_error is thrown. The value of the string doesn't
|
|
|
|
* change if an error is thrown.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
replace(iterator __i1, iterator __i2, const _CharT* __s, size_type __n)
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
|
|
|
|
&& __i2 <= _M_iend());
|
|
|
|
return this->replace(__i1 - _M_ibegin(), __i2 - __i1, __s, __n);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace range of characters with C string.
|
|
|
|
* @param i1 Iterator referencing start of range to replace.
|
|
|
|
* @param i2 Iterator referencing end of range to replace.
|
|
|
|
* @param s C string value to insert.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Removes the characters in the range [i1,i2). In place, the
|
|
|
|
* characters of @a s are inserted. If the length of result exceeds
|
|
|
|
* max_size(), length_error is thrown. The value of the string doesn't
|
|
|
|
* change if an error is thrown.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
replace(iterator __i1, iterator __i2, const _CharT* __s)
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
|
|
|
return this->replace(__i1, __i2, __s, traits_type::length(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace range of characters with multiple characters
|
|
|
|
* @param i1 Iterator referencing start of range to replace.
|
|
|
|
* @param i2 Iterator referencing end of range to replace.
|
|
|
|
* @param n Number of characters to insert.
|
|
|
|
* @param c Character to insert.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Removes the characters in the range [i1,i2). In place, @a n copies
|
|
|
|
* of @a c are inserted. If the length of result exceeds max_size(),
|
|
|
|
* length_error is thrown. The value of the string doesn't change if
|
|
|
|
* an error is thrown.
|
|
|
|
*/
|
|
|
|
__versa_string&
|
|
|
|
replace(iterator __i1, iterator __i2, size_type __n, _CharT __c)
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
|
|
|
|
&& __i2 <= _M_iend());
|
|
|
|
return _M_replace_aux(__i1 - _M_ibegin(), __i2 - __i1, __n, __c);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Replace range of characters with range.
|
|
|
|
* @param i1 Iterator referencing start of range to replace.
|
|
|
|
* @param i2 Iterator referencing end of range to replace.
|
|
|
|
* @param k1 Iterator referencing start of range to insert.
|
|
|
|
* @param k2 Iterator referencing end of range to insert.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Removes the characters in the range [i1,i2). In place, characters
|
|
|
|
* in the range [k1,k2) are inserted. If the length of result exceeds
|
|
|
|
* max_size(), length_error is thrown. The value of the string doesn't
|
|
|
|
* change if an error is thrown.
|
|
|
|
*/
|
|
|
|
template<class _InputIterator>
|
|
|
|
__versa_string&
|
|
|
|
replace(iterator __i1, iterator __i2,
|
|
|
|
_InputIterator __k1, _InputIterator __k2)
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
|
|
|
|
&& __i2 <= _M_iend());
|
|
|
|
__glibcxx_requires_valid_range(__k1, __k2);
|
|
|
|
typedef typename std::__is_integer<_InputIterator>::__type _Integral;
|
|
|
|
return _M_replace_dispatch(__i1, __i2, __k1, __k2, _Integral());
|
|
|
|
}
|
|
|
|
|
|
|
|
// Specializations for the common case of pointer and iterator:
|
|
|
|
// useful to avoid the overhead of temporary buffering in _M_replace.
|
|
|
|
__versa_string&
|
|
|
|
replace(iterator __i1, iterator __i2, _CharT* __k1, _CharT* __k2)
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
|
|
|
|
&& __i2 <= _M_iend());
|
|
|
|
__glibcxx_requires_valid_range(__k1, __k2);
|
|
|
|
return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
|
|
|
|
__k1, __k2 - __k1);
|
|
|
|
}
|
|
|
|
|
|
|
|
__versa_string&
|
|
|
|
replace(iterator __i1, iterator __i2,
|
|
|
|
const _CharT* __k1, const _CharT* __k2)
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
|
|
|
|
&& __i2 <= _M_iend());
|
|
|
|
__glibcxx_requires_valid_range(__k1, __k2);
|
|
|
|
return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
|
|
|
|
__k1, __k2 - __k1);
|
|
|
|
}
|
|
|
|
|
|
|
|
__versa_string&
|
|
|
|
replace(iterator __i1, iterator __i2, iterator __k1, iterator __k2)
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
|
|
|
|
&& __i2 <= _M_iend());
|
|
|
|
__glibcxx_requires_valid_range(__k1, __k2);
|
|
|
|
return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
|
|
|
|
__k1.base(), __k2 - __k1);
|
|
|
|
}
|
|
|
|
|
|
|
|
__versa_string&
|
|
|
|
replace(iterator __i1, iterator __i2,
|
|
|
|
const_iterator __k1, const_iterator __k2)
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
|
|
|
|
&& __i2 <= _M_iend());
|
|
|
|
__glibcxx_requires_valid_range(__k1, __k2);
|
|
|
|
return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
|
|
|
|
__k1.base(), __k2 - __k1);
|
|
|
|
}
|
|
|
|
|
2008-07-21 21:40:39 +02:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
/**
|
|
|
|
* @brief Replace range of characters with initializer_list.
|
|
|
|
* @param i1 Iterator referencing start of range to replace.
|
|
|
|
* @param i2 Iterator referencing end of range to replace.
|
|
|
|
* @param l The initializer_list of characters to insert.
|
|
|
|
* @return Reference to this string.
|
|
|
|
* @throw std::length_error If new length exceeds @c max_size().
|
|
|
|
*
|
|
|
|
* Removes the characters in the range [i1,i2). In place, characters
|
|
|
|
* in the range [k1,k2) are inserted. If the length of result exceeds
|
|
|
|
* max_size(), length_error is thrown. The value of the string doesn't
|
|
|
|
* change if an error is thrown.
|
|
|
|
*/
|
|
|
|
__versa_string& replace(iterator __i1, iterator __i2,
|
|
|
|
std::initializer_list<_CharT> __l)
|
|
|
|
{ return this->replace(__i1, __i2, __l.begin(), __l.end()); }
|
|
|
|
#endif // __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
private:
|
|
|
|
template<class _Integer>
|
|
|
|
__versa_string&
|
|
|
|
_M_replace_dispatch(iterator __i1, iterator __i2, _Integer __n,
|
2006-11-29 21:59:22 +01:00
|
|
|
_Integer __val, std::__true_type)
|
2005-07-06 01:07:18 +02:00
|
|
|
{ return _M_replace_aux(__i1 - _M_ibegin(), __i2 - __i1, __n, __val); }
|
|
|
|
|
|
|
|
template<class _InputIterator>
|
|
|
|
__versa_string&
|
|
|
|
_M_replace_dispatch(iterator __i1, iterator __i2, _InputIterator __k1,
|
2006-11-29 21:59:22 +01:00
|
|
|
_InputIterator __k2, std::__false_type);
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
__versa_string&
|
|
|
|
_M_replace_aux(size_type __pos1, size_type __n1, size_type __n2,
|
|
|
|
_CharT __c);
|
|
|
|
|
|
|
|
__versa_string&
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
_M_replace(size_type __pos, size_type __len1, const _CharT* __s,
|
|
|
|
const size_type __len2);
|
|
|
|
|
|
|
|
__versa_string&
|
|
|
|
_M_append(const _CharT* __s, size_type __n);
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Copy substring into C string.
|
|
|
|
* @param s C string to copy value into.
|
|
|
|
* @param n Number of characters to copy.
|
|
|
|
* @param pos Index of first character to copy.
|
|
|
|
* @return Number of characters actually copied
|
|
|
|
* @throw std::out_of_range If pos > size().
|
|
|
|
*
|
|
|
|
* Copies up to @a n characters starting at @a pos into the C string @a
|
|
|
|
* s. If @a pos is greater than size(), out_of_range is thrown.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
copy(_CharT* __s, size_type __n, size_type __pos = 0) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Swap contents with another string.
|
|
|
|
* @param s String to swap with.
|
|
|
|
*
|
|
|
|
* Exchanges the contents of this string with that of @a s in constant
|
|
|
|
* time.
|
|
|
|
*/
|
|
|
|
void
|
2007-10-16 17:20:09 +02:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
swap(__versa_string&& __s)
|
|
|
|
#else
|
rc_string_base.h (__rc_string_base<>::_Rep): Avoid the anonymous struct extension, adjust everywhere.
2005-11-18 Paolo Carlini <pcarlini@suse.de>
* include/ext/rc_string_base.h (__rc_string_base<>::_Rep): Avoid the
anonymous struct extension, adjust everywhere.
* include/ext/rc_string_base.h (__rc_string_base<>::_S_empty_rep()):
Just use a static member.
(__rc_string_base<>::__rc_string_base(), _S_construct): Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_Rep): Use anonymous
union together with _CharT to fix alignment issues, rebind to _Rep and
rename _Raw_alloc to _Rep_alloc_type.
(__rc_string_base<>::_Rep::_S_create, _M_destroy): Adjust consistently.
* include/ext/vstring_util.h (__is_null_p): Move inside struct
__vstring_utility as static _S_is_null_pointer.
* include/ext/sso_string.h
(__sso_string_base<>::_M_construct(std::forward_iterator_tag): Adjust.
* include/ext/rc_string_base.h
(__rc_string_base<>::_S_construct(std::forward_iterator_tag): Likewise.
Implement Option 3 of DR 431 for ext/vstring - both available bases.
* include/bits/cpp_type_traits.h (struct __is_empty): Add.
* include/ext/vstring.h (__versa_string<>::swap): Delegate to
this->_M_swap.
* include/ext/vstring.tcc (__versa_string<>::swap): Remove.
* include/ext/vstring_util.h (struct __vstring_utility<>): Add struct
_Alloc_hider<>, augmented of allocator swapping facility, specialized
to nop for empty allocators.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_swap): Use it.
(__rc_string_base<>::_M_is_leaked, _M_set_sharable): Change to private.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_swap):
Likewise.
(__sso_string_base<>::_M_is_leaked, _M_set_sharable): Remove, unused.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_data(_CharT*):
Return void.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_data(_CharT*):
Likewise.
From-SVN: r107176
2005-11-18 12:50:22 +01:00
|
|
|
swap(__versa_string& __s)
|
2007-10-16 17:20:09 +02:00
|
|
|
#endif
|
rc_string_base.h (__rc_string_base<>::_Rep): Avoid the anonymous struct extension, adjust everywhere.
2005-11-18 Paolo Carlini <pcarlini@suse.de>
* include/ext/rc_string_base.h (__rc_string_base<>::_Rep): Avoid the
anonymous struct extension, adjust everywhere.
* include/ext/rc_string_base.h (__rc_string_base<>::_S_empty_rep()):
Just use a static member.
(__rc_string_base<>::__rc_string_base(), _S_construct): Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_Rep): Use anonymous
union together with _CharT to fix alignment issues, rebind to _Rep and
rename _Raw_alloc to _Rep_alloc_type.
(__rc_string_base<>::_Rep::_S_create, _M_destroy): Adjust consistently.
* include/ext/vstring_util.h (__is_null_p): Move inside struct
__vstring_utility as static _S_is_null_pointer.
* include/ext/sso_string.h
(__sso_string_base<>::_M_construct(std::forward_iterator_tag): Adjust.
* include/ext/rc_string_base.h
(__rc_string_base<>::_S_construct(std::forward_iterator_tag): Likewise.
Implement Option 3 of DR 431 for ext/vstring - both available bases.
* include/bits/cpp_type_traits.h (struct __is_empty): Add.
* include/ext/vstring.h (__versa_string<>::swap): Delegate to
this->_M_swap.
* include/ext/vstring.tcc (__versa_string<>::swap): Remove.
* include/ext/vstring_util.h (struct __vstring_utility<>): Add struct
_Alloc_hider<>, augmented of allocator swapping facility, specialized
to nop for empty allocators.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_swap): Use it.
(__rc_string_base<>::_M_is_leaked, _M_set_sharable): Change to private.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_swap):
Likewise.
(__sso_string_base<>::_M_is_leaked, _M_set_sharable): Remove, unused.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_data(_CharT*):
Return void.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_data(_CharT*):
Likewise.
From-SVN: r107176
2005-11-18 12:50:22 +01:00
|
|
|
{ this->_M_swap(__s); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
// String operations:
|
|
|
|
/**
|
|
|
|
* @brief Return const pointer to null-terminated contents.
|
|
|
|
*
|
|
|
|
* This is a handle to internal data. Do not modify or dire things may
|
|
|
|
* happen.
|
|
|
|
*/
|
|
|
|
const _CharT*
|
|
|
|
c_str() const
|
|
|
|
{ return this->_M_data(); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Return const pointer to contents.
|
|
|
|
*
|
|
|
|
* This is a handle to internal data. Do not modify or dire things may
|
|
|
|
* happen.
|
|
|
|
*/
|
|
|
|
const _CharT*
|
|
|
|
data() const
|
|
|
|
{ return this->_M_data(); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Return copy of allocator used to construct this string.
|
|
|
|
*/
|
|
|
|
allocator_type
|
|
|
|
get_allocator() const
|
2006-01-04 12:34:45 +01:00
|
|
|
{ return allocator_type(this->_M_get_allocator()); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a C substring.
|
|
|
|
* @param s C string to locate.
|
|
|
|
* @param pos Index of character to search from.
|
|
|
|
* @param n Number of characters from @a s to search for.
|
|
|
|
* @return Index of start of first occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches forward for the first @a n characters
|
|
|
|
* in @a s within this string. If found, returns the index where it
|
|
|
|
* begins. If not found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find(const _CharT* __s, size_type __pos, size_type __n) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a string.
|
|
|
|
* @param str String to locate.
|
|
|
|
* @param pos Index of character to search from (default 0).
|
|
|
|
* @return Index of start of first occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches forward for value of @a str within
|
|
|
|
* this string. If found, returns the index where it begins. If not
|
|
|
|
* found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find(const __versa_string& __str, size_type __pos = 0) const
|
|
|
|
{ return this->find(__str.data(), __pos, __str.size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a C string.
|
|
|
|
* @param s C string to locate.
|
|
|
|
* @param pos Index of character to search from (default 0).
|
|
|
|
* @return Index of start of first occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches forward for the value of @a s within
|
|
|
|
* this string. If found, returns the index where it begins. If not
|
|
|
|
* found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find(const _CharT* __s, size_type __pos = 0) const
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
|
|
|
return this->find(__s, __pos, traits_type::length(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a character.
|
|
|
|
* @param c Character to locate.
|
|
|
|
* @param pos Index of character to search from (default 0).
|
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches forward for @a c within this string.
|
|
|
|
* If found, returns the index where it was found. If not found,
|
|
|
|
* returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find(_CharT __c, size_type __pos = 0) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a string.
|
|
|
|
* @param str String to locate.
|
|
|
|
* @param pos Index of character to search back from (default end).
|
|
|
|
* @return Index of start of last occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches backward for value of @a str within
|
|
|
|
* this string. If found, returns the index where it begins. If not
|
|
|
|
* found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
rfind(const __versa_string& __str, size_type __pos = npos) const
|
|
|
|
{ return this->rfind(__str.data(), __pos, __str.size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a C substring.
|
|
|
|
* @param s C string to locate.
|
|
|
|
* @param pos Index of character to search back from.
|
|
|
|
* @param n Number of characters from s to search for.
|
|
|
|
* @return Index of start of last occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches backward for the first @a n
|
|
|
|
* characters in @a s within this string. If found, returns the index
|
|
|
|
* where it begins. If not found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
rfind(const _CharT* __s, size_type __pos, size_type __n) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a C string.
|
|
|
|
* @param s C string to locate.
|
2006-10-06 13:47:56 +02:00
|
|
|
* @param pos Index of character to start search at (default end).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of start of last occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches backward for the value of @a s within
|
|
|
|
* this string. If found, returns the index where it begins. If not
|
|
|
|
* found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
rfind(const _CharT* __s, size_type __pos = npos) const
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
|
|
|
return this->rfind(__s, __pos, traits_type::length(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a character.
|
|
|
|
* @param c Character to locate.
|
2006-10-06 13:47:56 +02:00
|
|
|
* @param pos Index of character to search back from (default end).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of last occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches backward for @a c within this string.
|
|
|
|
* If found, returns the index where it was found. If not found,
|
|
|
|
* returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
rfind(_CharT __c, size_type __pos = npos) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a character of string.
|
|
|
|
* @param str String containing characters to locate.
|
|
|
|
* @param pos Index of character to search from (default 0).
|
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches forward for one of the characters of
|
|
|
|
* @a str within this string. If found, returns the index where it was
|
|
|
|
* found. If not found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_first_of(const __versa_string& __str, size_type __pos = 0) const
|
|
|
|
{ return this->find_first_of(__str.data(), __pos, __str.size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a character of C substring.
|
|
|
|
* @param s String containing characters to locate.
|
2007-10-01 22:49:39 +02:00
|
|
|
* @param pos Index of character to search from.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @param n Number of characters from s to search for.
|
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches forward for one of the first @a n
|
|
|
|
* characters of @a s within this string. If found, returns the index
|
|
|
|
* where it was found. If not found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_first_of(const _CharT* __s, size_type __pos, size_type __n) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a character of C string.
|
|
|
|
* @param s String containing characters to locate.
|
|
|
|
* @param pos Index of character to search from (default 0).
|
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches forward for one of the characters of
|
|
|
|
* @a s within this string. If found, returns the index where it was
|
|
|
|
* found. If not found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_first_of(const _CharT* __s, size_type __pos = 0) const
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
|
|
|
return this->find_first_of(__s, __pos, traits_type::length(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a character.
|
|
|
|
* @param c Character to locate.
|
|
|
|
* @param pos Index of character to search from (default 0).
|
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches forward for the character @a c within
|
|
|
|
* this string. If found, returns the index where it was found. If
|
|
|
|
* not found, returns npos.
|
|
|
|
*
|
|
|
|
* Note: equivalent to find(c, pos).
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_first_of(_CharT __c, size_type __pos = 0) const
|
|
|
|
{ return this->find(__c, __pos); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a character of string.
|
|
|
|
* @param str String containing characters to locate.
|
|
|
|
* @param pos Index of character to search back from (default end).
|
|
|
|
* @return Index of last occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches backward for one of the characters of
|
|
|
|
* @a str within this string. If found, returns the index where it was
|
|
|
|
* found. If not found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_last_of(const __versa_string& __str, size_type __pos = npos) const
|
|
|
|
{ return this->find_last_of(__str.data(), __pos, __str.size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a character of C substring.
|
|
|
|
* @param s C string containing characters to locate.
|
2007-10-01 22:49:39 +02:00
|
|
|
* @param pos Index of character to search back from.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @param n Number of characters from s to search for.
|
|
|
|
* @return Index of last occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches backward for one of the first @a n
|
|
|
|
* characters of @a s within this string. If found, returns the index
|
|
|
|
* where it was found. If not found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_last_of(const _CharT* __s, size_type __pos, size_type __n) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a character of C string.
|
|
|
|
* @param s C string containing characters to locate.
|
|
|
|
* @param pos Index of character to search back from (default end).
|
|
|
|
* @return Index of last occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches backward for one of the characters of
|
|
|
|
* @a s within this string. If found, returns the index where it was
|
|
|
|
* found. If not found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_last_of(const _CharT* __s, size_type __pos = npos) const
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
|
|
|
return this->find_last_of(__s, __pos, traits_type::length(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a character.
|
|
|
|
* @param c Character to locate.
|
2007-10-01 22:49:39 +02:00
|
|
|
* @param pos Index of character to search back from (default end).
|
2005-07-06 01:07:18 +02:00
|
|
|
* @return Index of last occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches backward for @a c within this string.
|
|
|
|
* If found, returns the index where it was found. If not found,
|
|
|
|
* returns npos.
|
|
|
|
*
|
|
|
|
* Note: equivalent to rfind(c, pos).
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_last_of(_CharT __c, size_type __pos = npos) const
|
|
|
|
{ return this->rfind(__c, __pos); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a character not in string.
|
|
|
|
* @param str String containing characters to avoid.
|
|
|
|
* @param pos Index of character to search from (default 0).
|
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches forward for a character not contained
|
|
|
|
* in @a str within this string. If found, returns the index where it
|
|
|
|
* was found. If not found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_first_not_of(const __versa_string& __str, size_type __pos = 0) const
|
|
|
|
{ return this->find_first_not_of(__str.data(), __pos, __str.size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a character not in C substring.
|
|
|
|
* @param s C string containing characters to avoid.
|
2007-10-01 22:49:39 +02:00
|
|
|
* @param pos Index of character to search from.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @param n Number of characters from s to consider.
|
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches forward for a character not contained
|
|
|
|
* in the first @a n characters of @a s within this string. If found,
|
|
|
|
* returns the index where it was found. If not found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_first_not_of(const _CharT* __s, size_type __pos,
|
|
|
|
size_type __n) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a character not in C string.
|
|
|
|
* @param s C string containing characters to avoid.
|
|
|
|
* @param pos Index of character to search from (default 0).
|
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches forward for a character not contained
|
|
|
|
* in @a s within this string. If found, returns the index where it
|
|
|
|
* was found. If not found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_first_not_of(const _CharT* __s, size_type __pos = 0) const
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
|
|
|
return this->find_first_not_of(__s, __pos, traits_type::length(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find position of a different character.
|
|
|
|
* @param c Character to avoid.
|
|
|
|
* @param pos Index of character to search from (default 0).
|
|
|
|
* @return Index of first occurrence.
|
|
|
|
*
|
|
|
|
* Starting from @a pos, searches forward for a character other than @a c
|
|
|
|
* within this string. If found, returns the index where it was found.
|
|
|
|
* If not found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_first_not_of(_CharT __c, size_type __pos = 0) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a character not in string.
|
|
|
|
* @param str String containing characters to avoid.
|
2007-10-01 22:49:39 +02:00
|
|
|
* @param pos Index of character to search back from (default end).
|
|
|
|
* @return Index of last occurrence.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
|
|
|
* Starting from @a pos, searches backward for a character not
|
|
|
|
* contained in @a str within this string. If found, returns the index
|
|
|
|
* where it was found. If not found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_last_not_of(const __versa_string& __str,
|
|
|
|
size_type __pos = npos) const
|
|
|
|
{ return this->find_last_not_of(__str.data(), __pos, __str.size()); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a character not in C substring.
|
|
|
|
* @param s C string containing characters to avoid.
|
2007-10-01 22:49:39 +02:00
|
|
|
* @param pos Index of character to search back from.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @param n Number of characters from s to consider.
|
2007-10-01 22:49:39 +02:00
|
|
|
* @return Index of last occurrence.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
|
|
|
* Starting from @a pos, searches backward for a character not
|
|
|
|
* contained in the first @a n characters of @a s within this string.
|
|
|
|
* If found, returns the index where it was found. If not found,
|
|
|
|
* returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_last_not_of(const _CharT* __s, size_type __pos,
|
|
|
|
size_type __n) const;
|
|
|
|
/**
|
2007-10-01 22:49:39 +02:00
|
|
|
* @brief Find last position of a character not in C string.
|
2005-07-06 01:07:18 +02:00
|
|
|
* @param s C string containing characters to avoid.
|
2007-10-01 22:49:39 +02:00
|
|
|
* @param pos Index of character to search back from (default end).
|
|
|
|
* @return Index of last occurrence.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
|
|
|
* Starting from @a pos, searches backward for a character not
|
|
|
|
* contained in @a s within this string. If found, returns the index
|
|
|
|
* where it was found. If not found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_last_not_of(const _CharT* __s, size_type __pos = npos) const
|
|
|
|
{
|
|
|
|
__glibcxx_requires_string(__s);
|
|
|
|
return this->find_last_not_of(__s, __pos, traits_type::length(__s));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Find last position of a different character.
|
|
|
|
* @param c Character to avoid.
|
2007-10-01 22:49:39 +02:00
|
|
|
* @param pos Index of character to search back from (default end).
|
|
|
|
* @return Index of last occurrence.
|
2005-07-06 01:07:18 +02:00
|
|
|
*
|
|
|
|
* Starting from @a pos, searches backward for a character other than
|
|
|
|
* @a c within this string. If found, returns the index where it was
|
|
|
|
* found. If not found, returns npos.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
find_last_not_of(_CharT __c, size_type __pos = npos) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Get a substring.
|
|
|
|
* @param pos Index of first character (default 0).
|
|
|
|
* @param n Number of characters in substring (default remainder).
|
|
|
|
* @return The new string.
|
|
|
|
* @throw std::out_of_range If pos > size().
|
|
|
|
*
|
|
|
|
* Construct and return a new string using the @a n characters starting
|
|
|
|
* at @a pos. If the string is too short, use the remainder of the
|
|
|
|
* characters. If @a pos is beyond the end of the string, out_of_range
|
|
|
|
* is thrown.
|
|
|
|
*/
|
|
|
|
__versa_string
|
|
|
|
substr(size_type __pos = 0, size_type __n = npos) const
|
|
|
|
{
|
|
|
|
return __versa_string(*this, _M_check(__pos, "__versa_string::substr"),
|
|
|
|
__n);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Compare to a string.
|
|
|
|
* @param str String to compare against.
|
|
|
|
* @return Integer < 0, 0, or > 0.
|
|
|
|
*
|
|
|
|
* Returns an integer < 0 if this string is ordered before @a str, 0 if
|
|
|
|
* their values are equivalent, or > 0 if this string is ordered after
|
|
|
|
* @a str. Determines the effective length rlen of the strings to
|
|
|
|
* compare as the smallest of size() and str.size(). The function
|
|
|
|
* then compares the two strings by calling traits::compare(data(),
|
|
|
|
* str.data(),rlen). If the result of the comparison is nonzero returns
|
|
|
|
* it, otherwise the shorter one is ordered first.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
compare(const __versa_string& __str) const
|
|
|
|
{
|
2005-12-11 01:41:29 +01:00
|
|
|
if (this->_M_compare(__str))
|
|
|
|
return 0;
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
const size_type __size = this->size();
|
|
|
|
const size_type __osize = __str.size();
|
|
|
|
const size_type __len = std::min(__size, __osize);
|
|
|
|
|
|
|
|
int __r = traits_type::compare(this->_M_data(), __str.data(), __len);
|
|
|
|
if (!__r)
|
basic_string.h (basic_string<>::_S_compare): Add.
2007-01-18 Paolo Carlini <pcarlini@suse.de>
* include/bits/basic_string.h (basic_string<>::_S_compare): Add.
(compare(const basic_string&)): Use it.
* include/bits/basic_string.tcc (compare(size_type, size_type,
const basic_string&), compare(size_type, size_type,
const basic_string&, size_type, size_type), compare(const _CharT*),
compare(size_type, size_type, const _CharT*), compare(size_type,
size_type, const _CharT*, size_type)): Likewise.
* include/ext/vstring_util.h (__vstring_utility<>::_S_compare): Add.
* include/ext/vstring.h (compare(const __versa_string&)): Use it.
* include/ext/vstring.tcc (compare(size_type, size_type,
const __versa_string&), compare(size_type, size_type,
const __versa_string&, size_type, size_type), compare(const _CharT*),
compare(size_type, size_type, const _CharT*), compare(size_type,
size_type, const _CharT*, size_type)): Likewise.
From-SVN: r120896
2007-01-18 13:03:35 +01:00
|
|
|
__r = _S_compare(__size, __osize);
|
2005-07-06 01:07:18 +02:00
|
|
|
return __r;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Compare substring to a string.
|
|
|
|
* @param pos Index of first character of substring.
|
|
|
|
* @param n Number of characters in substring.
|
|
|
|
* @param str String to compare against.
|
|
|
|
* @return Integer < 0, 0, or > 0.
|
|
|
|
*
|
|
|
|
* Form the substring of this string from the @a n characters starting
|
|
|
|
* at @a pos. Returns an integer < 0 if the substring is ordered
|
|
|
|
* before @a str, 0 if their values are equivalent, or > 0 if the
|
|
|
|
* substring is ordered after @a str. Determines the effective length
|
|
|
|
* rlen of the strings to compare as the smallest of the length of the
|
|
|
|
* substring and @a str.size(). The function then compares the two
|
|
|
|
* strings by calling traits::compare(substring.data(),str.data(),rlen).
|
|
|
|
* If the result of the comparison is nonzero returns it, otherwise the
|
|
|
|
* shorter one is ordered first.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
compare(size_type __pos, size_type __n,
|
|
|
|
const __versa_string& __str) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Compare substring to a substring.
|
|
|
|
* @param pos1 Index of first character of substring.
|
|
|
|
* @param n1 Number of characters in substring.
|
|
|
|
* @param str String to compare against.
|
|
|
|
* @param pos2 Index of first character of substring of str.
|
|
|
|
* @param n2 Number of characters in substring of str.
|
|
|
|
* @return Integer < 0, 0, or > 0.
|
|
|
|
*
|
|
|
|
* Form the substring of this string from the @a n1 characters starting
|
|
|
|
* at @a pos1. Form the substring of @a str from the @a n2 characters
|
|
|
|
* starting at @a pos2. Returns an integer < 0 if this substring is
|
|
|
|
* ordered before the substring of @a str, 0 if their values are
|
|
|
|
* equivalent, or > 0 if this substring is ordered after the substring
|
|
|
|
* of @a str. Determines the effective length rlen of the strings
|
|
|
|
* to compare as the smallest of the lengths of the substrings. The
|
|
|
|
* function then compares the two strings by calling
|
|
|
|
* traits::compare(substring.data(),str.substr(pos2,n2).data(),rlen).
|
|
|
|
* If the result of the comparison is nonzero returns it, otherwise the
|
|
|
|
* shorter one is ordered first.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
compare(size_type __pos1, size_type __n1, const __versa_string& __str,
|
|
|
|
size_type __pos2, size_type __n2) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Compare to a C string.
|
|
|
|
* @param s C string to compare against.
|
|
|
|
* @return Integer < 0, 0, or > 0.
|
|
|
|
*
|
|
|
|
* Returns an integer < 0 if this string is ordered before @a s, 0 if
|
|
|
|
* their values are equivalent, or > 0 if this string is ordered after
|
|
|
|
* @a s. Determines the effective length rlen of the strings to
|
|
|
|
* compare as the smallest of size() and the length of a string
|
|
|
|
* constructed from @a s. The function then compares the two strings
|
|
|
|
* by calling traits::compare(data(),s,rlen). If the result of the
|
|
|
|
* comparison is nonzero returns it, otherwise the shorter one is
|
|
|
|
* ordered first.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
compare(const _CharT* __s) const;
|
|
|
|
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
|
|
// 5 String::compare specification questionable
|
|
|
|
/**
|
|
|
|
* @brief Compare substring to a C string.
|
|
|
|
* @param pos Index of first character of substring.
|
|
|
|
* @param n1 Number of characters in substring.
|
|
|
|
* @param s C string to compare against.
|
|
|
|
* @return Integer < 0, 0, or > 0.
|
|
|
|
*
|
|
|
|
* Form the substring of this string from the @a n1 characters starting
|
|
|
|
* at @a pos. Returns an integer < 0 if the substring is ordered
|
|
|
|
* before @a s, 0 if their values are equivalent, or > 0 if the
|
|
|
|
* substring is ordered after @a s. Determines the effective length
|
|
|
|
* rlen of the strings to compare as the smallest of the length of the
|
|
|
|
* substring and the length of a string constructed from @a s. The
|
|
|
|
* function then compares the two string by calling
|
|
|
|
* traits::compare(substring.data(),s,rlen). If the result of the
|
|
|
|
* comparison is nonzero returns it, otherwise the shorter one is
|
|
|
|
* ordered first.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
compare(size_type __pos, size_type __n1, const _CharT* __s) const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Compare substring against a character array.
|
|
|
|
* @param pos1 Index of first character of substring.
|
|
|
|
* @param n1 Number of characters in substring.
|
|
|
|
* @param s character array to compare against.
|
|
|
|
* @param n2 Number of characters of s.
|
|
|
|
* @return Integer < 0, 0, or > 0.
|
|
|
|
*
|
|
|
|
* Form the substring of this string from the @a n1 characters starting
|
|
|
|
* at @a pos1. Form a string from the first @a n2 characters of @a s.
|
|
|
|
* Returns an integer < 0 if this substring is ordered before the string
|
|
|
|
* from @a s, 0 if their values are equivalent, or > 0 if this substring
|
|
|
|
* is ordered after the string from @a s. Determines the effective
|
|
|
|
* length rlen of the strings to compare as the smallest of the length
|
|
|
|
* of the substring and @a n2. The function then compares the two
|
|
|
|
* strings by calling traits::compare(substring.data(),s,rlen). If the
|
|
|
|
* result of the comparison is nonzero returns it, otherwise the shorter
|
|
|
|
* one is ordered first.
|
|
|
|
*
|
|
|
|
* NB: s must have at least n2 characters, '\0' has no special
|
|
|
|
* meaning.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
compare(size_type __pos, size_type __n1, const _CharT* __s,
|
|
|
|
size_type __n2) const;
|
|
|
|
};
|
|
|
|
|
|
|
|
// operator+
|
|
|
|
/**
|
|
|
|
* @brief Concatenate two strings.
|
|
|
|
* @param lhs First string.
|
|
|
|
* @param rhs Last string.
|
|
|
|
* @return New string with value of @a lhs followed by @a rhs.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>
|
|
|
|
operator+(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs);
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Concatenate C string and string.
|
|
|
|
* @param lhs First string.
|
|
|
|
* @param rhs Last string.
|
|
|
|
* @return New string with value of @a lhs followed by @a rhs.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>
|
|
|
|
operator+(const _CharT* __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Concatenate character and string.
|
|
|
|
* @param lhs First string.
|
|
|
|
* @param rhs Last string.
|
|
|
|
* @return New string with @a lhs followed by @a rhs.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>
|
|
|
|
operator+(_CharT __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Concatenate string and C string.
|
|
|
|
* @param lhs First string.
|
|
|
|
* @param rhs Last string.
|
|
|
|
* @return New string with @a lhs followed by @a rhs.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>
|
2005-07-06 01:07:18 +02:00
|
|
|
operator+(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
const _CharT* __rhs);
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Concatenate string and character.
|
|
|
|
* @param lhs First string.
|
|
|
|
* @param rhs Last string.
|
|
|
|
* @return New string with @a lhs followed by @a rhs.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>
|
2005-07-06 01:07:18 +02:00
|
|
|
operator+(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
vstring.h (__versa_string<>::operator+, [...]): Move out of line...
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::operator+, all
versions): Move out of line...
* include/ext/vstring.tcc (__versa_string<>::operator+): ...
here; consistently use reserve for the benefit of sso_string_base;
prefer push_back to single-char append when appropriate.
* include/ext/vstring.h (__versa_string<>::push_back): Don't
call _M_reserve, _M_mutate instead.
(reserve): Just forward to _M_reserve.
* include/ext/vstring.tcc (__versa_string<>::_M_reserve): Remove.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve): Also
do the initial checks (first on length, in case __res == capacity).
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve:
Likewise; don't call _M_set_length unnecessarily.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.h (__versa_string<>::_M_append): New.
(append(const __versa_string&), append(const __versa_string&,
size_type, size_type), append(const _CharT*, size_type),
append(const _CharT*)): Use it.
(append(size_type, _CharT)): Delegate to _M_replace_aux.
(assign(const __versa_string&, size_type, size_type),
assign(const _CharT*), replace(size_type, size_type,
const _CharT*, size_type)): Forward to _M_replace.
* include/ext/vstring.tcc (__versa_string<>::_M_append):
Define, core append functionality.
(_M_replace): Simplify, move __s == 0 case to _M_replace_aux.
(_M_replace_aux): Reorganize, don't call _M_replace.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/vstring.tcc (__versa_string<>::_M_replace):
Perform _M_check_length at the beginning and remove it from ...
(replace, _M_replace_dispatch, _M_replace_aux, assign): ... here.
(assign): Now move inline.
(resize): Don't call _M_check_length redundantly, append does.
2005-12-04 Paolo Carlini <pcarlini@suse.de>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_get_allocator):
Add non const version.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_get_allocator):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_erase): Add.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_erase): Likewise.
(_M_leak_hard): Use it.
* include/ext/vstring.h (__versa_string<>::clear, erase, all
versions): Use it.
* include/ext/vstring.tcc (__versa_string<>::resize): Likewise.
* include/ext/vstring.h (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.h (__versa_string<>::_M_replace): New, does
the in-place work or delegates to _M_mutate in case of reallocation.
* include/ext/vstring.tcc (__versa_string<>::_M_replace_safe):
Remove.
* include/ext/vstring.tcc (__versa_string<>::_M_replace): Define.
(assign, replace, _M_replace_dispatch, _M_replace_aux): Use it.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_mutate):
Change to manage only reallocations.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_mutate):
Likewise.
* include/ext/vstring.h (__versa_string<>::insert(size_type,
const __versa_string&), insert(size_type, const __versa_string&,
size_type, size_type), insert(size_type, const _CharT*, size_type),
insert(size_type, const _CharT*)): Delegate to replace.
* include/ext/vstring.h (__versa_string<>::reserve): Move out of
line.
* include/ext/vstring.tcc (__versa_string<>::reserve): Do the
checks and call _M_reserve.
* include/ext/vstring.h (__versa_string<>::append): Call _M_reserve
instead of reserve.
* include/ext/vstring.tcc (__versa_string<>::append, all versions):
Likewise.
* include/ext/sso_string_base.h (__sso_string_base<>::_M_reserve):
Adjust.
* include/ext/rc_string_base.h (__rc_string_base<>::_M_reserve):
Likewise.
From-SVN: r108034
2005-12-05 01:32:31 +01:00
|
|
|
_CharT __rhs);
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
// operator ==
|
|
|
|
/**
|
|
|
|
* @brief Test equivalence of two strings.
|
|
|
|
* @param lhs First string.
|
|
|
|
* @param rhs Second string.
|
|
|
|
* @return True if @a lhs.compare(@a rhs) == 0. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator==(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) == 0; }
|
|
|
|
|
2007-07-27 19:25:04 +02:00
|
|
|
template<typename _CharT,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline typename __enable_if<std::__is_char<_CharT>::__value, bool>::__type
|
|
|
|
operator==(const __versa_string<_CharT, std::char_traits<_CharT>,
|
|
|
|
std::allocator<_CharT>, _Base>& __lhs,
|
|
|
|
const __versa_string<_CharT, std::char_traits<_CharT>,
|
|
|
|
std::allocator<_CharT>, _Base>& __rhs)
|
|
|
|
{ return (__lhs.size() == __rhs.size()
|
|
|
|
&& !std::char_traits<_CharT>::compare(__lhs.data(), __rhs.data(),
|
|
|
|
__lhs.size())); }
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Test equivalence of C string and string.
|
|
|
|
* @param lhs C string.
|
|
|
|
* @param rhs String.
|
|
|
|
* @return True if @a rhs.compare(@a lhs) == 0. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator==(const _CharT* __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __rhs.compare(__lhs) == 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test equivalence of string and C string.
|
|
|
|
* @param lhs String.
|
|
|
|
* @param rhs C string.
|
|
|
|
* @return True if @a lhs.compare(@a rhs) == 0. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator==(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const _CharT* __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) == 0; }
|
|
|
|
|
|
|
|
// operator !=
|
|
|
|
/**
|
|
|
|
* @brief Test difference of two strings.
|
|
|
|
* @param lhs First string.
|
|
|
|
* @param rhs Second string.
|
|
|
|
* @return True if @a lhs.compare(@a rhs) != 0. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator!=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
2007-07-27 19:25:04 +02:00
|
|
|
{ return !(__lhs == __rhs); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test difference of C string and string.
|
|
|
|
* @param lhs C string.
|
|
|
|
* @param rhs String.
|
|
|
|
* @return True if @a rhs.compare(@a lhs) != 0. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator!=(const _CharT* __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
2007-07-27 19:25:04 +02:00
|
|
|
{ return !(__lhs == __rhs); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test difference of string and C string.
|
|
|
|
* @param lhs String.
|
|
|
|
* @param rhs C string.
|
|
|
|
* @return True if @a lhs.compare(@a rhs) != 0. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator!=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const _CharT* __rhs)
|
2007-07-27 19:25:04 +02:00
|
|
|
{ return !(__lhs == __rhs); }
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
// operator <
|
|
|
|
/**
|
|
|
|
* @brief Test if string precedes string.
|
|
|
|
* @param lhs First string.
|
|
|
|
* @param rhs Second string.
|
|
|
|
* @return True if @a lhs precedes @a rhs. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator<(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) < 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test if string precedes C string.
|
|
|
|
* @param lhs String.
|
|
|
|
* @param rhs C string.
|
|
|
|
* @return True if @a lhs precedes @a rhs. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator<(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const _CharT* __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) < 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test if C string precedes string.
|
|
|
|
* @param lhs C string.
|
|
|
|
* @param rhs String.
|
|
|
|
* @return True if @a lhs precedes @a rhs. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator<(const _CharT* __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __rhs.compare(__lhs) > 0; }
|
|
|
|
|
|
|
|
// operator >
|
|
|
|
/**
|
|
|
|
* @brief Test if string follows string.
|
|
|
|
* @param lhs First string.
|
|
|
|
* @param rhs Second string.
|
|
|
|
* @return True if @a lhs follows @a rhs. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator>(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) > 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test if string follows C string.
|
|
|
|
* @param lhs String.
|
|
|
|
* @param rhs C string.
|
|
|
|
* @return True if @a lhs follows @a rhs. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator>(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const _CharT* __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) > 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test if C string follows string.
|
|
|
|
* @param lhs C string.
|
|
|
|
* @param rhs String.
|
|
|
|
* @return True if @a lhs follows @a rhs. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator>(const _CharT* __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __rhs.compare(__lhs) < 0; }
|
|
|
|
|
|
|
|
// operator <=
|
|
|
|
/**
|
|
|
|
* @brief Test if string doesn't follow string.
|
|
|
|
* @param lhs First string.
|
|
|
|
* @param rhs Second string.
|
|
|
|
* @return True if @a lhs doesn't follow @a rhs. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator<=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) <= 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test if string doesn't follow C string.
|
|
|
|
* @param lhs String.
|
|
|
|
* @param rhs C string.
|
|
|
|
* @return True if @a lhs doesn't follow @a rhs. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator<=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const _CharT* __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) <= 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test if C string doesn't follow string.
|
|
|
|
* @param lhs C string.
|
|
|
|
* @param rhs String.
|
|
|
|
* @return True if @a lhs doesn't follow @a rhs. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator<=(const _CharT* __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __rhs.compare(__lhs) >= 0; }
|
|
|
|
|
|
|
|
// operator >=
|
|
|
|
/**
|
|
|
|
* @brief Test if string doesn't precede string.
|
|
|
|
* @param lhs First string.
|
|
|
|
* @param rhs Second string.
|
|
|
|
* @return True if @a lhs doesn't precede @a rhs. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator>=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) >= 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test if string doesn't precede C string.
|
|
|
|
* @param lhs String.
|
|
|
|
* @param rhs C string.
|
|
|
|
* @return True if @a lhs doesn't precede @a rhs. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator>=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
const _CharT* __rhs)
|
|
|
|
{ return __lhs.compare(__rhs) >= 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Test if C string doesn't precede string.
|
|
|
|
* @param lhs C string.
|
|
|
|
* @param rhs String.
|
|
|
|
* @return True if @a lhs doesn't precede @a rhs. False otherwise.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline bool
|
|
|
|
operator>=(const _CharT* __lhs,
|
|
|
|
const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ return __rhs.compare(__lhs) <= 0; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Swap contents of two strings.
|
|
|
|
* @param lhs First string.
|
|
|
|
* @param rhs Second string.
|
|
|
|
*
|
|
|
|
* Exchanges the contents of @a lhs and @a rhs in constant time.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline void
|
|
|
|
swap(__versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ __lhs.swap(__rhs); }
|
|
|
|
|
2007-10-16 17:20:09 +02:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline void
|
|
|
|
swap(__versa_string<_CharT, _Traits, _Alloc, _Base>&& __lhs,
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
|
|
|
|
{ __lhs.swap(__rhs); }
|
|
|
|
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline void
|
|
|
|
swap(__versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc, _Base>&& __rhs)
|
|
|
|
{ __lhs.swap(__rhs); }
|
|
|
|
#endif
|
|
|
|
|
2005-12-19 01:56:05 +01:00
|
|
|
_GLIBCXX_END_NAMESPACE
|
|
|
|
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE(std)
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Read stream into a string.
|
|
|
|
* @param is Input stream.
|
|
|
|
* @param str Buffer to store into.
|
|
|
|
* @return Reference to the input stream.
|
|
|
|
*
|
|
|
|
* Stores characters from @a is into @a str until whitespace is found, the
|
|
|
|
* end of the stream is encountered, or str.max_size() is reached. If
|
|
|
|
* is.width() is non-zero, that is the limit on the number of characters
|
|
|
|
* stored into @a str. Any previous contents of @a str are erased.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
basic_istream<_CharT, _Traits>&
|
|
|
|
operator>>(basic_istream<_CharT, _Traits>& __is,
|
|
|
|
__gnu_cxx::__versa_string<_CharT, _Traits,
|
|
|
|
_Alloc, _Base>& __str);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Write string to a stream.
|
|
|
|
* @param os Output stream.
|
|
|
|
* @param str String to write out.
|
|
|
|
* @return Reference to the output stream.
|
|
|
|
*
|
|
|
|
* Output characters of @a str into os following the same rules as for
|
|
|
|
* writing a C string.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
PR libstdc++/28277 (partial: vstring bits)
2007-04-10 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/28277 (partial: vstring bits)
* include/bits/ostream_insert.h: New.
* include/Makefile.am: Add.
* include/ext/vstring.h (operator<<(basic_ostream<>&,
const __versa_string<>&): Forward to __ostream_insert.
* include/bits/basic_string.h (operator<<(basic_ostream<>&,
const string<>&)): Likewise.
* include/std/ostream (operator<<(basic_ostream<>&, _CharT),
operator<<(basic_ostream<char,>&, char), operator<<(basic_ostream<>&,
const _CharT*), operator<<(basic_ostream<char,>&, const char*)):
Likewise.
* include/ext/vstring.tcc (operator<<(basic_ostream<>&,
const __versa_string<>&)): Remove.
(class basic_ostream): Remove friend declarations.
(basic_ostream<>::_M_write(char_type, streamsize),
_M_insert(const char_type*, streamsize)): Remove.
* include/bits/ostream.tcc (_M_insert(const char_type*, streamsize)):
Remove definition.
(operator<<(basic_ostream<>&, const char*)): Use __ostream_insert.
* config/abi/pre/gnu.ver: Adjust.
* src/ostream-inst.cc: Add __ostream_insert instantiations.
* include/bits/locale_facets.h (__pad<>::_S_pad): Remove __num
parameter.
* include/bits/locale_facets.tcc (__pad<>::_S_pad): Adjust.
(num_put<>::_M_pad(_CharT, streamsize, ios_base&, _CharT*,
const _CharT*, int&)): Likewise.
* include/Makefile.in: Rebuild.
* testsuite/ext/vstring/inserters_extractors/char/28277.cc: New.
* testsuite/ext/vstring/inserters_extractors/wchar_t/28277.cc: New.
* include/ext/vstring_util.h: Do not include the whole <locale>.
* include/ext/vstring.tcc (operator>>(basic_istream<>&,
__versa_string<>&, getline(basic_istream<>&, __versa_string<>&,
_CharT)): Tweak to refer to ios_base as a base of istream; do not
refer to non-standard types of istream.
* include/bits/istream.tcc (operator>>(basic_istream<>&, _CharT*),
ws(basic_istream<>&)): Do not refer to non-standard types of istream.
* include/std/bitset (operator>>(std::basic_istream<>&, bitset<>&)):
Avoid using basic_streambuf<>*.
* include/bits/istream.tcc (operator>>(basic_istream<>&,
basic_string<>&), getline(basic_istream<>&, basic_string<>&, _CharT)):
Move...
* include/bits/basic_string.tcc: ... here; tweak to refer to ios_base
as a base of istream; do not refer to non-standard types of istream.
* include/std/string: Tweak includes.
* include/ext/type_traits.h (__is_null_pointer): Add.
* include/ext/rc_string_base.h: Use it.
* include/ext/sso_string_base.h: Likewise.
* include/bits/basic_string.tcc (__is_null_pointer): Remove, use
the above.
* include/ext/vstring_util.h (__vstring_utility<>::_S_is_null_pointer):
Remove.
From-SVN: r123692
2007-04-10 12:38:50 +02:00
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline basic_ostream<_CharT, _Traits>&
|
2005-07-06 01:07:18 +02:00
|
|
|
operator<<(basic_ostream<_CharT, _Traits>& __os,
|
PR libstdc++/28277 (partial: vstring bits)
2007-04-10 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/28277 (partial: vstring bits)
* include/bits/ostream_insert.h: New.
* include/Makefile.am: Add.
* include/ext/vstring.h (operator<<(basic_ostream<>&,
const __versa_string<>&): Forward to __ostream_insert.
* include/bits/basic_string.h (operator<<(basic_ostream<>&,
const string<>&)): Likewise.
* include/std/ostream (operator<<(basic_ostream<>&, _CharT),
operator<<(basic_ostream<char,>&, char), operator<<(basic_ostream<>&,
const _CharT*), operator<<(basic_ostream<char,>&, const char*)):
Likewise.
* include/ext/vstring.tcc (operator<<(basic_ostream<>&,
const __versa_string<>&)): Remove.
(class basic_ostream): Remove friend declarations.
(basic_ostream<>::_M_write(char_type, streamsize),
_M_insert(const char_type*, streamsize)): Remove.
* include/bits/ostream.tcc (_M_insert(const char_type*, streamsize)):
Remove definition.
(operator<<(basic_ostream<>&, const char*)): Use __ostream_insert.
* config/abi/pre/gnu.ver: Adjust.
* src/ostream-inst.cc: Add __ostream_insert instantiations.
* include/bits/locale_facets.h (__pad<>::_S_pad): Remove __num
parameter.
* include/bits/locale_facets.tcc (__pad<>::_S_pad): Adjust.
(num_put<>::_M_pad(_CharT, streamsize, ios_base&, _CharT*,
const _CharT*, int&)): Likewise.
* include/Makefile.in: Rebuild.
* testsuite/ext/vstring/inserters_extractors/char/28277.cc: New.
* testsuite/ext/vstring/inserters_extractors/wchar_t/28277.cc: New.
* include/ext/vstring_util.h: Do not include the whole <locale>.
* include/ext/vstring.tcc (operator>>(basic_istream<>&,
__versa_string<>&, getline(basic_istream<>&, __versa_string<>&,
_CharT)): Tweak to refer to ios_base as a base of istream; do not
refer to non-standard types of istream.
* include/bits/istream.tcc (operator>>(basic_istream<>&, _CharT*),
ws(basic_istream<>&)): Do not refer to non-standard types of istream.
* include/std/bitset (operator>>(std::basic_istream<>&, bitset<>&)):
Avoid using basic_streambuf<>*.
* include/bits/istream.tcc (operator>>(basic_istream<>&,
basic_string<>&), getline(basic_istream<>&, basic_string<>&, _CharT)):
Move...
* include/bits/basic_string.tcc: ... here; tweak to refer to ios_base
as a base of istream; do not refer to non-standard types of istream.
* include/std/string: Tweak includes.
* include/ext/type_traits.h (__is_null_pointer): Add.
* include/ext/rc_string_base.h: Use it.
* include/ext/sso_string_base.h: Likewise.
* include/bits/basic_string.tcc (__is_null_pointer): Remove, use
the above.
* include/ext/vstring_util.h (__vstring_utility<>::_S_is_null_pointer):
Remove.
From-SVN: r123692
2007-04-10 12:38:50 +02:00
|
|
|
const __gnu_cxx::__versa_string<_CharT, _Traits, _Alloc,
|
|
|
|
_Base>& __str)
|
|
|
|
{
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
|
|
// 586. string inserter not a formatted function
|
|
|
|
return __ostream_insert(__os, __str.data(), __str.size());
|
|
|
|
}
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Read a line from stream into a string.
|
|
|
|
* @param is Input stream.
|
|
|
|
* @param str Buffer to store into.
|
|
|
|
* @param delim Character marking end of line.
|
|
|
|
* @return Reference to the input stream.
|
|
|
|
*
|
|
|
|
* Stores characters from @a is into @a str until @a delim is found, the
|
|
|
|
* end of the stream is encountered, or str.max_size() is reached. If
|
|
|
|
* is.width() is non-zero, that is the limit on the number of characters
|
|
|
|
* stored into @a str. Any previous contents of @a str are erased. If @a
|
|
|
|
* delim was encountered, it is extracted but not stored into @a str.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
basic_istream<_CharT, _Traits>&
|
|
|
|
getline(basic_istream<_CharT, _Traits>& __is,
|
|
|
|
__gnu_cxx::__versa_string<_CharT, _Traits, _Alloc, _Base>& __str,
|
|
|
|
_CharT __delim);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Read a line from stream into a string.
|
|
|
|
* @param is Input stream.
|
|
|
|
* @param str Buffer to store into.
|
|
|
|
* @return Reference to the input stream.
|
|
|
|
*
|
|
|
|
* Stores characters from is into @a str until '\n' is found, the end of
|
|
|
|
* the stream is encountered, or str.max_size() is reached. If is.width()
|
|
|
|
* is non-zero, that is the limit on the number of characters stored into
|
|
|
|
* @a str. Any previous contents of @a str are erased. If end of line was
|
|
|
|
* encountered, it is extracted but not stored into @a str.
|
|
|
|
*/
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc,
|
|
|
|
template <typename, typename, typename> class _Base>
|
|
|
|
inline basic_istream<_CharT, _Traits>&
|
|
|
|
getline(basic_istream<_CharT, _Traits>& __is,
|
|
|
|
__gnu_cxx::__versa_string<_CharT, _Traits, _Alloc, _Base>& __str)
|
|
|
|
{ return getline(__is, __str, __is.widen('\n')); }
|
|
|
|
|
2005-12-19 01:56:05 +01:00
|
|
|
_GLIBCXX_END_NAMESPACE
|
2005-07-06 01:07:18 +02:00
|
|
|
|
2008-06-29 17:46:50 +02:00
|
|
|
#if (defined(__GXX_EXPERIMENTAL_CXX0X__) && defined(_GLIBCXX_USE_C99))
|
|
|
|
|
|
|
|
#include <ext/string_conversions.h>
|
|
|
|
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
|
|
|
|
|
|
|
|
// 21.4 Numeric Conversions [string.conversions].
|
|
|
|
inline int
|
|
|
|
stoi(const __vstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa<long, int>(&std::strtol, "stoi", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
inline long
|
|
|
|
stol(const __vstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::strtol, "stol", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
inline unsigned long
|
|
|
|
stoul(const __vstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::strtoul, "stoul", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
inline long long
|
|
|
|
stoll(const __vstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::strtoll, "stoll", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
inline unsigned long long
|
|
|
|
stoull(const __vstring& __str, std::size_t* __idx, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::strtoull, "stoull", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
// NB: strtof vs strtod.
|
|
|
|
inline float
|
|
|
|
stof(const __vstring& __str, std::size_t* __idx = 0)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::strtof, "stof", __str.c_str(), __idx); }
|
|
|
|
|
|
|
|
inline double
|
|
|
|
stod(const __vstring& __str, std::size_t* __idx = 0)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::strtod, "stod", __str.c_str(), __idx); }
|
|
|
|
|
|
|
|
inline long double
|
|
|
|
stold(const __vstring& __str, std::size_t* __idx = 0)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::strtold, "stold", __str.c_str(), __idx); }
|
|
|
|
|
|
|
|
// NB: (v)snprintf vs sprintf.
|
|
|
|
inline __vstring
|
|
|
|
to_string(long long __val)
|
|
|
|
{ return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf,
|
|
|
|
4 * sizeof(long long),
|
|
|
|
"%lld", __val); }
|
|
|
|
|
|
|
|
inline __vstring
|
|
|
|
to_string(unsigned long long __val)
|
|
|
|
{ return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf,
|
|
|
|
4 * sizeof(unsigned long long),
|
|
|
|
"%llu", __val); }
|
|
|
|
|
|
|
|
inline __vstring
|
|
|
|
to_string(long double __val)
|
|
|
|
{
|
|
|
|
const int __n = __numeric_traits<long double>::__max_exponent10 + 20;
|
|
|
|
return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf, __n,
|
|
|
|
"%Lf", __val);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef _GLIBCXX_USE_WCHAR_T
|
|
|
|
inline int
|
|
|
|
stoi(const __wvstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa<long, int>(&std::wcstol, "stoi", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
inline long
|
|
|
|
stol(const __wvstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::wcstol, "stol", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
inline unsigned long
|
|
|
|
stoul(const __wvstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::wcstoul, "stoul", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
inline long long
|
|
|
|
stoll(const __wvstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::wcstoll, "stoll", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
inline unsigned long long
|
|
|
|
stoull(const __wvstring& __str, std::size_t* __idx = 0, int __base = 10)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::wcstoull, "stoull", __str.c_str(),
|
|
|
|
__idx, __base); }
|
|
|
|
|
|
|
|
// NB: wcstof vs wcstod.
|
|
|
|
inline float
|
|
|
|
stof(const __wvstring& __str, std::size_t* __idx = 0)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::wcstof, "stof", __str.c_str(), __idx); }
|
|
|
|
|
|
|
|
inline double
|
|
|
|
stod(const __wvstring& __str, std::size_t* __idx = 0)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::wcstod, "stod", __str.c_str(), __idx); }
|
|
|
|
|
|
|
|
inline long double
|
|
|
|
stold(const __wvstring& __str, std::size_t* __idx = 0)
|
|
|
|
{ return __gnu_cxx::__stoa(&std::wcstold, "stold", __str.c_str(), __idx); }
|
|
|
|
|
|
|
|
inline __wvstring
|
|
|
|
to_wstring(long long __val)
|
|
|
|
{ return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf,
|
|
|
|
4 * sizeof(long long),
|
|
|
|
L"%lld", __val); }
|
|
|
|
|
|
|
|
inline __wvstring
|
|
|
|
to_wstring(unsigned long long __val)
|
|
|
|
{ return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf,
|
|
|
|
4 * sizeof(unsigned long long),
|
|
|
|
L"%llu", __val); }
|
|
|
|
|
|
|
|
inline __wvstring
|
|
|
|
to_wstring(long double __val)
|
|
|
|
{
|
|
|
|
const int __n = __numeric_traits<long double>::__max_exponent10 + 20;
|
|
|
|
return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf, __n,
|
|
|
|
L"%Lf", __val);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
_GLIBCXX_END_NAMESPACE
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
#ifndef _GLIBCXX_EXPORT_TEMPLATE
|
|
|
|
# include "vstring.tcc"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif /* _VSTRING_H */
|