feedc0de/boost_range
1
0
Fork 0
forked from boostorg/range
Code Pull Requests Activity

Boost.Range - modified join and irange to return public range types.

Browse Source 
[SVN r61690]
This commit is contained in:
Neil Groves
2010-04-29 22:03:58 +00:00
parent 3ef3363c2d
commit c9802507ab
3 changed files with 95 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
include/boost/range/detail/join_iterator.hpp
View File

@ -12,9 +12,9 @@
#define BOOST_RANGE_DETAIL_JOIN_ITERATOR_HPP_INCLUDED
#include <iterator>
#include <boost/assert.hpp>
#include <boost/iterator/iterator_traits.hpp>
#include <boost/iterator/iterator_facade.hpp>
#include <boost/intrusive_ptr.hpp>
#include <boost/range/begin.hpp>
#include <boost/range/end.hpp>
#include <boost/range/empty.hpp>
@ -30,21 +30,6 @@ namespace boost
template<typename Iterator1, typename Iterator2>
struct join_iterator_link
{
private:
class reference_count_t
{
public:
reference_count_t() : m_count(0u) {}
reference_count_t(const reference_count_t&) : m_count(0u) {}
reference_count_t& operator=(const reference_count_t&) { return *this; }
void increment() { ++m_count; }
bool decrement() { return --m_count ? false : true; }
private:
unsigned int m_count;
};
public:
join_iterator_link(Iterator1 last1, Iterator2 first2)
: last1(last1)
@ -52,43 +37,13 @@ public:
{
}
void add_reference() const
{
count.increment();
}
bool release_reference() const
{
return count.decrement();
}
Iterator1 last1;
Iterator2 first2;
private:
join_iterator_link() /* = delete */ ;
mutable reference_count_t count;
};
} // range_detail
template<typename Iterator1, typename Iterator2>
inline void intrusive_ptr_add_ref(const range_detail::join_iterator_link<Iterator1,Iterator2>* p)
{
p->add_reference();
}
template<typename Iterator1, typename Iterator2>
inline void intrusive_ptr_release(const range_detail::join_iterator_link<Iterator1,Iterator2>* p)
{
if (p->release_reference())
delete p;
}
namespace range_detail
{
class join_iterator_begin_tag {};
class join_iterator_end_tag {};
@ -184,7 +139,7 @@ public:
join_iterator(unsigned int section, Iterator1 current1, Iterator1 last1, Iterator2 first2, Iterator2 current2)
: m_section(section)
, m_it(section, current1, current2)
, m_link(new link_t(last1, first2))
, m_link(link_t(last1, first2))
{
}
@ -192,7 +147,7 @@ public:
join_iterator(Range1& r1, Range2& r2, join_iterator_begin_tag)
: m_section(boost::empty(r1) ? 1u : 0u)
, m_it(boost::empty(r1) ? 1u : 0u, boost::begin(r1), boost::begin(r2))
, m_link(new link_t(boost::end(r1), boost::begin(r2)))
, m_link(link_t(boost::end(r1), boost::begin(r2)))
{
}
@ -200,7 +155,7 @@ public:
join_iterator(const Range1& r1, const Range2& r2, join_iterator_begin_tag)
: m_section(boost::empty(r1) ? 1u : 0u)
, m_it(boost::empty(r1) ? 1u : 0u, boost::const_begin(r1), boost::const_begin(r2))
, m_link(new link_t(boost::const_end(r1), boost::const_begin(r2)))
, m_link(link_t(boost::const_end(r1), boost::const_begin(r2)))
{
}
@ -208,7 +163,7 @@ public:
join_iterator(Range1& r1, Range2& r2, join_iterator_end_tag)
: m_section(1u)
, m_it(1u, boost::end(r1), boost::end(r2))
, m_link(new link_t(boost::end(r1), boost::begin(r2)))
, m_link(link_t(boost::end(r1), boost::begin(r2)))
{
}
@ -216,7 +171,7 @@ public:
join_iterator(const Range1& r1, const Range2& r2, join_iterator_end_tag)
: m_section(1u)
, m_it(1u, boost::const_end(r1), boost::const_end(r2))
, m_link(new link_t(boost::const_end(r1), boost::const_begin(r2)))
, m_link(link_t(boost::const_end(r1), boost::const_begin(r2)))
{
}
@ -228,9 +183,9 @@ private:
else
{
++m_it.it1();
if (m_it.it1() == m_link->last1)
if (m_it.it1() == m_link.last1)
{
m_it.it2() = m_link->first2;
m_it.it2() = m_link.first2;
m_section = 1u;
}
}
@ -240,9 +195,9 @@ private:
{
if (m_section)
{
if (m_it.it2() == m_link->first2)
if (m_it.it2() == m_link.first2)
{
m_it.it1() = boost::prior(m_link->last1);
m_it.it1() = boost::prior(m_link.last1);
m_section = 0u;
}
else
@ -280,8 +235,8 @@ private:
result = other.m_it.it2() - m_it.it2();
else
{
result = (m_link->first2 - m_it.it2())
+ (other.m_it.it1() - m_link->last1);
result = (m_link.first2 - m_it.it2())
+ (other.m_it.it1() - m_link.last1);
BOOST_ASSERT( result <= 0 );
}
@ -290,8 +245,8 @@ private:
{
if (other.m_section)
{
result = (m_link->last1 - m_it.it1())
+ (other.m_it.it2() - m_link->first2);
result = (m_link.last1 - m_it.it1())
+ (other.m_it.it2() - m_link.first2);
}
else
result = other.m_it.it1() - m_it.it1();
@ -305,7 +260,7 @@ private:
BOOST_ASSERT( m_section == 1u );
if (offset < 0)
{
difference_t r2_dist = m_link->first2 - m_it.it2();
difference_t r2_dist = m_link.first2 - m_it.it2();
BOOST_ASSERT( r2_dist <= 0 );
if (offset >= r2_dist)
std::advance(m_it.it2(), offset);
@ -313,7 +268,7 @@ private:
{
difference_t r1_dist = offset - r2_dist;
BOOST_ASSERT( r1_dist <= 0 );
m_it.it1() = m_link->last1 + r1_dist;
m_it.it1() = m_link.last1 + r1_dist;
m_section = 0u;
}
}
@ -327,7 +282,7 @@ private:
BOOST_ASSERT( m_section == 0u );
if (offset > 0)
{
difference_t r1_dist = m_link->last1 - m_it.it1();
difference_t r1_dist = m_link.last1 - m_it.it1();
BOOST_ASSERT( r1_dist >= 0 );
if (offset < r1_dist)
std::advance(m_it.it1(), offset);
@ -335,7 +290,7 @@ private:
{
difference_t r2_dist = offset - r1_dist;
BOOST_ASSERT( r2_dist >= 0 );
m_it.it2() = m_link->first2 + r2_dist;
m_it.it2() = m_link.first2 + r2_dist;
m_section = 1u;
}
}
@ -345,7 +300,7 @@ private:
unsigned int m_section;
iterator_union m_it;
intrusive_ptr<const link_t> m_link;
link_t m_link;
friend class ::boost::iterator_core_access;
};