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
|
|
|
// Versatile string utility -*- C++ -*-
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
// Copyright (C) 2005 Free Software Foundation, Inc.
|
|
|
|
//
|
|
|
|
// 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_util.h
|
|
|
|
* This file is a GNU extension to the Standard C++ Library.
|
|
|
|
* This is an internal header file, included by other library headers.
|
|
|
|
* You should not attempt to use it directly.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _VSTRING_UTIL_H
|
|
|
|
#define _VSTRING_UTIL_H 1
|
|
|
|
|
|
|
|
#pragma GCC system_header
|
|
|
|
|
|
|
|
#include <ext/vstring_fwd.h>
|
|
|
|
#include <debug/debug.h>
|
|
|
|
#include <bits/stl_function.h> // For less
|
|
|
|
#include <bits/functexcept.h>
|
|
|
|
#include <locale>
|
|
|
|
#include <algorithm> // For std::distance, srd::search.
|
|
|
|
|
2005-12-19 01:56:05 +01:00
|
|
|
_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc>
|
|
|
|
struct __vstring_utility
|
|
|
|
{
|
|
|
|
typedef typename _Alloc::template rebind<_CharT>::other _CharT_alloc_type;
|
|
|
|
|
|
|
|
typedef _Traits traits_type;
|
|
|
|
typedef typename _Traits::char_type value_type;
|
|
|
|
typedef typename _CharT_alloc_type::size_type size_type;
|
|
|
|
typedef typename _CharT_alloc_type::pointer pointer;
|
|
|
|
typedef typename _CharT_alloc_type::const_pointer const_pointer;
|
|
|
|
|
|
|
|
// For __sso_string.
|
|
|
|
typedef __gnu_cxx::
|
|
|
|
__normal_iterator<pointer, __gnu_cxx::
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc,
|
|
|
|
__sso_string_base> >
|
|
|
|
__sso_iterator;
|
|
|
|
typedef __gnu_cxx::
|
|
|
|
__normal_iterator<const_pointer, __gnu_cxx::
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc,
|
|
|
|
__sso_string_base> >
|
|
|
|
__const_sso_iterator;
|
|
|
|
|
|
|
|
// For __rc_string.
|
|
|
|
typedef __gnu_cxx::
|
|
|
|
__normal_iterator<pointer, __gnu_cxx::
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc,
|
|
|
|
__rc_string_base> >
|
|
|
|
__rc_iterator;
|
|
|
|
typedef __gnu_cxx::
|
|
|
|
__normal_iterator<const_pointer, __gnu_cxx::
|
|
|
|
__versa_string<_CharT, _Traits, _Alloc,
|
|
|
|
__rc_string_base> >
|
|
|
|
__const_rc_iterator;
|
|
|
|
|
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
|
|
|
// NB: When the allocator is empty, deriving from it saves space
|
|
|
|
// (http://www.cantrip.org/emptyopt.html). We do that anyway for
|
|
|
|
// consistency.
|
|
|
|
template<typename _Alloc1, bool = std::__is_empty<_Alloc1>::__value>
|
|
|
|
struct _Alloc_hider
|
|
|
|
: public _Alloc1
|
|
|
|
{
|
|
|
|
_Alloc_hider(const _Alloc1& __a, _CharT* __ptr)
|
|
|
|
: _Alloc1(__a), _M_p(__ptr) { }
|
|
|
|
|
|
|
|
void
|
|
|
|
_M_alloc_swap(_Alloc_hider& __ah)
|
|
|
|
{
|
|
|
|
// Implement Option 3 of DR 431 (see N1599).
|
|
|
|
// Precondition: swappable allocators.
|
|
|
|
_Alloc1& __this = static_cast<_Alloc1&>(*this);
|
|
|
|
_Alloc1& __that = static_cast<_Alloc1&>(__ah);
|
|
|
|
if (__this != __that)
|
|
|
|
swap(__this, __that);
|
|
|
|
}
|
|
|
|
|
|
|
|
_CharT* _M_p; // The actual data.
|
|
|
|
};
|
|
|
|
|
|
|
|
template<typename _Alloc1>
|
|
|
|
struct _Alloc_hider<_Alloc1, true>
|
|
|
|
: public _Alloc1
|
|
|
|
{
|
|
|
|
_Alloc_hider(const _Alloc1& __a, _CharT* __ptr)
|
|
|
|
: _Alloc1(__a), _M_p(__ptr) { }
|
|
|
|
|
|
|
|
void _M_alloc_swap(_Alloc_hider&) { }
|
|
|
|
|
|
|
|
_CharT* _M_p; // The actual data.
|
|
|
|
};
|
|
|
|
|
|
|
|
// For use in _M_construct (_S_construct) forward_iterator_tag.
|
|
|
|
template<typename _Type>
|
|
|
|
static bool
|
|
|
|
_S_is_null_pointer(_Type* __ptr)
|
|
|
|
{ return __ptr == 0; }
|
|
|
|
|
|
|
|
template<typename _Type>
|
|
|
|
static bool
|
|
|
|
_S_is_null_pointer(_Type)
|
|
|
|
{ return false; }
|
|
|
|
|
2005-07-06 01:07:18 +02:00
|
|
|
// When __n = 1 way faster than the general multichar
|
|
|
|
// traits_type::copy/move/assign.
|
|
|
|
static void
|
|
|
|
_S_copy(_CharT* __d, const _CharT* __s, size_type __n)
|
|
|
|
{
|
|
|
|
if (__n == 1)
|
|
|
|
traits_type::assign(*__d, *__s);
|
|
|
|
else
|
|
|
|
traits_type::copy(__d, __s, __n);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_S_move(_CharT* __d, const _CharT* __s, size_type __n)
|
|
|
|
{
|
|
|
|
if (__n == 1)
|
|
|
|
traits_type::assign(*__d, *__s);
|
|
|
|
else
|
|
|
|
traits_type::move(__d, __s, __n);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_S_assign(_CharT* __d, size_type __n, _CharT __c)
|
|
|
|
{
|
|
|
|
if (__n == 1)
|
|
|
|
traits_type::assign(*__d, __c);
|
|
|
|
else
|
|
|
|
traits_type::assign(__d, __n, __c);
|
|
|
|
}
|
|
|
|
|
|
|
|
// _S_copy_chars is a separate template to permit specialization
|
|
|
|
// to optimize for the common case of pointers as iterators.
|
2005-11-21 19:38:05 +01:00
|
|
|
template<typename _Iterator>
|
2005-07-06 01:07:18 +02:00
|
|
|
static void
|
|
|
|
_S_copy_chars(_CharT* __p, _Iterator __k1, _Iterator __k2)
|
|
|
|
{
|
|
|
|
for (; __k1 != __k2; ++__k1, ++__p)
|
|
|
|
traits_type::assign(*__p, *__k1); // These types are off.
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_S_copy_chars(_CharT* __p, __sso_iterator __k1, __sso_iterator __k2)
|
|
|
|
{ _S_copy_chars(__p, __k1.base(), __k2.base()); }
|
|
|
|
|
|
|
|
static void
|
|
|
|
_S_copy_chars(_CharT* __p, __const_sso_iterator __k1,
|
|
|
|
__const_sso_iterator __k2)
|
|
|
|
{ _S_copy_chars(__p, __k1.base(), __k2.base()); }
|
|
|
|
|
|
|
|
static void
|
|
|
|
_S_copy_chars(_CharT* __p, __rc_iterator __k1, __rc_iterator __k2)
|
|
|
|
{ _S_copy_chars(__p, __k1.base(), __k2.base()); }
|
|
|
|
|
|
|
|
static void
|
|
|
|
_S_copy_chars(_CharT* __p, __const_rc_iterator __k1,
|
|
|
|
__const_rc_iterator __k2)
|
|
|
|
{ _S_copy_chars(__p, __k1.base(), __k2.base()); }
|
|
|
|
|
|
|
|
static void
|
|
|
|
_S_copy_chars(_CharT* __p, _CharT* __k1, _CharT* __k2)
|
|
|
|
{ _S_copy(__p, __k1, __k2 - __k1); }
|
|
|
|
|
|
|
|
static void
|
|
|
|
_S_copy_chars(_CharT* __p, const _CharT* __k1, const _CharT* __k2)
|
|
|
|
{ _S_copy(__p, __k1, __k2 - __k1); }
|
|
|
|
};
|
2005-12-19 01:56:05 +01:00
|
|
|
|
|
|
|
_GLIBCXX_END_NAMESPACE
|
2005-07-06 01:07:18 +02:00
|
|
|
|
|
|
|
#endif /* _VSTRING_UTIL_H */
|