OctaForge
/
libostd
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

remove range difference type (unused)

master
Daniel Kolesa 2017-04-16 17:23:09 +02:00
parent 71aa6ff70b
commit 1619dac782
6 changed files with 87 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ostd/algorithm.hh
View File

@ -1210,10 +1210,9 @@ namespace detail {
using range_category = std::common_type_t< using range_category = std::common_type_t<
range_category_t<T>, finite_random_access_range_tag range_category_t<T>, finite_random_access_range_tag
>; >;
using value_type = std::remove_reference_t<R>; using value_type = std::remove_reference_t<R>;
using reference = R; using reference = R;
using size_type = range_size_t<T>; using size_type = range_size_t<T>;
using difference_type = range_difference_t<T>;
private: private:
T p_range; T p_range;
@ -1260,7 +1259,7 @@ namespace detail {
* *
* The `reference` member type of the range is `R` where `R` is the return * The `reference` member type of the range is `R` where `R` is the return
* value of `func`. The `value_type` is `std::remove_reference_t<R>`. The * value of `func`. The `value_type` is `std::remove_reference_t<R>`. The
* size and difference types are preserved. * size type is preserved.
* *
* On each access of a range item (front, back, indexing), the `func` is * On each access of a range item (front, back, indexing), the `func` is
* called with the actual wrapped range's item and the result is returned. * called with the actual wrapped range's item and the result is returned.
@ -1304,10 +1303,9 @@ namespace detail {
using range_category = std::common_type_t< using range_category = std::common_type_t<
range_category_t<T>, forward_range_tag range_category_t<T>, forward_range_tag
>; >;
using value_type = range_value_t<T>; using value_type = range_value_t<T>;
using reference = range_reference_t<T>; using reference = range_reference_t<T>;
using size_type = range_size_t<T>; using size_type = range_size_t<T>;
using difference_type = range_difference_t<T>;
private: private:
T p_range; T p_range;
@ -1373,7 +1371,7 @@ namespace detail {
* } * }
* ~~~ * ~~~
* *
* The value, reference, size and difference types are preserved, as are * The value, reference and size types are preserved, as are
* calls to `front()` and `empty()`. * calls to `front()` and `empty()`.
* *
* @see ostd::map() * @see ostd::map()

9
ostd/coroutine.hh
View File

@ -1188,11 +1188,10 @@ using yield_type = typename detail::yield_type_base<T>::type;
namespace detail { namespace detail {
template<typename T> template<typename T>
struct generator_range: input_range<generator_range<T>> { struct generator_range: input_range<generator_range<T>> {
using range_category = input_range_tag; using range_category = input_range_tag;
using value_type = T; using value_type = T;
using reference = T &; using reference = T &;
using size_type = std::size_t; using size_type = std::size_t;
using difference_type = std::ptrdiff_t;
generator_range() = delete; generator_range() = delete;

7
ostd/io.hh
View File

@ -277,10 +277,9 @@ OSTD_EXPORT extern file_stream cerr;
namespace detail { namespace detail {
/* lightweight output range for direct stdout */ /* lightweight output range for direct stdout */
struct stdout_range: output_range<stdout_range> { struct stdout_range: output_range<stdout_range> {
using value_type = char; using value_type = char;
using reference = char &; using reference = char &;
using size_type = std::size_t; using size_type = std::size_t;
using difference_type = std::ptrdiff_t;
stdout_range() {} stdout_range() {}
void put(char c) { void put(char c) {

152
ostd/range.hh
View File

@ -188,11 +188,10 @@ namespace detail {
template<typename R> template<typename R>
struct range_traits_base<R, true> { struct range_traits_base<R, true> {
using range_category = typename R::range_category; using range_category = typename R::range_category;
using size_type = typename R::size_type; using size_type = typename R::size_type;
using value_type = typename R::value_type; using value_type = typename R::value_type;
using reference = typename R::reference; using reference = typename R::reference;
using difference_type = typename R::difference_type;
template<typename R2> template<typename R2>
static constexpr bool is_element_swappable_with = static constexpr bool is_element_swappable_with =
@ -239,7 +238,6 @@ namespace detail {
* * `size_type` - can contain the range's length (typically `size_t`) * * `size_type` - can contain the range's length (typically `size_t`)
* * `value_type` - the type of the range's elements * * `value_type` - the type of the range's elements
* * `reference` - the type returned from value accessors * * `reference` - the type returned from value accessors
* * `difference_type` - the type used for distances (typically `ptrdiff_t`)
* *
* It will always contain the following members as well: * It will always contain the following members as well:
* *
@ -277,7 +275,7 @@ namespace detail {
* You can read about more details [here](@ref ranges). * You can read about more details [here](@ref ranges).
* *
* @see ostd::range_category_t, ostd::range_size_t, ostd::range_value_t, * @see ostd::range_category_t, ostd::range_size_t, ostd::range_value_t,
* ostd::range_reference_t, ostd::range_difference_t * ostd::range_reference_t
*/ */
template<typename R> template<typename R>
struct range_traits: detail::range_traits_impl<R, detail::test_range_category<R>> {}; struct range_traits: detail::range_traits_impl<R, detail::test_range_category<R>> {};
@ -290,8 +288,7 @@ struct range_traits: detail::range_traits_impl<R, detail::test_range_category<R>
* typename ostd::range_traits<R>::range_category * typename ostd::range_traits<R>::range_category
* ~~~ * ~~~
* *
* @see ostd::range_size_t, ostd::range_value_t, ostd::range_reference_t, * @see ostd::range_size_t, ostd::range_value_t, ostd::range_reference_t
* ostd::range_difference_t
*/ */
template<typename R> template<typename R>
using range_category_t = typename range_traits<R>::range_category; using range_category_t = typename range_traits<R>::range_category;
@ -304,8 +301,7 @@ using range_category_t = typename range_traits<R>::range_category;
* typename ostd::range_traits<R>::size_type * typename ostd::range_traits<R>::size_type
* ~~~ * ~~~
* *
* @see ostd::range_category_t, ostd::range_value_t, ostd::range_reference_t, * @see ostd::range_category_t, ostd::range_value_t, ostd::range_reference_t
* ostd::range_difference_t
*/ */
template<typename R> template<typename R>
using range_size_t = typename range_traits<R>::size_type; using range_size_t = typename range_traits<R>::size_type;
@ -318,8 +314,7 @@ using range_size_t = typename range_traits<R>::size_type;
* typename ostd::range_traits<R>::value_type * typename ostd::range_traits<R>::value_type
* ~~~ * ~~~
* *
* @see ostd::range_category_t, ostd::range_size_t, ostd::range_reference_t, * @see ostd::range_category_t, ostd::range_size_t, ostd::range_reference_t
* ostd::range_difference_t
*/ */
template<typename R> template<typename R>
using range_value_t = typename range_traits<R>::value_type; using range_value_t = typename range_traits<R>::value_type;
@ -332,26 +327,11 @@ using range_value_t = typename range_traits<R>::value_type;
* typename ostd::range_traits<R>::reference * typename ostd::range_traits<R>::reference
* ~~~ * ~~~
* *
* @see ostd::range_category_t, ostd::range_size_t, ostd::range_value_t, * @see ostd::range_category_t, ostd::range_size_t, ostd::range_value_t
* ostd::range_difference_t
*/ */
template<typename R> template<typename R>
using range_reference_t = typename range_traits<R>::reference; using range_reference_t = typename range_traits<R>::reference;
/** @brief The difference type of a range type.
*
* It's the same as doing
*
* ~~~{.cc}
* typename ostd::range_traits<R>::difference_type
* ~~~
*
* @see ostd::range_category_t, ostd::range_size_t, ostd::range_value_t,
* ostd::range_reference_t
*/
template<typename R>
using range_difference_t = typename range_traits<R>::difference_type;
/** @brief Checks whether two ranges can swap elements with each other. /** @brief Checks whether two ranges can swap elements with each other.
* *
* It's the same as doing * It's the same as doing
@ -753,7 +733,7 @@ struct input_range {
* wrapped range will be always ostd::finite_random_access_range_tag. * wrapped range will be always ostd::finite_random_access_range_tag.
* Otherwise, it will be ostd::bidirectional_range_tag. * Otherwise, it will be ostd::bidirectional_range_tag.
* *
* The value, reference, size and difference types are the same. * The value, reference and size types are the same.
*/ */
auto reverse() const { auto reverse() const {
static_assert( static_assert(
@ -777,7 +757,7 @@ struct input_range {
* > == true * > == true
* ~~~ * ~~~
* *
* The value, size and difference types remain the same. The new reference * The value and size types remain the same. The new reference
* type becomes `ostd::range_value_t<R> &&`. * type becomes `ostd::range_value_t<R> &&`.
* *
* Accesses to the front member result in the element being moved. * Accesses to the front member result in the element being moved.
@ -792,8 +772,8 @@ struct input_range {
* remain mostly the same, but an index counter is kept and incremented on * remain mostly the same, but an index counter is kept and incremented on
* each pop. * each pop.
* *
* It's always at most ostd::forward_range_tag. The value, size and * It's always at most ostd::forward_range_tag. The value and size types
* difference types stay the same, the new reference type is like this: * stay the same, the new reference type is like this:
* *
* ~~~{.cc} * ~~~{.cc}
* struct enumerated_value_t { * struct enumerated_value_t {
@ -869,8 +849,8 @@ struct input_range {
* *
* The value type can be a pair (for two ranges) or a tuple (for more) of * The value type can be a pair (for two ranges) or a tuple (for more) of
* the value types. The reference type is also a pair or a tuple, but of * the value types. The reference type is also a pair or a tuple, but of
* the reference types. The size and difference types are common types * the reference types. The size type is the common type between the
* between the zipped ranges. * zipped ranges.
*/ */
template<typename R1, typename ...RR> template<typename R1, typename ...RR>
auto zip(R1 r1, RR ...rr) const { auto zip(R1 r1, RR ...rr) const {
@ -948,10 +928,9 @@ inline void range_put_all(OR &orange, IR range) {
namespace detail { namespace detail {
template<typename T> template<typename T>
struct noop_output_range: output_range<noop_output_range<T>> { struct noop_output_range: output_range<noop_output_range<T>> {
using value_type = T; using value_type = T;
using reference = T &; using reference = T &;
using size_type = std::size_t; using size_type = std::size_t;
using difference_type = std::ptrdiff_t;
/** @brief Has no effect. */ /** @brief Has no effect. */
void put(T const &) {} void put(T const &) {}
@ -972,10 +951,9 @@ inline auto noop_sink() {
namespace detail { namespace detail {
template<typename R> template<typename R>
struct counting_output_range: output_range<counting_output_range<R>> { struct counting_output_range: output_range<counting_output_range<R>> {
using value_type = range_value_t<R>; using value_type = range_value_t<R>;
using reference = range_reference_t<R>; using reference = range_reference_t<R>;
using size_type = range_size_t<R>; using size_type = range_size_t<R>;
using difference_type = range_difference_t<R>;
private: private:
R p_range; R p_range;
@ -1194,11 +1172,10 @@ namespace detail {
namespace detail { namespace detail {
template<typename T> template<typename T>
struct number_range: input_range<number_range<T>> { struct number_range: input_range<number_range<T>> {
using range_category = forward_range_tag; using range_category = forward_range_tag;
using value_type = T; using value_type = T;
using reference = T; using reference = T;
using size_type = std::size_t; using size_type = std::size_t;
using difference_type = std::ptrdiff_t;
number_range() = delete; number_range() = delete;
@ -1263,15 +1240,14 @@ inline auto range(T v) {
namespace detail { namespace detail {
template<typename T> template<typename T>
struct reverse_range: input_range<reverse_range<T>> { struct reverse_range: input_range<reverse_range<T>> {
using range_category = std::conditional_t< using range_category = std::conditional_t<
is_finite_random_access_range<T>, is_finite_random_access_range<T>,
finite_random_access_range_tag, finite_random_access_range_tag,
bidirectional_range_tag bidirectional_range_tag
>; >;
using value_type = range_value_t <T>; using value_type = range_value_t <T>;
using reference = range_reference_t <T>; using reference = range_reference_t<T>;
using size_type = range_size_t <T>; using size_type = range_size_t <T>;
using difference_type = range_difference_t<T>;
private: private:
T p_range; T p_range;
@ -1318,11 +1294,10 @@ namespace detail {
"Wrapped range references must be proper references to the value type" "Wrapped range references must be proper references to the value type"
); );
using range_category = input_range_tag; using range_category = input_range_tag;
using value_type = range_value_t <T>; using value_type = range_value_t<T>;
using reference = range_value_t <T> &&; using reference = range_value_t<T> &&;
using size_type = range_size_t <T>; using size_type = range_size_t<T>;
using difference_type = range_difference_t<T>;
private: private:
T p_range; T p_range;
@ -1348,13 +1323,12 @@ namespace detail {
}; };
public: public:
using range_category = std::common_type_t< using range_category = std::common_type_t<
range_category_t<T>, forward_range_tag range_category_t<T>, forward_range_tag
>; >;
using value_type = range_value_t<T>; using value_type = range_value_t<T>;
using reference = enumerated_value_t; using reference = enumerated_value_t;
using size_type = range_size_t <T>; using size_type = range_size_t<T>;
using difference_type = range_difference_t<T>;
private: private:
T p_range; T p_range;
@ -1378,13 +1352,12 @@ namespace detail {
template<typename T> template<typename T>
struct take_range: input_range<take_range<T>> { struct take_range: input_range<take_range<T>> {
using range_category = std::common_type_t< using range_category = std::common_type_t<
range_category_t<T>, forward_range_tag range_category_t<T>, forward_range_tag
>; >;
using value_type = range_value_t <T>; using value_type = range_value_t<T>;
using reference = range_reference_t <T>; using reference = range_reference_t<T>;
using size_type = range_size_t <T>; using size_type = range_size_t<T>;
using difference_type = range_difference_t<T>;
private: private:
T p_range; T p_range;
@ -1411,13 +1384,12 @@ namespace detail {
template<typename T> template<typename T>
struct chunks_range: input_range<chunks_range<T>> { struct chunks_range: input_range<chunks_range<T>> {
using range_category = std::common_type_t< using range_category = std::common_type_t<
range_category_t<T>, forward_range_tag range_category_t<T>, forward_range_tag
>; >;
using value_type = take_range <T>; using value_type = take_range<T>;
using reference = take_range <T>; using reference = take_range<T>;
using size_type = range_size_t <T>; using size_type = range_size_t<T>;
using difference_type = range_difference_t<T>;
private: private:
T p_range; T p_range;
@ -1464,13 +1436,12 @@ namespace detail {
template<typename ...R> template<typename ...R>
struct join_range: input_range<join_range<R...>> { struct join_range: input_range<join_range<R...>> {
using range_category = std::common_type_t< using range_category = std::common_type_t<
forward_range_tag, range_category_t<R>... forward_range_tag, range_category_t<R>...
>; >;
using value_type = std::common_type_t<range_value_t<R>...>; using value_type = std::common_type_t<range_value_t<R>...>;
using reference = std::common_type_t<range_reference_t<R>...>; using reference = std::common_type_t<range_reference_t<R>...>;
using size_type = std::common_type_t<range_size_t<R>...>; using size_type = std::common_type_t<range_size_t<R>...>;
using difference_type = std::common_type_t<range_difference_t<R>...>;
private: private:
std::tuple<R...> p_ranges; std::tuple<R...> p_ranges;
@ -1510,13 +1481,12 @@ namespace detail {
template<typename ...R> template<typename ...R>
struct zip_range: input_range<zip_range<R...>> { struct zip_range: input_range<zip_range<R...>> {
using range_category = std::common_type_t< using range_category = std::common_type_t<
forward_range_tag, range_category_t<R>... forward_range_tag, range_category_t<R>...
>; >;
using value_type = zip_value_t<range_value_t<R>...>; using value_type = zip_value_t<range_value_t<R>...>;
using reference = zip_value_t<range_reference_t<R>...>; using reference = zip_value_t<range_reference_t<R>...>;
using size_type = std::common_type_t<range_size_t<R>...>; using size_type = std::common_type_t<range_size_t<R>...>;
using difference_type = std::common_type_t<range_difference_t<R>...>;
private: private:
std::tuple<R...> p_ranges; std::tuple<R...> p_ranges;
@ -1558,10 +1528,9 @@ namespace detail {
*/ */
template<typename T> template<typename T>
struct appender_range: output_range<appender_range<T>> { struct appender_range: output_range<appender_range<T>> {
using value_type = typename T::value_type; using value_type = typename T::value_type;
using reference = typename T::reference; using reference = typename T::reference;
using size_type = typename T::size_type; using size_type = typename T::size_type;
using difference_type = typename T::difference_type;
/** @brief Default constructs the container inside. */ /** @brief Default constructs the container inside. */
appender_range(): p_data() {} appender_range(): p_data() {}
@ -1682,17 +1651,16 @@ using iterator_range_tag = typename detail::iterator_range_tag_base<T>::type;
*/ */
template<typename T> template<typename T>
struct iterator_range: input_range<iterator_range<T>> { struct iterator_range: input_range<iterator_range<T>> {
using range_category = std::conditional_t< using range_category = std::conditional_t<
std::is_pointer_v<T>, std::is_pointer_v<T>,
contiguous_range_tag, contiguous_range_tag,
iterator_range_tag<typename std::iterator_traits<T>::iterator_category> iterator_range_tag<typename std::iterator_traits<T>::iterator_category>
>; >;
using value_type = typename std::iterator_traits<T>::value_type; using value_type = typename std::iterator_traits<T>::value_type;
using reference = typename std::iterator_traits<T>::reference; using reference = typename std::iterator_traits<T>::reference;
using size_type = std::make_unsigned_t< using size_type = std::make_unsigned_t<
typename std::iterator_traits<T>::difference_type typename std::iterator_traits<T>::difference_type
>; >;
using difference_type = typename std::iterator_traits<T>::difference_type;
/** @brief Creates an iterator range. /** @brief Creates an iterator range.
* *

18
ostd/stream.hh
View File

@ -554,11 +554,10 @@ private:
*/ */
template<typename T> template<typename T>
struct stream_range<T, true>: input_range<stream_range<T>> { struct stream_range<T, true>: input_range<stream_range<T>> {
using range_category = input_range_tag; using range_category = input_range_tag;
using value_type = T; using value_type = T;
using reference = T; using reference = T;
using size_type = std::size_t; using size_type = std::size_t;
using difference_type = stream_off_t;
stream_range() = delete; stream_range() = delete;
@ -667,11 +666,10 @@ inline stream_range<T> stream::iter() {
*/ */
template<typename T, typename TC> template<typename T, typename TC>
struct stream_line_range: input_range<stream_line_range<T, TC>> { struct stream_line_range: input_range<stream_line_range<T, TC>> {
using range_category = input_range_tag; using range_category = input_range_tag;
using value_type = TC; using value_type = TC;
using reference = TC &; using reference = TC &;
using size_type = std::size_t; using size_type = std::size_t;
using difference_type = stream_off_t;
stream_line_range() = delete; stream_line_range() = delete;

9
ostd/string.hh
View File

@ -76,11 +76,10 @@ namespace ostd {
*/ */
template<typename T, typename TR = std::char_traits<std::remove_const_t<T>>> template<typename T, typename TR = std::char_traits<std::remove_const_t<T>>>
struct basic_char_range: input_range<basic_char_range<T>> { struct basic_char_range: input_range<basic_char_range<T>> {
using range_category = contiguous_range_tag; using range_category = contiguous_range_tag;
using value_type = T; using value_type = T;
using reference = T &; using reference = T &;
using size_type = std::size_t; using size_type = std::size_t;
using difference_type = std::ptrdiff_t;
using traits_type = TR; using traits_type = TR;