benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

extend the protocol of the itertools core, abstracting the increment

Browse source
This commit is contained in:
Fischlurch 2009-11-13 01:02:31 +01:00
parent a1448ed6f6
commit a86517bd4f
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/lib/itertools.hpp
View file

@ -98,17 +98,23 @@ namespace lib {
{ }
IT&
source ()
pipe ()
{
return source_;
}
IT const&
source () const
pipe () const
{
return source_;
}
void
advance ()
{
++source_;
}
bool
evaluate () const
{
@ -146,11 +152,11 @@ namespace lib {
bool
iterate ()
{
if (!core_.source()) return false;
if (!core_.pipe()) return false;
do ++core_.source();
while (core_.source() && !core_.evaluate());
return core_.source();
do core_.advance();
while (core_.pipe() && !core_.evaluate());
return core_.pipe();
}
void
@ -182,14 +188,14 @@ namespace lib {
operator*() const
{
_maybe_throw();
return *core_.source();
return *core_.pipe();
}
pointer
operator->() const
{
_maybe_throw();
return core_.source();
return core_.pipe();
}
IterTool&
@ -213,7 +219,7 @@ namespace lib {
}
/// comparison is allowed to access the source iterator
/// comparison is allowed to access the feed pipe from core
template<class CX>
friend bool operator== (IterTool<CX> const& it1, IterTool<CX> const& it2);
};
@ -223,8 +229,8 @@ namespace lib {
inline bool
operator== (IterTool<CX> const& it1, IterTool<CX> const& it2)
{
return it1.isValid() == it2.isValid()
&& it1.core_.source() == it2.core_.source()
return it1.isValid() == it2.isValid()
&& it1.core_.pipe() == it2.core_.pipe()
;
}
@ -261,8 +267,8 @@ namespace lib {
bool
evaluate () const
{
return _Par::source()
&& predicate_(*_Par::source());
return _Par::pipe()
&& predicate_(*_Par::pipe());
}