mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-07-12 14:54:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix generator_iterator

Browse source 
fix random::begin, end
add random::combine_copy
This commit is contained in:
bolero-MURAKAMI 2012-09-27 21:57:51 +09:00
parent f40ee0a2ff
commit 10e9a7679d
4 changed files with 39 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

13
sprout/iterator/generator_iterator.hpp
View file

@ -17,16 +17,16 @@ namespace sprout {
class generator_iterator
: public std::iterator<
std::forward_iterator_tag,
typename std::remove_reference<decltype(sprout::generators::generated_value(std::declval<Generator>()))>::type,
typename std::remove_reference<decltype(sprout::generators::generated_value(std::declval<Generator const>()))>::type,
std::ptrdiff_t,
typename std::remove_reference<decltype(sprout::generators::generated_value(std::declval<Generator>()))>::type*,
decltype(sprout::generators::generated_value(std::declval<Generator>()))
typename std::remove_reference<decltype(sprout::generators::generated_value(std::declval<Generator const>()))>::type*,
decltype(sprout::generators::generated_value(std::declval<Generator const>()))
>
{
public:
typedef Generator generator_type;
typedef std::forward_iterator_tag iterator_category;
typedef decltype(sprout::generators::generated_value(std::declval<Generator>())) reference;
typedef decltype(sprout::generators::generated_value(std::declval<Generator const>())) reference;
typedef typename std::remove_reference<reference>::type value_type;
typedef std::ptrdiff_t difference_type;
typedef value_type* pointer;
@ -96,7 +96,10 @@ namespace sprout {
SPROUT_CONSTEXPR reference operator*() const {
return count_ != 0
? sprout::generators::generated_value(gen_)
: (throw std::out_of_range("generator_iterator<>: dereference at out of range"), gen_.result())
: (
throw std::out_of_range("generator_iterator<>: dereference at out of range"),
sprout::generators::generated_value(gen_)
)
;
}
SPROUT_CONSTEXPR pointer operator->() const {