c++ port of deque underway

[SVN r77808]
This commit is contained in:
Joel de Guzman
2012-04-07 09:56:07 +00:00
parent e15c27bc8b
commit 93ce3bd9bf
10 changed files with 49 additions and 41 deletions

View File

@ -9,7 +9,7 @@
#define BOOST_FUSION_SEQUENCE_CONTAINER_DEQUE_24112006_2036
#include <boost/fusion/container/deque/deque.hpp>
#include <boost/fusion/container/deque/convert.hpp>
//#include <boost/fusion/container/deque/convert.hpp>
#endif

View File

@ -14,11 +14,12 @@
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/container/deque/detail/keyed_element.hpp>
namespace boost { namespace fusion {
namespace boost { namespace fusion
{
template<typename Deque, typename T>
struct back_extended_deque
: detail::keyed_element<typename Deque::next_up, T, Deque>,
sequence_base<back_extended_deque<Deque, T> >
: detail::keyed_element<typename Deque::next_up, T, Deque>
, sequence_base<back_extended_deque<Deque, T> >
{
typedef detail::keyed_element<typename Deque::next_up, T, Deque> base;
typedef typename Deque::next_down next_down;

View File

@ -13,7 +13,7 @@
|| defined(BOOST_NO_RVALUE_REFERENCES))
# include <boost/fusion/container/deque/cpp03_deque.hpp>
#else
# include <boost/fusion/container/deque/cpp03_deque.hpp>
# include <boost/fusion/container/deque/cpp11_deque.hpp>
#endif
#endif

View File

@ -15,7 +15,7 @@
|| defined(BOOST_NO_RVALUE_REFERENCES))
# include <boost/fusion/container/deque/cpp03_deque_fwd.hpp>
#else
# include <boost/fusion/container/deque/cpp03_deque_fwd.hpp>
# include <boost/fusion/container/deque/cpp11_deque_fwd.hpp>
#endif
#endif

View File

@ -18,7 +18,7 @@ namespace boost { namespace fusion {
struct bidirectional_traversal_tag;
template<typename Seq, int Pos>
template <typename Seq, int Pos>
struct deque_iterator
: iterator_facade<deque_iterator<Seq, Pos>, bidirectional_traversal_tag>
{

View File

@ -38,9 +38,12 @@ namespace boost { namespace fusion {
typedef typename Sequence::next_down next_down;
BOOST_MPL_ASSERT_RELATION(next_down::value, !=, next_up::value);
typedef mpl::plus<next_down, mpl::int_<1> > offset;
typedef mpl::int_<mpl::plus<N, offset>::value> adjusted_index;
typedef typename detail::keyed_element_value_at<Sequence, adjusted_index>::type element_type;
static int const offset = next_down::value + 1;
typedef mpl::int_<(N::value + offset)> adjusted_index;
typedef typename
detail::keyed_element_value_at<Sequence, adjusted_index>::type
element_type;
typedef typename add_reference<
typename mpl::eval_if<
is_const<Sequence>,

View File

@ -28,11 +28,13 @@ namespace boost { namespace fusion {
template<typename Sequence>
struct apply
{
typedef typename mpl::if_<
mpl::equal_to<typename Sequence::next_down, typename Sequence::next_up>,
deque_iterator<Sequence, 0>,
deque_iterator<
Sequence, mpl::plus<typename Sequence::next_down, mpl::int_<1> >::value> >::type type;
typedef typename
mpl::if_c<
(Sequence::next_down::value == Sequence::next_up::value)
, deque_iterator<Sequence, 0>
, deque_iterator<Sequence, (Sequence::next_down::value + 1)>
>::type
type;
static type call(Sequence& seq)
{

View File

@ -49,7 +49,7 @@ namespace detail {
*it, base::from_iterator(fusion::next(it)));
}
template<typename U, typename Rst>
template <typename U, typename Rst>
keyed_element(keyed_element<Key, U, Rst> const& rhs)
: Rest(rhs.get_base()), value_(rhs.value_)
{}

View File

@ -32,9 +32,11 @@ namespace boost { namespace fusion {
typedef typename Sequence::next_down next_down;
BOOST_MPL_ASSERT_RELATION(next_down::value, !=, next_up::value);
typedef mpl::plus<next_down, mpl::int_<1> > offset;
typedef mpl::int_<mpl::plus<N, offset>::value> adjusted_index;
typedef typename detail::keyed_element_value_at<Sequence, adjusted_index>::type type;
static int const offset = next_down::value + 1;
typedef mpl::int_<(N::value + offset)> adjusted_index;
typedef typename
detail::keyed_element_value_at<Sequence, adjusted_index>::type
type;
};
};
}

View File

@ -17,8 +17,8 @@ namespace boost { namespace fusion
{
template<typename Deque, typename T>
struct front_extended_deque
: detail::keyed_element<typename Deque::next_down, T, Deque>,
sequence_base<front_extended_deque<Deque, T> >
: detail::keyed_element<typename Deque::next_down, T, Deque>
, sequence_base<front_extended_deque<Deque, T> >
{
typedef detail::keyed_element<typename Deque::next_down, T, Deque> base;
typedef mpl::int_<(Deque::next_down::value - 1)> next_down;