ea89b2482f
2013-09-27 François Dumont <fdumont@gcc.gnu.org> * include/bits/predefined_ops.h: New. * include/bits/stl_heap.h: Include <bits/predefined_ops.h>. (__is_heap_until, __push_heap, __adjust_heap, __pop_heap): Remove algo duplication. (__is_heap): Adapt. (__make_heap): New. (make_heap): Adapt to use latter. (__sort_heap): New. (sort_heap): Adapt to use latter. * include/bits/algobase.h: Include <bits/predefined_ops.h>. (__lexicographical_compare_impl): New. (__lexicographical_compare<false>::__lc): Adapt to use latter. (lexicographical_compare): Likewise. (__lower_bound): New. (lower_bound): Adapt to use latter. (equal): Use _GLIBCXX_STD_A::equal in N3671 overloads. (__mismatch): New. (mismatch): Use latter. * include/bits/algo.h: Include <bits/predefined_ops.h>. Remove <functional> include. (__move_median_first, __find, __find_if, __find_if_not): Remove algo duplication. (__find_end): Likewise. (__search_n): Rename into ... (__search_n_aux): ... this. (__search_n): Renew, use latter. (search_n): Use latter. (__search): New. (search): Use latter. (__find_end): Likewise. (__remove_copy_if): New. (remove_copy): Use latter. (__adjacent_find): New. (adjacent_find): Use latter. (__unique): New. (unique): Use latter. (__unique_copy): Remove algo duplication. (__stable_partition): New. (stable_partition): Use latter. (__heap_select): Remove algo duplication, use __make_heap. (__partial_sort): New, use latter. (partial_sort): Use latter. (__partial_sort_copy): New. (partial_sort_copy): Use latter. (__unguarded_linear_insert, __insertion_sort): Remove algo duplication. (__unguarded_insertion_sort, __final_insertion_sort): Likewise. (__unguarded_partition, __unguarded_partition_pivot): Likewise. (__partial_sort): New. (partial_sort): Use latter. (__sort): New. (sort): Use latter. (lower_bound): Use __lower_bound. (__upper_bound): New. (upper_bound): Use latter. (__equal_range): New. (equal_range): Use latter. (__move_merge_adaptive, __move_merge_adaptive_backward): Remove algo duplication. (__merge_adaptive, __merge_without_buffer): Likewise. (__inplace_merge): New. (inplace_merge): Use latter. (__move_merge, __merge_sort_loop, __chunk_insertion_sort): Remove algo duplication. (__merge_sort_with_buffer, __stable_sort_adaptive): Likewise. (__inplace_stable_sort): Likewise. (__include): New. (includes): Use latter. (__next_permutation): New. (next_permutation): Use latter. (__prev_permutation): New. (prev_permutation): Use latter. (__replace_copy_if): New. (replace_copy): Use latter. (__is_sorted_until): New. (is_sorted_unitl): Use latter. (__minmax_element): New. (minmax_element): Use latter. (__is_permutation): New. (is_permutation): Use latter. (__adjacent_find): New. (adjacent_find): Use latter. (__count_if): New. (count): Use latter. (count_if): Likewise. (__merge): New. (merge): Use latter. (__stable_sort): New. (stable_sort): Use latter. (__set_union): New. (set_union): Use latter. (__set_intersection): New. (set_intersection): Use latter. (__set_difference): New. (set_difference): Use latter. (__set_symmetric_difference): New. (set_symmetric_difference): Use latter. (__min_element): New. (min_element): Use latter. (__max_element): New. (max_element): Use latter. * include/Makefile.am: Add predefined_ops.h. * include/Makefile.in: Regenerate. * include/parallel/algobase.h (equal, mismatch): Add overloads from N3671. * testsuite/25_algorithms/is_permutation/vectorbool.cc: New. * testsuite/25_algorithms/adjacent_find/vectorbool.cc: Likewise. * testsuite/25_algorithms/find/vectorbool.cc: Likewise. * testsuite/25_algorithms/find_if/vectorbool.cc: Likewise. * testsuite/25_algorithms/find_first_of/vectorbool.cc: Likewise. * testsuite/25_algorithms/heap/vectorbool.cc: Likewise. * testsuite/25_algorithms/find_end/vectorbool.cc: Likewise. * testsuite/25_algorithms/find_if_not/vectorbool.cc: Likewise. From-SVN: r202992
305 lines
7.6 KiB
C++
305 lines
7.6 KiB
C++
// Default predicates for internal use -*- C++ -*-
|
|
|
|
// Copyright (C) 2013 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 3, 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.
|
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
// 3.1, as published by the Free Software Foundation.
|
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
/** @file predefined_ops.h
|
|
* This is an internal header file, included by other library headers.
|
|
* You should not attempt to use it directly.
|
|
*/
|
|
|
|
#ifndef _GLIBCXX_PREDEFINED_OPS_H
|
|
#define _GLIBCXX_PREDEFINED_OPS_H 1
|
|
|
|
namespace __gnu_cxx
|
|
{
|
|
namespace __ops
|
|
{
|
|
struct _Iter_less_iter
|
|
{
|
|
template<typename _Iterator1, typename _Iterator2>
|
|
bool
|
|
operator()(_Iterator1 __it1, _Iterator2 __it2) const
|
|
{ return *__it1 < *__it2; }
|
|
};
|
|
|
|
inline _Iter_less_iter
|
|
__iter_less_iter()
|
|
{ return _Iter_less_iter(); }
|
|
|
|
struct _Iter_less_val
|
|
{
|
|
template<typename _Iterator, typename _Value>
|
|
bool
|
|
operator()(_Iterator __it, _Value& __val) const
|
|
{ return *__it < __val; }
|
|
};
|
|
|
|
inline _Iter_less_val
|
|
__iter_less_val()
|
|
{ return _Iter_less_val(); }
|
|
|
|
inline _Iter_less_val
|
|
__iter_comp_val(_Iter_less_iter)
|
|
{ return _Iter_less_val(); }
|
|
|
|
struct _Val_less_iter
|
|
{
|
|
template<typename _Value, typename _Iterator>
|
|
bool
|
|
operator()(_Value& __val, _Iterator __it) const
|
|
{ return __val < *__it; }
|
|
};
|
|
|
|
inline _Val_less_iter
|
|
__val_less_iter()
|
|
{ return _Val_less_iter(); }
|
|
|
|
inline _Val_less_iter
|
|
__val_comp_iter(_Iter_less_iter)
|
|
{ return _Val_less_iter(); }
|
|
|
|
struct _Iter_equal_to_iter
|
|
{
|
|
template<typename _Iterator1, typename _Iterator2>
|
|
bool
|
|
operator()(_Iterator1 __it1, _Iterator2 __it2) const
|
|
{ return *__it1 == *__it2; }
|
|
};
|
|
|
|
inline _Iter_equal_to_iter
|
|
__iter_equal_to_iter()
|
|
{ return _Iter_equal_to_iter(); }
|
|
|
|
struct _Iter_equal_to_val
|
|
{
|
|
template<typename _Iterator, typename _Value>
|
|
bool
|
|
operator()(_Iterator __it, _Value& __val) const
|
|
{ return *__it == __val; }
|
|
};
|
|
|
|
inline _Iter_equal_to_val
|
|
__iter_equal_to_val()
|
|
{ return _Iter_equal_to_val(); }
|
|
|
|
inline _Iter_equal_to_val
|
|
__iter_comp_val(_Iter_equal_to_iter)
|
|
{ return _Iter_equal_to_val(); }
|
|
|
|
template<typename _Compare>
|
|
struct _Iter_comp_iter
|
|
{
|
|
_Compare _M_comp;
|
|
|
|
_Iter_comp_iter(_Compare __comp)
|
|
: _M_comp(__comp)
|
|
{ }
|
|
|
|
template<typename _Iterator1, typename _Iterator2>
|
|
bool
|
|
operator()(_Iterator1 __it1, _Iterator2 __it2)
|
|
{ return bool(_M_comp(*__it1, *__it2)); }
|
|
};
|
|
|
|
template<typename _Compare>
|
|
inline _Iter_comp_iter<_Compare>
|
|
__iter_comp_iter(_Compare __comp)
|
|
{ return _Iter_comp_iter<_Compare>(__comp); }
|
|
|
|
template<typename _Compare>
|
|
struct _Iter_comp_val
|
|
{
|
|
_Compare _M_comp;
|
|
|
|
_Iter_comp_val(_Compare __comp)
|
|
: _M_comp(__comp)
|
|
{ }
|
|
|
|
template<typename _Iterator, typename _Value>
|
|
bool
|
|
operator()(_Iterator __it, _Value& __val)
|
|
{ return bool(_M_comp(*__it, __val)); }
|
|
};
|
|
|
|
template<typename _Compare>
|
|
inline _Iter_comp_val<_Compare>
|
|
__iter_comp_val(_Compare __comp)
|
|
{ return _Iter_comp_val<_Compare>(__comp); }
|
|
|
|
template<typename _Compare>
|
|
inline _Iter_comp_val<_Compare>
|
|
__iter_comp_val(_Iter_comp_iter<_Compare> __comp)
|
|
{ return _Iter_comp_val<_Compare>(__comp._M_comp); }
|
|
|
|
template<typename _Compare>
|
|
struct _Val_comp_iter
|
|
{
|
|
_Compare _M_comp;
|
|
|
|
_Val_comp_iter(_Compare __comp)
|
|
: _M_comp(__comp)
|
|
{ }
|
|
|
|
template<typename _Value, typename _Iterator>
|
|
bool
|
|
operator()(_Value& __val, _Iterator __it)
|
|
{ return bool(_M_comp(__val, *__it)); }
|
|
};
|
|
|
|
template<typename _Compare>
|
|
inline _Val_comp_iter<_Compare>
|
|
__val_comp_iter(_Compare __comp)
|
|
{ return _Val_comp_iter<_Compare>(__comp); }
|
|
|
|
template<typename _Compare>
|
|
inline _Val_comp_iter<_Compare>
|
|
__val_comp_iter(_Iter_comp_iter<_Compare> __comp)
|
|
{ return _Val_comp_iter<_Compare>(__comp._M_comp); }
|
|
|
|
template<typename _Value>
|
|
struct _Iter_equals_val
|
|
{
|
|
_Value& _M_value;
|
|
|
|
_Iter_equals_val(_Value& __value)
|
|
: _M_value(__value)
|
|
{ }
|
|
|
|
template<typename _Iterator>
|
|
bool
|
|
operator()(_Iterator __it)
|
|
{ return *__it == _M_value; }
|
|
};
|
|
|
|
template<typename _Value>
|
|
inline _Iter_equals_val<_Value>
|
|
__iter_equals_val(_Value& __val)
|
|
{ return _Iter_equals_val<_Value>(__val); }
|
|
|
|
template<typename _Iterator1>
|
|
struct _Iter_equals_iter
|
|
{
|
|
typename std::iterator_traits<_Iterator1>::reference _M_ref;
|
|
|
|
_Iter_equals_iter(_Iterator1 __it1)
|
|
: _M_ref(*__it1)
|
|
{ }
|
|
|
|
template<typename _Iterator2>
|
|
bool
|
|
operator()(_Iterator2 __it2)
|
|
{ return *__it2 == _M_ref; }
|
|
};
|
|
|
|
template<typename _Iterator>
|
|
inline _Iter_equals_iter<_Iterator>
|
|
__iter_comp_iter(_Iter_equal_to_iter, _Iterator __it)
|
|
{ return _Iter_equals_iter<_Iterator>(__it); }
|
|
|
|
template<typename _Predicate>
|
|
struct _Iter_pred
|
|
{
|
|
_Predicate _M_pred;
|
|
|
|
_Iter_pred(_Predicate __pred)
|
|
: _M_pred(__pred)
|
|
{ }
|
|
|
|
template<typename _Iterator>
|
|
bool
|
|
operator()(_Iterator __it)
|
|
{ return bool(_M_pred(*__it)); }
|
|
};
|
|
|
|
template<typename _Predicate>
|
|
inline _Iter_pred<_Predicate>
|
|
__pred_iter(_Predicate __pred)
|
|
{ return _Iter_pred<_Predicate>(__pred); }
|
|
|
|
template<typename _Compare, typename _Value>
|
|
struct _Iter_comp_to_val
|
|
{
|
|
_Compare _M_comp;
|
|
_Value& _M_value;
|
|
|
|
_Iter_comp_to_val(_Compare __comp, _Value& __value)
|
|
: _M_comp(__comp), _M_value(__value)
|
|
{ }
|
|
|
|
template<typename _Iterator>
|
|
bool
|
|
operator()(_Iterator __it)
|
|
{ return bool(_M_comp(*__it, _M_value)); }
|
|
};
|
|
|
|
template<typename _Compare, typename _Value>
|
|
_Iter_comp_to_val<_Compare, _Value>
|
|
__iter_comp_val(_Compare __comp, _Value &__val)
|
|
{ return _Iter_comp_to_val<_Compare, _Value>(__comp, __val); }
|
|
|
|
template<typename _Compare, typename _Iterator1>
|
|
struct _Iter_comp_to_iter
|
|
{
|
|
_Compare _M_comp;
|
|
typename std::iterator_traits<_Iterator1>::reference _M_ref;
|
|
|
|
_Iter_comp_to_iter(_Compare __comp, _Iterator1 __it1)
|
|
: _M_comp(__comp), _M_ref(*__it1)
|
|
{ }
|
|
|
|
template<typename _Iterator2>
|
|
bool
|
|
operator()(_Iterator2 __it2)
|
|
{ return bool(_M_comp(*__it2, _M_ref)); }
|
|
};
|
|
|
|
template<typename _Compare, typename _Iterator>
|
|
inline _Iter_comp_to_iter<_Compare, _Iterator>
|
|
__iter_comp_iter(_Iter_comp_iter<_Compare> __comp, _Iterator __it)
|
|
{ return _Iter_comp_to_iter<_Compare, _Iterator>(__comp._M_comp, __it); }
|
|
|
|
template<typename _Predicate>
|
|
struct _Iter_negate
|
|
{
|
|
_Predicate _M_pred;
|
|
|
|
_Iter_negate(_Predicate __pred)
|
|
: _M_pred(__pred)
|
|
{ }
|
|
|
|
template<typename _Iterator>
|
|
bool
|
|
operator()(_Iterator __it)
|
|
{ return !bool(_M_pred(*__it)); }
|
|
};
|
|
|
|
template<typename _Predicate>
|
|
inline _Iter_negate<_Predicate>
|
|
__negate(_Iter_pred<_Predicate> __pred)
|
|
{ return _Iter_negate<_Predicate>(__pred._M_pred); }
|
|
|
|
} // namespace __ops
|
|
} // namespace __gnu_cxx
|
|
|
|
#endif
|