rdnvndr/cppcoro
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix generator<T> to satisfy the range concept

Browse source 
* Iterator type needed to support equality comparisons both it == sentinel and sentinel == it.
* difference_type needed to be a signed integer (it was an unsigned size_t)
This commit is contained in:
Lewis Baker 2019-10-29 13:48:25 -07:00 committed by GitHub
parent 1d5a4d9d1e
commit e2cfe2bebd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
include/cppcoro/generator.hpp
View file

@ -93,7 +93,7 @@ namespace cppcoro
using iterator_category = std::input_iterator_tag;
// What type should we use for counting elements of a potentially infinite sequence?
using difference_type = std::size_t;
using difference_type = std::ptrdiff_t;
using value_type = typename generator_promise<T>::value_type;
using reference = typename generator_promise<T>::reference_type;
using pointer = typename generator_promise<T>::pointer_type;
@ -107,25 +107,25 @@ namespace cppcoro
: m_coroutine(coroutine)
{}
bool operator==(const generator_iterator& other) const noexcept
friend bool operator==(const generator_iterator& it, generator_sentinel) noexcept
{
return m_coroutine == other.m_coroutine;
return !it.m_coroutine || it.m_coroutine.done();
}
bool operator==(generator_sentinel) const noexcept
{
return !m_coroutine || m_coroutine.done();
}
bool operator!=(const generator_iterator& other) const noexcept
friend bool operator!=(const generator_iterator& it, generator_sentinel) noexcept
{
return !(*this == other);
}
bool operator!=(generator_sentinel other) const noexcept
{
return !operator==(other);
}
friend bool operator==(generator_sentinel s, const generator_iterator& it) noexcept
{
return (it == s);
}
friend bool operator!=(generator_sentinel s, const generator_iterator& it) noexcept
{
return it != s;
}
generator_iterator& operator++()
{
@ -201,11 +201,11 @@ namespace cppcoro
m_coroutine.resume();
if (m_coroutine.done())
{
m_coroutine.promise().rethrow_if_exception();
m_coroutine.promise().rethrow_if_exception();
}
}
return iterator{ m_coroutine };
return iterator{ m_coroutine };
}
detail::generator_sentinel end() noexcept