mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-26 02:59:04 +08:00
8f7a401515
2002-01-16 Benjamin Kosnik <bkoz@redhat.com>
Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
* include/bits/stl_iterator.h (reverse_iterator::_M_current):
Deuglify, should be current.
(back_insert_iterator::_M_container): Deuglify, should be container.
(front_insert_iterator::_M_container): Same.
(insert_iterator::_M_container): Same.
* testsuite/24_iterators/reverse_iterator.cc: Add check.
* testsuite/24_iterators/back_insert_iterator.cc: Add check.
* testsuite/24_iterators/front_insert_iterator.cc: Same.
* testsuite/24_iterators/insert_iterator.cc: Same.
2002-01-16 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/locale_facets.h (ctype<char>::classic_table): Make
static.
(ctype<char>::_M_ctable): Make static, change name to _S_ctable.
* config/os/gnu-linux/bits/ctype_noninline.h: Define _S_ctable.
* config/os/solaris/solaris2.7/bits/ctype_noninline.h: Same.
* config/os/solaris/solaris2.6/bits/ctype_noninline.h: Same.
* config/os/solaris/solaris2.5/bits/ctype_noninline.h: Same.
* config/os/newlib/bits/ctype_noninline.h: Same.
* config/os/irix/irix6.5/bits/ctype_noninline.h: Same.
* config/os/irix/irix5.2/bits/ctype_noninline.h: Same.
* config/os/hpux/bits/ctype_noninline.h: Same.
* config/os/djgpp/bits/ctype_noninline.h: Same.
* config/os/bsd/netbsd/bits/ctype_noninline.h: Same.
* config/os/bsd/freebsd/bits/ctype_noninline.h: Same.
* config/os/aix/bits/ctype_noninline.h: Same.
Testcase by Dietmar K�hl via Peter Schmid
* testsuite/22_locale/ctype_members_char.cc (char>): Add test for
classic_table().
Co-Authored-By: Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
From-SVN: r48938
457 lines
14 KiB
C++
457 lines
14 KiB
C++
// Iterators -*- C++ -*-
|
|
|
|
// Copyright (C) 2001, 2002 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
|
|
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
|
// 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.
|
|
|
|
/*
|
|
*
|
|
* Copyright (c) 1994
|
|
* Hewlett-Packard Company
|
|
*
|
|
* Permission to use, copy, modify, distribute and sell this software
|
|
* and its documentation for any purpose is hereby granted without fee,
|
|
* provided that the above copyright notice appear in all copies and
|
|
* that both that copyright notice and this permission notice appear
|
|
* in supporting documentation. Hewlett-Packard Company makes no
|
|
* representations about the suitability of this software for any
|
|
* purpose. It is provided "as is" without express or implied warranty.
|
|
*
|
|
*
|
|
* Copyright (c) 1996-1998
|
|
* Silicon Graphics Computer Systems, Inc.
|
|
*
|
|
* Permission to use, copy, modify, distribute and sell this software
|
|
* and its documentation for any purpose is hereby granted without fee,
|
|
* provided that the above copyright notice appear in all copies and
|
|
* that both that copyright notice and this permission notice appear
|
|
* in supporting documentation. Silicon Graphics makes no
|
|
* representations about the suitability of this software for any
|
|
* purpose. It is provided "as is" without express or implied warranty.
|
|
*/
|
|
|
|
/** @file stl_iterator.h
|
|
* This is an internal header file, included by other library headers.
|
|
* You should not attempt to use it directly.
|
|
*/
|
|
|
|
#ifndef __GLIBCPP_INTERNAL_ITERATOR_H
|
|
#define __GLIBCPP_INTERNAL_ITERATOR_H
|
|
|
|
namespace std
|
|
{
|
|
// 24.4.1 Reverse iterators
|
|
template<typename _Iterator>
|
|
class reverse_iterator
|
|
: public iterator<typename iterator_traits<_Iterator>::iterator_category,
|
|
typename iterator_traits<_Iterator>::value_type,
|
|
typename iterator_traits<_Iterator>::difference_type,
|
|
typename iterator_traits<_Iterator>::pointer,
|
|
typename iterator_traits<_Iterator>::reference>
|
|
{
|
|
protected:
|
|
_Iterator current;
|
|
|
|
public:
|
|
typedef _Iterator iterator_type;
|
|
typedef typename iterator_traits<_Iterator>::difference_type
|
|
difference_type;
|
|
typedef typename iterator_traits<_Iterator>::reference reference;
|
|
typedef typename iterator_traits<_Iterator>::pointer pointer;
|
|
|
|
public:
|
|
reverse_iterator() { }
|
|
|
|
explicit
|
|
reverse_iterator(iterator_type __x) : current(__x) { }
|
|
|
|
reverse_iterator(const reverse_iterator& __x)
|
|
: current(__x.current) { }
|
|
|
|
template<typename _Iter>
|
|
reverse_iterator(const reverse_iterator<_Iter>& __x)
|
|
: current(__x.base()) { }
|
|
|
|
iterator_type
|
|
base() const { return current; }
|
|
|
|
reference
|
|
operator*() const
|
|
{
|
|
_Iterator __tmp = current;
|
|
return *--__tmp;
|
|
}
|
|
|
|
pointer
|
|
operator->() const { return &(operator*()); }
|
|
|
|
reverse_iterator&
|
|
operator++()
|
|
{
|
|
--current;
|
|
return *this;
|
|
}
|
|
|
|
reverse_iterator
|
|
operator++(int)
|
|
{
|
|
reverse_iterator __tmp = *this;
|
|
--current;
|
|
return __tmp;
|
|
}
|
|
|
|
reverse_iterator&
|
|
operator--()
|
|
{
|
|
++current;
|
|
return *this;
|
|
}
|
|
|
|
reverse_iterator operator--(int)
|
|
{
|
|
reverse_iterator __tmp = *this;
|
|
++current;
|
|
return __tmp;
|
|
}
|
|
|
|
reverse_iterator
|
|
operator+(difference_type __n) const
|
|
{ return reverse_iterator(current - __n); }
|
|
|
|
reverse_iterator&
|
|
operator+=(difference_type __n)
|
|
{
|
|
current -= __n;
|
|
return *this;
|
|
}
|
|
|
|
reverse_iterator
|
|
operator-(difference_type __n) const
|
|
{ return reverse_iterator(current + __n); }
|
|
|
|
reverse_iterator&
|
|
operator-=(difference_type __n)
|
|
{
|
|
current += __n;
|
|
return *this;
|
|
}
|
|
|
|
reference
|
|
operator[](difference_type __n) const { return *(*this + __n); }
|
|
};
|
|
|
|
template<typename _Iterator>
|
|
inline bool
|
|
operator==(const reverse_iterator<_Iterator>& __x,
|
|
const reverse_iterator<_Iterator>& __y)
|
|
{ return __x.base() == __y.base(); }
|
|
|
|
template<typename _Iterator>
|
|
inline bool
|
|
operator<(const reverse_iterator<_Iterator>& __x,
|
|
const reverse_iterator<_Iterator>& __y)
|
|
{ return __y.base() < __x.base(); }
|
|
|
|
template<typename _Iterator>
|
|
inline bool
|
|
operator!=(const reverse_iterator<_Iterator>& __x,
|
|
const reverse_iterator<_Iterator>& __y)
|
|
{ return !(__x == __y); }
|
|
|
|
template<typename _Iterator>
|
|
inline bool
|
|
operator>(const reverse_iterator<_Iterator>& __x,
|
|
const reverse_iterator<_Iterator>& __y)
|
|
{ return __y < __x; }
|
|
|
|
template<typename _Iterator>
|
|
inline bool
|
|
operator<=(const reverse_iterator<_Iterator>& __x,
|
|
const reverse_iterator<_Iterator>& __y)
|
|
{ return !(__y < __x); }
|
|
|
|
template<typename _Iterator>
|
|
inline bool
|
|
operator>=(const reverse_iterator<_Iterator>& __x,
|
|
const reverse_iterator<_Iterator>& __y)
|
|
{ return !(__x < __y); }
|
|
|
|
template<typename _Iterator>
|
|
inline typename reverse_iterator<_Iterator>::difference_type
|
|
operator-(const reverse_iterator<_Iterator>& __x,
|
|
const reverse_iterator<_Iterator>& __y)
|
|
{ return __y.base() - __x.base(); }
|
|
|
|
template<typename _Iterator>
|
|
inline reverse_iterator<_Iterator>
|
|
operator+(typename reverse_iterator<_Iterator>::difference_type __n,
|
|
const reverse_iterator<_Iterator>& __x)
|
|
{ return reverse_iterator<_Iterator>(__x.base() - __n); }
|
|
|
|
// 24.4.2.2.1 back_insert_iterator
|
|
template<typename _Container>
|
|
class back_insert_iterator
|
|
: public iterator<output_iterator_tag, void, void, void, void>
|
|
{
|
|
protected:
|
|
_Container* container;
|
|
|
|
public:
|
|
typedef _Container container_type;
|
|
|
|
explicit
|
|
back_insert_iterator(_Container& __x) : container(&__x) { }
|
|
|
|
back_insert_iterator&
|
|
operator=(typename _Container::const_reference __value)
|
|
{
|
|
container->push_back(__value);
|
|
return *this;
|
|
}
|
|
|
|
back_insert_iterator&
|
|
operator*() { return *this; }
|
|
|
|
back_insert_iterator&
|
|
operator++() { return *this; }
|
|
|
|
back_insert_iterator
|
|
operator++(int) { return *this; }
|
|
};
|
|
|
|
template<typename _Container>
|
|
inline back_insert_iterator<_Container>
|
|
back_inserter(_Container& __x)
|
|
{ return back_insert_iterator<_Container>(__x); }
|
|
|
|
template<typename _Container>
|
|
class front_insert_iterator
|
|
: public iterator<output_iterator_tag, void, void, void, void>
|
|
{
|
|
protected:
|
|
_Container* container;
|
|
|
|
public:
|
|
typedef _Container container_type;
|
|
|
|
explicit front_insert_iterator(_Container& __x) : container(&__x) { }
|
|
|
|
front_insert_iterator&
|
|
operator=(typename _Container::const_reference __value)
|
|
{
|
|
container->push_front(__value);
|
|
return *this;
|
|
}
|
|
|
|
front_insert_iterator&
|
|
operator*() { return *this; }
|
|
|
|
front_insert_iterator&
|
|
operator++() { return *this; }
|
|
|
|
front_insert_iterator
|
|
operator++(int) { return *this; }
|
|
};
|
|
|
|
template<typename _Container>
|
|
inline front_insert_iterator<_Container>
|
|
front_inserter(_Container& __x)
|
|
{ return front_insert_iterator<_Container>(__x); }
|
|
|
|
template<typename _Container>
|
|
class insert_iterator
|
|
: public iterator<output_iterator_tag, void, void, void, void>
|
|
{
|
|
protected:
|
|
_Container* container;
|
|
typename _Container::iterator iter;
|
|
|
|
public:
|
|
typedef _Container container_type;
|
|
|
|
insert_iterator(_Container& __x, typename _Container::iterator __i)
|
|
: container(&__x), iter(__i) {}
|
|
|
|
insert_iterator&
|
|
operator=(const typename _Container::const_reference __value)
|
|
{
|
|
iter = container->insert(iter, __value);
|
|
++iter;
|
|
return *this;
|
|
}
|
|
|
|
insert_iterator&
|
|
operator*() { return *this; }
|
|
|
|
insert_iterator&
|
|
operator++() { return *this; }
|
|
|
|
insert_iterator&
|
|
operator++(int) { return *this; }
|
|
};
|
|
|
|
template<typename _Container, typename _Iterator>
|
|
inline insert_iterator<_Container>
|
|
inserter(_Container& __x, _Iterator __i)
|
|
{
|
|
return insert_iterator<_Container>(__x,
|
|
typename _Container::iterator(__i));
|
|
}
|
|
|
|
// This iterator adapter is 'normal' in the sense that it does not
|
|
// change the semantics of any of the operators of its iterator
|
|
// parameter. Its primary purpose is to convert an iterator that is
|
|
// not a class, e.g. a pointer, into an iterator that is a class.
|
|
// The _Container parameter exists solely so that different containers
|
|
// using this template can instantiate different types, even if the
|
|
// _Iterator parameter is the same.
|
|
template<typename _Iterator, typename _Container>
|
|
class __normal_iterator
|
|
: public iterator<typename iterator_traits<_Iterator>::iterator_category,
|
|
typename iterator_traits<_Iterator>::value_type,
|
|
typename iterator_traits<_Iterator>::difference_type,
|
|
typename iterator_traits<_Iterator>::pointer,
|
|
typename iterator_traits<_Iterator>::reference>
|
|
{
|
|
protected:
|
|
_Iterator _M_current;
|
|
|
|
public:
|
|
typedef typename iterator_traits<_Iterator>::difference_type
|
|
difference_type;
|
|
typedef typename iterator_traits<_Iterator>::reference reference;
|
|
typedef typename iterator_traits<_Iterator>::pointer pointer;
|
|
|
|
__normal_iterator() : _M_current(_Iterator()) { }
|
|
|
|
explicit
|
|
__normal_iterator(const _Iterator& __i) : _M_current(__i) { }
|
|
|
|
// Allow iterator to const_iterator conversion
|
|
template<typename _Iter>
|
|
inline __normal_iterator(const __normal_iterator<_Iter, _Container>& __i)
|
|
: _M_current(__i.base()) { }
|
|
|
|
// Forward iterator requirements
|
|
reference
|
|
operator*() const { return *_M_current; }
|
|
|
|
pointer
|
|
operator->() const { return _M_current; }
|
|
|
|
__normal_iterator&
|
|
operator++() { ++_M_current; return *this; }
|
|
|
|
__normal_iterator
|
|
operator++(int) { return __normal_iterator(_M_current++); }
|
|
|
|
// Bidirectional iterator requirements
|
|
__normal_iterator&
|
|
operator--() { --_M_current; return *this; }
|
|
|
|
__normal_iterator
|
|
operator--(int) { return __normal_iterator(_M_current--); }
|
|
|
|
// Random access iterator requirements
|
|
reference
|
|
operator[](const difference_type& __n) const
|
|
{ return _M_current[__n]; }
|
|
|
|
__normal_iterator&
|
|
operator+=(const difference_type& __n)
|
|
{ _M_current += __n; return *this; }
|
|
|
|
__normal_iterator
|
|
operator+(const difference_type& __n) const
|
|
{ return __normal_iterator(_M_current + __n); }
|
|
|
|
__normal_iterator&
|
|
operator-=(const difference_type& __n)
|
|
{ _M_current -= __n; return *this; }
|
|
|
|
__normal_iterator
|
|
operator-(const difference_type& __n) const
|
|
{ return __normal_iterator(_M_current - __n); }
|
|
|
|
difference_type
|
|
operator-(const __normal_iterator& __i) const
|
|
{ return _M_current - __i._M_current; }
|
|
|
|
const _Iterator&
|
|
base() const { return _M_current; }
|
|
};
|
|
|
|
// Forward iterator requirements
|
|
template<typename _IteratorL, typename _IteratorR, typename _Container>
|
|
inline bool
|
|
operator==(const __normal_iterator<_IteratorL, _Container>& __lhs,
|
|
const __normal_iterator<_IteratorR, _Container>& __rhs)
|
|
{ return __lhs.base() == __rhs.base(); }
|
|
|
|
template<typename _IteratorL, typename _IteratorR, typename _Container>
|
|
inline bool
|
|
operator!=(const __normal_iterator<_IteratorL, _Container>& __lhs,
|
|
const __normal_iterator<_IteratorR, _Container>& __rhs)
|
|
{ return !(__lhs == __rhs); }
|
|
|
|
// Random access iterator requirements
|
|
template<typename _IteratorL, typename _IteratorR, typename _Container>
|
|
inline bool
|
|
operator<(const __normal_iterator<_IteratorL, _Container>& __lhs,
|
|
const __normal_iterator<_IteratorR, _Container>& __rhs)
|
|
{ return __lhs.base() < __rhs.base(); }
|
|
|
|
template<typename _IteratorL, typename _IteratorR, typename _Container>
|
|
inline bool
|
|
operator>(const __normal_iterator<_IteratorL, _Container>& __lhs,
|
|
const __normal_iterator<_IteratorR, _Container>& __rhs)
|
|
{ return __rhs < __lhs; }
|
|
|
|
template<typename _IteratorL, typename _IteratorR, typename _Container>
|
|
inline bool
|
|
operator<=(const __normal_iterator<_IteratorL, _Container>& __lhs,
|
|
const __normal_iterator<_IteratorR, _Container>& __rhs)
|
|
{ return !(__rhs < __lhs); }
|
|
|
|
template<typename _IteratorL, typename _IteratorR, typename _Container>
|
|
inline bool
|
|
operator>=(const __normal_iterator<_IteratorL, _Container>& __lhs,
|
|
const __normal_iterator<_IteratorR, _Container>& __rhs)
|
|
{ return !(__lhs < __rhs); }
|
|
|
|
template<typename _Iterator, typename _Container>
|
|
inline __normal_iterator<_Iterator, _Container>
|
|
operator+(typename __normal_iterator<_Iterator, _Container>::difference_type __n,
|
|
const __normal_iterator<_Iterator, _Container>& __i)
|
|
{ return __normal_iterator<_Iterator, _Container>(__i.base() + __n); }
|
|
} // namespace std
|
|
|
|
#endif
|
|
|
|
// Local Variables:
|
|
// mode:C++
|
|
// End:
|