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

fix iterator distance implementation and adapt-interface

Browse source
This commit is contained in:
bolero-MURAKAMI 2012-09-26 18:42:43 +09:00
parent a4c7df65e0
commit aec15c55a8
15 changed files with 194 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

114
sprout/generator/generated_value.hpp
View file

@ -7,29 +7,10 @@
#include <sprout/type_traits/enabler_if.hpp> #include <sprout/type_traits/enabler_if.hpp>
#include <sprout/tuple/tuple/get.hpp> #include <sprout/tuple/tuple/get.hpp>
namespace sprout {
namespace generators {
void generated_value();
} // namespace generators
} // namespace sprout
namespace sprout_generator_detail { namespace sprout_generator_detail {
using sprout::tuples::get; struct not_found_adl_generated_value {};
template<typename T> sprout_generator_detail::not_found_adl_generated_value generated_value(...);
struct has_spr_generated_value_test {
public:
template<
typename U = T,
typename = decltype(sprout::generators::generated_value(std::declval<U>()))
>
static std::true_type test(int);
static std::false_type test(...);
};
template<typename T>
struct has_spr_generated_value
: public decltype(sprout_generator_detail::has_spr_generated_value_test<T>::test(0))
{};
template<typename T> template<typename T>
struct has_mem_generated_value_test { struct has_mem_generated_value_test {
@ -46,12 +27,29 @@ namespace sprout_generator_detail {
: public decltype(sprout_generator_detail::has_mem_generated_value_test<T>::test(0)) : public decltype(sprout_generator_detail::has_mem_generated_value_test<T>::test(0))
{}; {};
template<typename T>
struct has_adl_generated_value_test {
public:
template<
typename U = T,
typename sprout::enabler_if<
!std::is_same<decltype(generated_value(std::declval<U>())), sprout_generator_detail::not_found_adl_generated_value>::value
>::type = sprout::enabler
>
static std::true_type test(int);
static std::false_type test(...);
};
template<typename T>
struct has_adl_generated_value
: public decltype(sprout_generator_detail::has_adl_generated_value_test<T>::test(0))
{};
template<typename T> template<typename T>
struct has_tuple_get_generated_value_test { struct has_tuple_get_generated_value_test {
public: public:
template< template<
typename U = T, typename U = T,
typename = decltype(get<0>(std::declval<U>())) typename = decltype(sprout::tuples::get<0>(std::declval<U>()))
> >
static std::true_type test(int); static std::true_type test(int);
static std::false_type test(...); static std::false_type test(...);
@ -62,40 +60,40 @@ namespace sprout_generator_detail {
{}; {};
template<typename T, typename Enable = void> template<typename T, typename Enable = void>
struct select_spr_generated_value; struct select_mem_generated_value;
template<typename T> template<typename T>
struct select_spr_generated_value< struct select_mem_generated_value<
T, T,
typename std::enable_if<sprout_generator_detail::has_spr_generated_value<T>::value>::type typename std::enable_if<sprout_generator_detail::has_mem_generated_value<T>::value>::type
> >
: public std::true_type : public std::true_type
{}; {};
template<typename T> template<typename T>
struct select_spr_generated_value< struct select_mem_generated_value<
T, T,
typename std::enable_if<!sprout_generator_detail::has_spr_generated_value<T>::value>::type typename std::enable_if<!sprout_generator_detail::has_mem_generated_value<T>::value>::type
> >
: public std::false_type : public std::false_type
{}; {};
template<typename T, typename Enable = void> template<typename T, typename Enable = void>
struct select_mem_generated_value; struct select_adl_generated_value;
template<typename T> template<typename T>
struct select_mem_generated_value< struct select_adl_generated_value<
T, T,
typename std::enable_if< typename std::enable_if<
sprout_generator_detail::has_mem_generated_value<T>::value sprout_generator_detail::has_adl_generated_value<T>::value
&& !sprout_generator_detail::has_spr_generated_value<T>::value && !sprout_generator_detail::has_mem_generated_value<T>::value
>::type >::type
> >
: public std::true_type : public std::true_type
{}; {};
template<typename T> template<typename T>
struct select_mem_generated_value< struct select_adl_generated_value<
T, T,
typename std::enable_if<!( typename std::enable_if<!(
sprout_generator_detail::has_mem_generated_value<T>::value sprout_generator_detail::has_adl_generated_value<T>::value
&& !sprout_generator_detail::has_spr_generated_value<T>::value && !sprout_generator_detail::has_mem_generated_value<T>::value
)>::type )>::type
> >
: public std::false_type : public std::false_type
@ -108,8 +106,8 @@ namespace sprout_generator_detail {
T, T,
typename std::enable_if< typename std::enable_if<
sprout_generator_detail::has_tuple_get_generated_value<T>::value sprout_generator_detail::has_tuple_get_generated_value<T>::value
&& !sprout_generator_detail::has_spr_generated_value<T>::value
&& !sprout_generator_detail::has_mem_generated_value<T>::value && !sprout_generator_detail::has_mem_generated_value<T>::value
&& !sprout_generator_detail::has_adl_generated_value<T>::value
>::type >::type
> >
: public std::true_type : public std::true_type
@ -119,8 +117,8 @@ namespace sprout_generator_detail {
T, T,
typename std::enable_if<!( typename std::enable_if<!(
sprout_generator_detail::has_tuple_get_generated_value<T>::value sprout_generator_detail::has_tuple_get_generated_value<T>::value
&& !sprout_generator_detail::has_spr_generated_value<T>::value
&& !sprout_generator_detail::has_mem_generated_value<T>::value && !sprout_generator_detail::has_mem_generated_value<T>::value
&& !sprout_generator_detail::has_adl_generated_value<T>::value
)>::type )>::type
> >
: public std::false_type : public std::false_type
@ -128,47 +126,37 @@ namespace sprout_generator_detail {
template<typename T, typename = void> template<typename T, typename = void>
struct noexcept_generated_value; struct noexcept_generated_value;
// template<typename T>
// struct noexcept_generated_value<T, typename std::enable_if<sprout_generator_detail::select_spr_generated_value<T>::value>::type>
// : public std::integral_constant<bool, SPROUT_NOEXCEPT_EXPR_OR_DEFAULT(sprout::generators::generated_value(std::declval<T>()), false)>
// {};
template<typename T> template<typename T>
struct noexcept_generated_value<T, typename std::enable_if<sprout_generator_detail::select_mem_generated_value<T>::value>::type> struct noexcept_generated_value<T, typename std::enable_if<sprout_generator_detail::select_mem_generated_value<T>::value>::type>
: public std::integral_constant<bool, SPROUT_NOEXCEPT_EXPR_OR_DEFAULT(std::declval<T>().generated_value(), false)> : public std::integral_constant<bool, SPROUT_NOEXCEPT_EXPR_OR_DEFAULT(std::declval<T>().generated_value(), false)>
{}; {};
template<typename T> template<typename T>
struct noexcept_generated_value<T, typename std::enable_if<sprout_generator_detail::select_adl_generated_value<T>::value>::type>
: public std::integral_constant<bool, SPROUT_NOEXCEPT_EXPR_OR_DEFAULT(generated_value(std::declval<T>()), false)>
{};
template<typename T>
struct noexcept_generated_value<T, typename std::enable_if<sprout_generator_detail::select_tuple_get_generated_value<T>::value>::type> struct noexcept_generated_value<T, typename std::enable_if<sprout_generator_detail::select_tuple_get_generated_value<T>::value>::type>
: public std::integral_constant<bool, SPROUT_NOEXCEPT_EXPR_OR_DEFAULT(get<0>(std::declval<T>()), false)> : public std::integral_constant<bool, SPROUT_NOEXCEPT_EXPR_OR_DEFAULT(sprout::tuples::get<0>(std::declval<T>()), false)>
{}; {};
template<typename T, typename = void> template<typename T, typename = void>
struct generated_value_result; struct generated_value_result;
// template<typename T>
// struct generated_value_result<T, typename std::enable_if<sprout_generator_detail::select_spr_generated_value<T>::value>::type> {
// public:
// typedef decltype(sprout::generators::generated_value(std::declval<T>())) type;
// };
template<typename T> template<typename T>
struct generated_value_result<T, typename std::enable_if<sprout_generator_detail::select_mem_generated_value<T>::value>::type> { struct generated_value_result<T, typename std::enable_if<sprout_generator_detail::select_mem_generated_value<T>::value>::type> {
public: public:
typedef decltype(std::declval<T>().generated_value()) type; typedef decltype(std::declval<T>().generated_value()) type;
}; };
template<typename T> template<typename T>
struct generated_value_result<T, typename std::enable_if<sprout_generator_detail::select_adl_generated_value<T>::value>::type> {
public:
typedef decltype(generated_value(std::declval<T>())) type;
};
template<typename T>
struct generated_value_result<T, typename std::enable_if<sprout_generator_detail::select_tuple_get_generated_value<T>::value>::type> { struct generated_value_result<T, typename std::enable_if<sprout_generator_detail::select_tuple_get_generated_value<T>::value>::type> {
public: public:
typedef decltype(get<0>(std::declval<T>())) type; typedef decltype(sprout::tuples::get<0>(std::declval<T>())) type;
}; };
// template<
// typename T,
// typename sprout::enabler_if<sprout_generator_detail::select_spr_generated_value<T>::value>::type = sprout::enabler
// >
// inline SPROUT_CONSTEXPR typename sprout_generator_detail::generated_value_result<T>::type
// generated_value_impl(T&& t)
// SPROUT_NOEXCEPT_EXPR((sprout_generator_detail::noexcept_generated_value<T>::value))
// {
// return sprout::generators::generated_value(sprout::forward<T>(t));
// }
template< template<
typename T, typename T,
typename sprout::enabler_if<sprout_generator_detail::select_mem_generated_value<T>::value>::type = sprout::enabler typename sprout::enabler_if<sprout_generator_detail::select_mem_generated_value<T>::value>::type = sprout::enabler
@ -179,6 +167,16 @@ namespace sprout_generator_detail {
{ {
return sprout::forward<T>(t).generated_value(); return sprout::forward<T>(t).generated_value();
} }
template<
typename T,
typename sprout::enabler_if<sprout_generator_detail::select_adl_generated_value<T>::value>::type = sprout::enabler
>
inline SPROUT_CONSTEXPR typename sprout_generator_detail::generated_value_result<T>::type
generated_value_impl(T&& t)
SPROUT_NOEXCEPT_EXPR((sprout_generator_detail::noexcept_generated_value<T>::value))
{
return generated_value(sprout::forward<T>(t));
}
template< template<
typename T, typename T,
typename sprout::enabler_if<sprout_generator_detail::select_tuple_get_generated_value<T>::value>::type = sprout::enabler typename sprout::enabler_if<sprout_generator_detail::select_tuple_get_generated_value<T>::value>::type = sprout::enabler
@ -187,7 +185,7 @@ namespace sprout_generator_detail {
generated_value_impl(T&& t) generated_value_impl(T&& t)
SPROUT_NOEXCEPT_EXPR((sprout_generator_detail::noexcept_generated_value<T>::value)) SPROUT_NOEXCEPT_EXPR((sprout_generator_detail::noexcept_generated_value<T>::value))
{ {
return get<0>(sprout::forward<T>(t)); return sprout::tuples::get<0>(sprout::forward<T>(t));
} }
} // namespace sprout_generator_detail } // namespace sprout_generator_detail

114
sprout/generator/next_generator.hpp
View file

@ -7,29 +7,10 @@
#include <sprout/type_traits/enabler_if.hpp> #include <sprout/type_traits/enabler_if.hpp>
#include <sprout/tuple/tuple/get.hpp> #include <sprout/tuple/tuple/get.hpp>
namespace sprout {
namespace generators {
void next_generator();
} // namespace generators
} // namespace sprout
namespace sprout_generator_detail { namespace sprout_generator_detail {
using sprout::tuples::get; struct not_found_adl_next_generator {};
template<typename T> sprout_generator_detail::not_found_adl_next_generator next_generator(...);
struct has_spr_next_generator_test {
public:
template<
typename U = T,
typename = decltype(sprout::generators::next_generator(std::declval<U>()))
>
static std::true_type test(int);
static std::false_type test(...);
};
template<typename T>
struct has_spr_next_generator
: public decltype(sprout_generator_detail::has_spr_next_generator_test<T>::test(0))
{};
template<typename T> template<typename T>
struct has_mem_next_generator_test { struct has_mem_next_generator_test {
@ -46,12 +27,29 @@ namespace sprout_generator_detail {
: public decltype(sprout_generator_detail::has_mem_next_generator_test<T>::test(0)) : public decltype(sprout_generator_detail::has_mem_next_generator_test<T>::test(0))
{}; {};
template<typename T>
struct has_adl_next_generator_test {
public:
template<
typename U = T,
typename sprout::enabler_if<
!std::is_same<decltype(next_generator(std::declval<U>())), sprout_generator_detail::not_found_adl_next_generator>::value
>::type = sprout::enabler
>
static std::true_type test(int);
static std::false_type test(...);
};
template<typename T>
struct has_adl_next_generator
: public decltype(sprout_generator_detail::has_adl_next_generator_test<T>::test(0))
{};
template<typename T> template<typename T>
struct has_tuple_get_next_generator_test { struct has_tuple_get_next_generator_test {
public: public:
template< template<
typename U = T, typename U = T,
typename = decltype(get<1>(std::declval<U>())) typename = decltype(sprout::tuples::get<1>(std::declval<U>()))
> >
static std::true_type test(int); static std::true_type test(int);
static std::false_type test(...); static std::false_type test(...);
@ -62,40 +60,40 @@ namespace sprout_generator_detail {
{}; {};
template<typename T, typename Enable = void> template<typename T, typename Enable = void>
struct select_spr_next_generator; struct select_mem_next_generator;
template<typename T> template<typename T>
struct select_spr_next_generator< struct select_mem_next_generator<
T, T,
typename std::enable_if<sprout_generator_detail::has_spr_next_generator<T>::value>::type typename std::enable_if<sprout_generator_detail::has_mem_next_generator<T>::value>::type
> >
: public std::true_type : public std::true_type
{}; {};
template<typename T> template<typename T>
struct select_spr_next_generator< struct select_mem_next_generator<
T, T,
typename std::enable_if<!sprout_generator_detail::has_spr_next_generator<T>::value>::type typename std::enable_if<!sprout_generator_detail::has_mem_next_generator<T>::value>::type
> >
: public std::false_type : public std::false_type
{}; {};
template<typename T, typename Enable = void> template<typename T, typename Enable = void>
struct select_mem_next_generator; struct select_adl_next_generator;
template<typename T> template<typename T>
struct select_mem_next_generator< struct select_adl_next_generator<
T, T,
typename std::enable_if< typename std::enable_if<
sprout_generator_detail::has_mem_next_generator<T>::value sprout_generator_detail::has_adl_next_generator<T>::value
&& !sprout_generator_detail::has_spr_next_generator<T>::value && !sprout_generator_detail::has_mem_next_generator<T>::value
>::type >::type
> >
: public std::true_type : public std::true_type
{}; {};
template<typename T> template<typename T>
struct select_mem_next_generator< struct select_adl_next_generator<
T, T,
typename std::enable_if<!( typename std::enable_if<!(
sprout_generator_detail::has_mem_next_generator<T>::value sprout_generator_detail::has_adl_next_generator<T>::value
&& !sprout_generator_detail::has_spr_next_generator<T>::value && !sprout_generator_detail::has_mem_next_generator<T>::value
)>::type )>::type
> >
: public std::false_type : public std::false_type
@ -108,8 +106,8 @@ namespace sprout_generator_detail {
T, T,
typename std::enable_if< typename std::enable_if<
sprout_generator_detail::has_tuple_get_next_generator<T>::value sprout_generator_detail::has_tuple_get_next_generator<T>::value
&& !sprout_generator_detail::has_spr_next_generator<T>::value
&& !sprout_generator_detail::has_mem_next_generator<T>::value && !sprout_generator_detail::has_mem_next_generator<T>::value
&& !sprout_generator_detail::has_adl_next_generator<T>::value
>::type >::type
> >
: public std::true_type : public std::true_type
@ -119,8 +117,8 @@ namespace sprout_generator_detail {
T, T,
typename std::enable_if<!( typename std::enable_if<!(
sprout_generator_detail::has_tuple_get_next_generator<T>::value sprout_generator_detail::has_tuple_get_next_generator<T>::value
&& !sprout_generator_detail::has_spr_next_generator<T>::value
&& !sprout_generator_detail::has_mem_next_generator<T>::value && !sprout_generator_detail::has_mem_next_generator<T>::value
&& !sprout_generator_detail::has_adl_next_generator<T>::value
)>::type )>::type
> >
: public std::false_type : public std::false_type
@ -128,47 +126,37 @@ namespace sprout_generator_detail {
template<typename T, typename = void> template<typename T, typename = void>
struct noexcept_next_generator; struct noexcept_next_generator;
// template<typename T>
// struct noexcept_next_generator<T, typename std::enable_if<sprout_generator_detail::select_spr_next_generator<T>::value>::type>
// : public std::integral_constant<bool, SPROUT_NOEXCEPT_EXPR_OR_DEFAULT(sprout::generators::next_generator(std::declval<T>()), false)>
// {};
template<typename T> template<typename T>
struct noexcept_next_generator<T, typename std::enable_if<sprout_generator_detail::select_mem_next_generator<T>::value>::type> struct noexcept_next_generator<T, typename std::enable_if<sprout_generator_detail::select_mem_next_generator<T>::value>::type>
: public std::integral_constant<bool, SPROUT_NOEXCEPT_EXPR_OR_DEFAULT(std::declval<T>().next_generator(), false)> : public std::integral_constant<bool, SPROUT_NOEXCEPT_EXPR_OR_DEFAULT(std::declval<T>().next_generator(), false)>
{}; {};
template<typename T> template<typename T>
struct noexcept_next_generator<T, typename std::enable_if<sprout_generator_detail::select_adl_next_generator<T>::value>::type>
: public std::integral_constant<bool, SPROUT_NOEXCEPT_EXPR_OR_DEFAULT(next_generator(std::declval<T>()), false)>
{};
template<typename T>
struct noexcept_next_generator<T, typename std::enable_if<sprout_generator_detail::select_tuple_get_next_generator<T>::value>::type> struct noexcept_next_generator<T, typename std::enable_if<sprout_generator_detail::select_tuple_get_next_generator<T>::value>::type>
: public std::integral_constant<bool, SPROUT_NOEXCEPT_EXPR_OR_DEFAULT(get<1>(std::declval<T>()), false)> : public std::integral_constant<bool, SPROUT_NOEXCEPT_EXPR_OR_DEFAULT(sprout::tuples::get<1>(std::declval<T>()), false)>
{}; {};
template<typename T, typename = void> template<typename T, typename = void>
struct next_generator_result; struct next_generator_result;
// template<typename T>
// struct next_generator_result<T, typename std::enable_if<sprout_generator_detail::select_spr_next_generator<T>::value>::type> {
// public:
// typedef decltype(sprout::generators::next_generator(std::declval<T>())) type;
// };
template<typename T> template<typename T>
struct next_generator_result<T, typename std::enable_if<sprout_generator_detail::select_mem_next_generator<T>::value>::type> { struct next_generator_result<T, typename std::enable_if<sprout_generator_detail::select_mem_next_generator<T>::value>::type> {
public: public:
typedef decltype(std::declval<T>().next_generator()) type; typedef decltype(std::declval<T>().next_generator()) type;
}; };
template<typename T> template<typename T>
struct next_generator_result<T, typename std::enable_if<sprout_generator_detail::select_adl_next_generator<T>::value>::type> {
public:
typedef decltype(next_generator(std::declval<T>())) type;
};
template<typename T>
struct next_generator_result<T, typename std::enable_if<sprout_generator_detail::select_tuple_get_next_generator<T>::value>::type> { struct next_generator_result<T, typename std::enable_if<sprout_generator_detail::select_tuple_get_next_generator<T>::value>::type> {
public: public:
typedef decltype(get<1>(std::declval<T>())) type; typedef decltype(sprout::tuples::get<1>(std::declval<T>())) type;
}; };
// template<
// typename T,
// typename sprout::enabler_if<sprout_generator_detail::select_spr_next_generator<T>::value>::type = sprout::enabler
// >
// inline SPROUT_CONSTEXPR typename sprout_generator_detail::next_generator_result<T>::type
// next_generator_impl(T&& t)
// SPROUT_NOEXCEPT_EXPR((sprout_generator_detail::noexcept_next_generator<T>::value))
// {
// return sprout::generators::next_generator(sprout::forward<T>(t));
// }
template< template<
typename T, typename T,
typename sprout::enabler_if<sprout_generator_detail::select_mem_next_generator<T>::value>::type = sprout::enabler typename sprout::enabler_if<sprout_generator_detail::select_mem_next_generator<T>::value>::type = sprout::enabler
@ -179,6 +167,16 @@ namespace sprout_generator_detail {
{ {
return sprout::forward<T>(t).next_generator(); return sprout::forward<T>(t).next_generator();
} }
template<
typename T,
typename sprout::enabler_if<sprout_generator_detail::select_adl_next_generator<T>::value>::type = sprout::enabler
>
inline SPROUT_CONSTEXPR typename sprout_generator_detail::next_generator_result<T>::type
next_generator_impl(T&& t)
SPROUT_NOEXCEPT_EXPR((sprout_generator_detail::noexcept_next_generator<T>::value))
{
return next_generator(sprout::forward<T>(t));
}
template< template<
typename T, typename T,
typename sprout::enabler_if<sprout_generator_detail::select_tuple_get_next_generator<T>::value>::type = sprout::enabler typename sprout::enabler_if<sprout_generator_detail::select_tuple_get_next_generator<T>::value>::type = sprout::enabler
@ -187,7 +185,7 @@ namespace sprout_generator_detail {
next_generator_impl(T&& t) next_generator_impl(T&& t)
SPROUT_NOEXCEPT_EXPR((sprout_generator_detail::noexcept_next_generator<T>::value)) SPROUT_NOEXCEPT_EXPR((sprout_generator_detail::noexcept_next_generator<T>::value))
{ {
return get<1>(sprout::forward<T>(t)); return sprout::tuples::get<1>(sprout::forward<T>(t));
} }
} // namespace sprout_generator_detail } // namespace sprout_generator_detail

4
sprout/iterator/bytes_iterator.hpp
View file

@ -183,11 +183,11 @@ namespace sprout {
} }
// //
// distance // iterator_distance
// //
template<typename Iterator, typename Traits> template<typename Iterator, typename Traits>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::bytes_iterator<Iterator, Traits> >::difference_type inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::bytes_iterator<Iterator, Traits> >::difference_type
distance( iterator_distance(
sprout::bytes_iterator<Iterator, Traits> first, sprout::bytes_iterator<Iterator, Traits> first,
sprout::bytes_iterator<Iterator, Traits> last sprout::bytes_iterator<Iterator, Traits> last
) )

4
sprout/iterator/counting_iterator.hpp
View file

@ -191,11 +191,11 @@ namespace sprout {
} }
// //
// distance // iterator_distance
// //
template<typename Incrementable> template<typename Incrementable>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::counting_iterator<Incrementable> >::difference_type inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::counting_iterator<Incrementable> >::difference_type
distance( iterator_distance(
sprout::counting_iterator<Incrementable> first, sprout::counting_iterator<Incrementable> first,
sprout::counting_iterator<Incrementable> last sprout::counting_iterator<Incrementable> last
) )

28
sprout/iterator/distance.hpp
View file

@ -6,30 +6,36 @@
#include <sprout/iterator/next.hpp> #include <sprout/iterator/next.hpp>
namespace sprout { namespace sprout {
namespace detail { namespace iterator_detail {
// Copyright (C) 2011 RiSK (sscrisk) // Copyright (C) 2011 RiSK (sscrisk)
template<typename InputIterator> template<typename InputIterator>
inline SPROUT_CONSTEXPR typename std::iterator_traits<InputIterator>::difference_type inline SPROUT_CONSTEXPR typename std::iterator_traits<InputIterator>::difference_type
distance(InputIterator first, InputIterator last) { iterator_distance(InputIterator first, InputIterator last) {
return first == last ? 0 return first == last ? 0
: 1 + sprout::detail::distance(sprout::next(first), last) : 1 + sprout::iterator_detail::iterator_distance(sprout::next(first), last)
; ;
} }
template<typename InputIterator> } // namespace iterator_detail
inline SPROUT_CONSTEXPR typename std::iterator_traits<InputIterator>::difference_type } // namespace sprout
distance_impl(InputIterator first, InputIterator last) {
using sprout::detail::distance; namespace sprout_iterator_detail {
return distance(first, last); template<typename InputIterator>
} inline SPROUT_CONSTEXPR typename std::iterator_traits<InputIterator>::difference_type
} // namespace detail distance(InputIterator first, InputIterator last) {
using sprout::iterator_detail::iterator_distance;
return iterator_distance(first, last);
}
} // namespace sprout_iterator_detail
namespace sprout {
// //
// distance // distance
// //
template<typename InputIterator> template<typename InputIterator>
inline SPROUT_CONSTEXPR typename std::iterator_traits<InputIterator>::difference_type inline SPROUT_CONSTEXPR typename std::iterator_traits<InputIterator>::difference_type
distance(InputIterator first, InputIterator last) { distance(InputIterator first, InputIterator last) {
return sprout::detail::distance_impl(first, last); return sprout_iterator_detail::distance(first, last);
} }
} // namespace sprout } // namespace sprout

4
sprout/iterator/index_iterator.hpp
View file

@ -196,11 +196,11 @@ namespace sprout {
{}; {};
// //
// distance // iterator_distance
// //
template<typename Container> template<typename Container>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::index_iterator<Container> >::difference_type inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::index_iterator<Container> >::difference_type
distance( iterator_distance(
sprout::index_iterator<Container> first, sprout::index_iterator<Container> first,
sprout::index_iterator<Container> last sprout::index_iterator<Container> last
) )

4
sprout/iterator/reverse_iterator.hpp
View file

@ -200,11 +200,11 @@ namespace sprout {
} }
// //
// distance // iterator_distance
// //
template<typename Iterator> template<typename Iterator>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::reverse_iterator<Iterator> >::difference_type inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::reverse_iterator<Iterator> >::difference_type
distance( iterator_distance(
sprout::reverse_iterator<Iterator> first, sprout::reverse_iterator<Iterator> first,
sprout::reverse_iterator<Iterator> last sprout::reverse_iterator<Iterator> last
) )

4
sprout/iterator/sawtooth_iterator.hpp
View file

@ -219,11 +219,11 @@ namespace sprout {
} }
// //
// distance // iterator_distance
// //
template<typename Value> template<typename Value>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::sawtooth_iterator<Value> >::difference_type inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::sawtooth_iterator<Value> >::difference_type
distance( iterator_distance(
sprout::sawtooth_iterator<Value> first, sprout::sawtooth_iterator<Value> first,
sprout::sawtooth_iterator<Value> last sprout::sawtooth_iterator<Value> last
) )

4
sprout/iterator/sinusoid_iterator.hpp
View file

@ -228,11 +228,11 @@ namespace sprout {
} }
// //
// distance // iterator_distance
// //
template<typename Value> template<typename Value>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::sinusoid_iterator<Value> >::difference_type inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::sinusoid_iterator<Value> >::difference_type
distance( iterator_distance(
sprout::sinusoid_iterator<Value> first, sprout::sinusoid_iterator<Value> first,
sprout::sinusoid_iterator<Value> last sprout::sinusoid_iterator<Value> last
) )

4
sprout/iterator/size_enum_iterator.hpp
View file

@ -393,11 +393,11 @@ namespace sprout {
} }
// //
// distance // iterator_distance
// //
template<typename Iterator, bool Separated> template<typename Iterator, bool Separated>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::size_enum_iterator<Iterator, Separated> >::difference_type inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::size_enum_iterator<Iterator, Separated> >::difference_type
distance( iterator_distance(
sprout::size_enum_iterator<Iterator, Separated> first, sprout::size_enum_iterator<Iterator, Separated> first,
sprout::size_enum_iterator<Iterator, Separated> last sprout::size_enum_iterator<Iterator, Separated> last
) )

4
sprout/iterator/square_iterator.hpp
View file

@ -229,11 +229,11 @@ namespace sprout {
} }
// //
// distance // iterator_distance
// //
template<typename Value> template<typename Value>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::square_iterator<Value> >::difference_type inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::square_iterator<Value> >::difference_type
distance( iterator_distance(
sprout::square_iterator<Value> first, sprout::square_iterator<Value> first,
sprout::square_iterator<Value> last sprout::square_iterator<Value> last
) )

4
sprout/iterator/transform_iterator.hpp
View file

@ -387,11 +387,11 @@ namespace sprout {
} }
// //
// distance // iterator_distance
// //
template<typename UnaryOrBinaryFunction, typename LIterator, typename RIterator> template<typename UnaryOrBinaryFunction, typename LIterator, typename RIterator>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::transform_iterator<UnaryOrBinaryFunction, LIterator, RIterator> >::difference_type inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::transform_iterator<UnaryOrBinaryFunction, LIterator, RIterator> >::difference_type
distance( iterator_distance(
sprout::transform_iterator<UnaryOrBinaryFunction, LIterator, RIterator> first, sprout::transform_iterator<UnaryOrBinaryFunction, LIterator, RIterator> first,
sprout::transform_iterator<UnaryOrBinaryFunction, LIterator, RIterator> last sprout::transform_iterator<UnaryOrBinaryFunction, LIterator, RIterator> last
) )

4
sprout/iterator/triangle_iterator.hpp
View file

@ -219,11 +219,11 @@ namespace sprout {
} }
// //
// distance // iterator_distance
// //
template<typename Value> template<typename Value>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::triangle_iterator<Value> >::difference_type inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::triangle_iterator<Value> >::difference_type
distance( iterator_distance(
sprout::triangle_iterator<Value> first, sprout::triangle_iterator<Value> first,
sprout::triangle_iterator<Value> last sprout::triangle_iterator<Value> last
) )

4
sprout/iterator/value_iterator.hpp
View file

@ -165,11 +165,11 @@ namespace sprout {
} }
// //
// distance // iterator_distance
// //
template<typename T> template<typename T>
inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::value_iterator<T> >::difference_type inline SPROUT_CONSTEXPR typename std::iterator_traits<sprout::value_iterator<T> >::difference_type
distance(sprout::value_iterator<T> first, sprout::value_iterator<T> last) { iterator_distance(sprout::value_iterator<T> first, sprout::value_iterator<T> last) {
return last - first; return last - first;
} }

48
sprout/random/random_result.hpp
View file

@ -187,12 +187,24 @@ namespace sprout {
SPROUT_CONSTEXPR result_type const& result() const { SPROUT_CONSTEXPR result_type const& result() const {
return result_; return result_;
} }
result_type& generated_value() {
return result_;
}
SPROUT_CONSTEXPR result_type const& generated_value() const {
return result_;
}
engine_type& engine() { engine_type& engine() {
return engine_; return engine_;
} }
SPROUT_CONSTEXPR engine_type const& engine() const { SPROUT_CONSTEXPR engine_type const& engine() const {
return engine_; return engine_;
} }
engine_type& next_generator() {
return engine_;
}
SPROUT_CONSTEXPR engine_type const& next_generator() const {
return engine_;
}
SPROUT_CONSTEXPR result_type min() const { SPROUT_CONSTEXPR result_type min() const {
return engine_.min(); return engine_.min();
} }
@ -244,15 +256,41 @@ namespace sprout {
} }
// //
// next // iterator_next
// //
template<typename Engine, typename Distribution> template<typename Engine, typename Distribution>
SPROUT_CONSTEXPR sprout::random::random_result<Engine, Distribution> next( SPROUT_CONSTEXPR sprout::random::random_result<Engine, Distribution>
sprout::random::random_result<Engine, Distribution> const& it iterator_next(sprout::random::random_result<Engine, Distribution> const& it) {
)
{
return it(); return it();
} }
//
// generated_value
//
template<typename Engine, typename Distribution>
inline SPROUT_CONSTEXPR typename sprout::random::random_result<Engine, Distribution>::result_type const&
generated_value(sprout::random::random_result<Engine, Distribution> const& t) {
return t.generated_value();
}
template<typename Engine, typename Distribution>
inline typename sprout::random::random_result<Engine, Distribution>::result_type&
generated_value(sprout::random::random_result<Engine, Distribution>& t) {
return t.generated_value();
}
//
// next_generator
//
template<typename Engine, typename Distribution>
inline SPROUT_CONSTEXPR typename sprout::random::random_result<Engine, Distribution>::engine_type const&
next_generator(sprout::random::random_result<Engine, Distribution> const& t) {
return t.next_generator();
}
template<typename Engine, typename Distribution>
inline typename sprout::random::random_result<Engine, Distribution>::engine_type&
next_generator(sprout::random::random_result<Engine, Distribution>& t) {
return t.next_generator();
}
} // namespace random } // namespace random
using sprout::random::random_result; using sprout::random::random_result;