5b9daa7e60
2009-02-20 Benjamin Kosnik <bkoz@redhat.com>
* doc/doxygen/user.cfg.in: Tweaks.
* doc/doxygen/doxygroups.cc: Prefer markup that can be elsewhere,
be elsewhere.
* include/tr1_impl/unordered_map: Just use most specialized
container module.
* include/tr1_impl/unordered_set: Same.
* include/tr1_impl/array: Same.
* include/bits/stl_list.h: Same.
* include/bits/stl_map.h: Same.
* include/bits/stl_queue.h: Same.
* include/bits/stl_set.h: Same.
* include/bits/stl_stack.h: Same.
* include/bits/forward_list.h: Same.
* include/bits/basic_string.h: Same.
* include/bits/stl_multimap.h: Same.
* include/bits/stl_vector.h: Same.
* include/bits/stl_deque.h: Same.
* include/bits/stl_multiset.h: Same.
* include/bits/stl_bvector.h: Same.
* include/backward/binders.h: Change binder module to binders.
* include/std/complex: Add complex_numers module.
* include/tr1_impl/complex: Same.
* include/std/valarray: Add numeric_arrays module.
* include/bits/gslice_array.h: Same.
* include/bits/gslice.h: Same.
* include/bits/mask_array.h: Same.
* include/bits/slice_array.h: Same.
* include/bits/indirect_array.h: Same.
* include/bits/allocator.h: Add allocators module.
* include/ext/throw_allocator.h
* include/ext/pool_allocator.h
* include/ext/bitmap_allocator.h
* include/ext/new_allocator.h
* include/ext/malloc_allocator.h
* include/ext/array_allocator.h
* include/ext/mt_allocator.h
* include/ext/debug_allocator.h
* include/ext/extptr_allocator.h
* include/tr1_impl/functional: Move namespace markup here.
* include/tr1_impl/regex: Same.
* include/tr1_impl/type_traits: Add metaprogramming module.
* include/std/type_traits: Same.
* include/std/memory: Add memory module.
* include/std/ratio: Add ratio module.
* include/std/chrono: Move namespace markup here, add time module.
* include/std/thread: Move namespace markup here, add concurrency
module.
* include/std/mutex: Use concurrency module.
* include/std/condition_variable: Same.
* include/bits/ios_base.h: Refine io module.
* include/bits/basic_ios.h: Same.
* include/std/fstream: Same.
* include/std/istream: Same.
* include/std/ostream: Same.
* include/std/sstream: Same.
* include/ext/vstring.h: Correct parameter markup.
* include/bits/shared_ptr.h: Add pointer_abstractions module.
* include/bits/unique_ptr.h: Same.
* include/bits/algorithmfwd.h: Add mutating_algorithms,
non_mutating_algorithms, sorting_algorithms. Adjust nesting.
* include/bits/stl_heap.h: Add markup for new groupings.
* include/bits/stl_algobase.h: Same.
* include/bits/stl_algo.h: Same.
* include/c_compatibility/stdatomic.h: Add atomics module.
* include/c_global/cstdatomic: Same.
* libsupc++/exception: Add exceptions module.
* libsupc++/typeinfo: Same.
* libsupc++/new: Same.
* libsupc++/exception_ptr.h: Same.
* include/std/system_error: Same.
* include/std/stdexcept: Same.
* libsupc++/cxxabi.h: Move doxygroups.cc markup here.
* libsupc++/cxxabi-forced.h: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Fix up line numbers.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/30_threads/condition_variable_any/cons/assign_neg.cc: Same.
* testsuite/30_threads/condition_variable_any/cons/copy_neg.cc: Same.
* testsuite/30_threads/mutex/cons/assign_neg.cc: Same.
* testsuite/30_threads/mutex/cons/copy_neg.cc: Same.
* testsuite/30_threads/timed_mutex/cons/assign_neg.cc: Same.
* testsuite/30_threads/timed_mutex/cons/copy_neg.cc: Same.
* testsuite/30_threads/thread/cons/assign_neg.cc: Same.
* testsuite/30_threads/thread/cons/copy_neg.cc: Same.
* testsuite/30_threads/recursive_mutex/cons/assign_neg.cc: Same.
* testsuite/30_threads/recursive_mutex/cons/copy_neg.cc: Same.
* testsuite/30_threads/condition_variable/cons/assign_neg.cc: Same.
* testsuite/30_threads/condition_variable/cons/copy_neg.cc: Same.
* testsuite/30_threads/recursive_timed_mutex/cons/assign_neg.cc: Same.
* testsuite/30_threads/recursive_timed_mutex/cons/copy_neg.cc: Same.
* testsuite/29_atomics/atomic/cons/assign_neg.cc: Same.
* testsuite/29_atomics/atomic/cons/copy_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/20_util/duration/cons/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/unique_ptr/modifiers/reset_neg.cc: Same.
* testsuite/20_util/unique_ptr/assign/assign.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow.cc: Same.
From-SVN: r144343
222 lines
7.9 KiB
C++
222 lines
7.9 KiB
C++
// The template and inlines for the -*- C++ -*- gslice_array class.
|
|
|
|
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004, 2005, 2009
|
|
// 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
|
// 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 gslice_array.h
|
|
* This is an internal header file, included by other library headers.
|
|
* You should not attempt to use it directly.
|
|
*/
|
|
|
|
// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
|
|
|
|
#ifndef _GSLICE_ARRAY_H
|
|
#define _GSLICE_ARRAY_H 1
|
|
|
|
#pragma GCC system_header
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE(std)
|
|
|
|
/**
|
|
* @addtogroup numeric_arrays
|
|
* @{
|
|
*/
|
|
|
|
/**
|
|
* @brief Reference to multi-dimensional subset of an array.
|
|
*
|
|
* A gslice_array is a reference to the actual elements of an array
|
|
* specified by a gslice. The way to get a gslice_array is to call
|
|
* operator[](gslice) on a valarray. The returned gslice_array then
|
|
* permits carrying operations out on the referenced subset of elements in
|
|
* the original valarray. For example, operator+=(valarray) will add
|
|
* values to the subset of elements in the underlying valarray this
|
|
* gslice_array refers to.
|
|
*
|
|
* @param Tp Element type.
|
|
*/
|
|
template<typename _Tp>
|
|
class gslice_array
|
|
{
|
|
public:
|
|
typedef _Tp value_type;
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 253. valarray helper functions are almost entirely useless
|
|
|
|
/// Copy constructor. Both slices refer to the same underlying array.
|
|
gslice_array(const gslice_array&);
|
|
|
|
/// Assignment operator. Assigns slice elements to corresponding
|
|
/// elements of @a a.
|
|
gslice_array& operator=(const gslice_array&);
|
|
|
|
/// Assign slice elements to corresponding elements of @a v.
|
|
void operator=(const valarray<_Tp>&) const;
|
|
/// Multiply slice elements by corresponding elements of @a v.
|
|
void operator*=(const valarray<_Tp>&) const;
|
|
/// Divide slice elements by corresponding elements of @a v.
|
|
void operator/=(const valarray<_Tp>&) const;
|
|
/// Modulo slice elements by corresponding elements of @a v.
|
|
void operator%=(const valarray<_Tp>&) const;
|
|
/// Add corresponding elements of @a v to slice elements.
|
|
void operator+=(const valarray<_Tp>&) const;
|
|
/// Subtract corresponding elements of @a v from slice elements.
|
|
void operator-=(const valarray<_Tp>&) const;
|
|
/// Logical xor slice elements with corresponding elements of @a v.
|
|
void operator^=(const valarray<_Tp>&) const;
|
|
/// Logical and slice elements with corresponding elements of @a v.
|
|
void operator&=(const valarray<_Tp>&) const;
|
|
/// Logical or slice elements with corresponding elements of @a v.
|
|
void operator|=(const valarray<_Tp>&) const;
|
|
/// Left shift slice elements by corresponding elements of @a v.
|
|
void operator<<=(const valarray<_Tp>&) const;
|
|
/// Right shift slice elements by corresponding elements of @a v.
|
|
void operator>>=(const valarray<_Tp>&) const;
|
|
/// Assign all slice elements to @a t.
|
|
void operator=(const _Tp&) const;
|
|
|
|
template<class _Dom>
|
|
void operator=(const _Expr<_Dom, _Tp>&) const;
|
|
template<class _Dom>
|
|
void operator*=(const _Expr<_Dom, _Tp>&) const;
|
|
template<class _Dom>
|
|
void operator/=(const _Expr<_Dom, _Tp>&) const;
|
|
template<class _Dom>
|
|
void operator%=(const _Expr<_Dom, _Tp>&) const;
|
|
template<class _Dom>
|
|
void operator+=(const _Expr<_Dom, _Tp>&) const;
|
|
template<class _Dom>
|
|
void operator-=(const _Expr<_Dom, _Tp>&) const;
|
|
template<class _Dom>
|
|
void operator^=(const _Expr<_Dom, _Tp>&) const;
|
|
template<class _Dom>
|
|
void operator&=(const _Expr<_Dom, _Tp>&) const;
|
|
template<class _Dom>
|
|
void operator|=(const _Expr<_Dom, _Tp>&) const;
|
|
template<class _Dom>
|
|
void operator<<=(const _Expr<_Dom, _Tp>&) const;
|
|
template<class _Dom>
|
|
void operator>>=(const _Expr<_Dom, _Tp>&) const;
|
|
|
|
private:
|
|
_Array<_Tp> _M_array;
|
|
const valarray<size_t>& _M_index;
|
|
|
|
friend class valarray<_Tp>;
|
|
|
|
gslice_array(_Array<_Tp>, const valarray<size_t>&);
|
|
|
|
// not implemented
|
|
gslice_array();
|
|
};
|
|
|
|
template<typename _Tp>
|
|
inline
|
|
gslice_array<_Tp>::gslice_array(_Array<_Tp> __a,
|
|
const valarray<size_t>& __i)
|
|
: _M_array(__a), _M_index(__i) {}
|
|
|
|
template<typename _Tp>
|
|
inline
|
|
gslice_array<_Tp>::gslice_array(const gslice_array<_Tp>& __a)
|
|
: _M_array(__a._M_array), _M_index(__a._M_index) {}
|
|
|
|
template<typename _Tp>
|
|
inline gslice_array<_Tp>&
|
|
gslice_array<_Tp>::operator=(const gslice_array<_Tp>& __a)
|
|
{
|
|
std::__valarray_copy(_Array<_Tp>(__a._M_array),
|
|
_Array<size_t>(__a._M_index), _M_index.size(),
|
|
_M_array, _Array<size_t>(_M_index));
|
|
return *this;
|
|
}
|
|
|
|
template<typename _Tp>
|
|
inline void
|
|
gslice_array<_Tp>::operator=(const _Tp& __t) const
|
|
{
|
|
std::__valarray_fill(_M_array, _Array<size_t>(_M_index),
|
|
_M_index.size(), __t);
|
|
}
|
|
|
|
template<typename _Tp>
|
|
inline void
|
|
gslice_array<_Tp>::operator=(const valarray<_Tp>& __v) const
|
|
{
|
|
std::__valarray_copy(_Array<_Tp>(__v), __v.size(),
|
|
_M_array, _Array<size_t>(_M_index));
|
|
}
|
|
|
|
template<typename _Tp>
|
|
template<class _Dom>
|
|
inline void
|
|
gslice_array<_Tp>::operator=(const _Expr<_Dom, _Tp>& __e) const
|
|
{
|
|
std::__valarray_copy (__e, _M_index.size(), _M_array,
|
|
_Array<size_t>(_M_index));
|
|
}
|
|
|
|
#undef _DEFINE_VALARRAY_OPERATOR
|
|
#define _DEFINE_VALARRAY_OPERATOR(_Op, _Name) \
|
|
template<typename _Tp> \
|
|
inline void \
|
|
gslice_array<_Tp>::operator _Op##=(const valarray<_Tp>& __v) const \
|
|
{ \
|
|
_Array_augmented_##_Name(_M_array, _Array<size_t>(_M_index), \
|
|
_Array<_Tp>(__v), __v.size()); \
|
|
} \
|
|
\
|
|
template<typename _Tp> \
|
|
template<class _Dom> \
|
|
inline void \
|
|
gslice_array<_Tp>::operator _Op##= (const _Expr<_Dom, _Tp>& __e) const\
|
|
{ \
|
|
_Array_augmented_##_Name(_M_array, _Array<size_t>(_M_index), __e,\
|
|
_M_index.size()); \
|
|
}
|
|
|
|
_DEFINE_VALARRAY_OPERATOR(*, __multiplies)
|
|
_DEFINE_VALARRAY_OPERATOR(/, __divides)
|
|
_DEFINE_VALARRAY_OPERATOR(%, __modulus)
|
|
_DEFINE_VALARRAY_OPERATOR(+, __plus)
|
|
_DEFINE_VALARRAY_OPERATOR(-, __minus)
|
|
_DEFINE_VALARRAY_OPERATOR(^, __bitwise_xor)
|
|
_DEFINE_VALARRAY_OPERATOR(&, __bitwise_and)
|
|
_DEFINE_VALARRAY_OPERATOR(|, __bitwise_or)
|
|
_DEFINE_VALARRAY_OPERATOR(<<, __shift_left)
|
|
_DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
|
|
|
|
#undef _DEFINE_VALARRAY_OPERATOR
|
|
|
|
// @} group numeric_arrays
|
|
|
|
_GLIBCXX_END_NAMESPACE
|
|
|
|
#endif /* _GSLICE_ARRAY_H */
|