Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update range concepts #93

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update range concepts #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b88cfcf
Fix empty_view
tcbrindle May 13, 2020
31bd0f3
Update view concept definition to match C++20 spec
tcbrindle May 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
62 changes: 4 additions & 58 deletions include/nanorange/detail/ranges/concepts.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,7 @@
#include <nanorange/detail/ranges/range_concept.hpp>

#include <initializer_list>

// Avoid dragging in the large <set> and <unordered_set> headers
// This is technically undefined behaviour: define the symbol
// NANORANGE_NO_STD_FORWARD_DECLARATIONS
// to enforce standard-compliant mode
#ifndef NANORANGE_NO_STD_FORWARD_DECLARATIONS
NANO_BEGIN_NAMESPACE_STD
template <typename, typename> class basic_string_view;
template <typename, typename, typename> class set;
template <typename, typename, typename> class multiset;
template <typename, typename, typename, typename> class unordered_set;
template <typename, typename, typename, typename> class unordered_multiset;
template <typename, typename> class match_results;
NANO_END_NAMESPACE_STD
#else
#include <string_view>
#include <regex>
#include <set>
#include <unordered_set>
#endif

NANO_BEGIN_NAMESPACE

Expand Down Expand Up @@ -67,47 +48,12 @@ NANO_CONCEPT sized_range =
// [range.views]
struct view_base { };

namespace detail {

template <typename>
inline constexpr bool is_std_non_view = false;

template <typename T>
inline constexpr bool is_std_non_view<std::initializer_list<T>> = true;

template <typename K, typename C, typename A>
inline constexpr bool is_std_non_view<std::set<K, C, A>> = true;

template <typename K, typename C, typename A>
inline constexpr bool is_std_non_view<std::multiset<K, C, A>> = true;

template <typename K, typename H, typename E, typename A>
inline constexpr bool is_std_non_view<std::unordered_set<K, H, E, A>> = true;

template <typename K, typename H, typename E, typename A>
inline constexpr bool is_std_non_view<std::unordered_multiset<K, H, E, A>> = true;

template <typename B, typename A>
inline constexpr bool is_std_non_view<std::match_results<B, A>> = true;

template <typename T>
constexpr bool enable_view_helper()
{
if constexpr (derived_from<T, view_base>) {
return true;
} else if constexpr (is_std_non_view<T>) {
return false;
} else if constexpr (range<T> && range<const T>) {
return same_as<range_reference_t<T>, range_reference_t<const T>>;
} else {
return true;
}
}
inline constexpr bool enable_view = derived_from<T, view_base>;

}

template <typename T>
inline constexpr bool enable_view = detail::enable_view_helper<T>();
// Special-case std::string_view
template <typename CharT, typename Traits>
inline constexpr bool enable_view<std::basic_string_view<CharT, Traits>> = true;

template <typename T>
NANO_CONCEPT view = range<T> && semiregular<T> && enable_view<T>;
Expand Down
10 changes: 3 additions & 7 deletions include/nanorange/views/empty.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,15 @@ NANO_BEGIN_NAMESPACE
namespace empty_view_ {

template <typename T>
class empty_view : view_interface<empty_view<T>> {
static_assert(std::is_object<T>::value, "");
class empty_view : public view_interface<empty_view<T>> {
static_assert(std::is_object<T>::value);

public:
static constexpr T* begin() noexcept { return nullptr; }
static constexpr T* end() noexcept { return nullptr; }
static constexpr std::ptrdiff_t size() noexcept { return 0; }
static constexpr std::size_t size() noexcept { return 0; }
static constexpr T* data() noexcept { return nullptr; }

static constexpr bool empty() noexcept { return true; }

friend constexpr T* begin(empty_view) noexcept { return nullptr; }
friend constexpr T* end(empty_view) noexcept { return nullptr; }
};

}
Expand Down
2 changes: 1 addition & 1 deletion include/nanorange/views/split.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ struct split_view : view_interface<split_view<V, Pattern>> {
using iterator_category = detail::conditional_t<
forward_range<Base>, forward_iterator_tag, input_iterator_tag>;

struct value_type {
struct value_type : view_interface<value_type> {
private:
outer_iterator i_ = outer_iterator();

Expand Down
16 changes: 8 additions & 8 deletions test/concepts/ranges.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ void ridiculously_exhaustive_range_property_test() {
// FIXME: This no longer asserts with P0970. Is that intentional?
// CONCEPT_ASSERT(!models::SizedRange<mutable_only_unsized_range>);
//CONCEPT_ASSERT(!models::_ContainerLike<mutable_only_unsized_range>);
CONCEPT_ASSERT(models::view<mutable_only_unsized_range>);
//CONCEPT_ASSERT(models::view<mutable_only_unsized_range>);

CONCEPT_ASSERT(models::same_as<ns::iterator_t<mutable_only_unsized_range&>, I>);
CONCEPT_ASSERT(models::same_as<ns::sentinel_t<mutable_only_unsized_range&>, I>);
Expand All @@ -196,7 +196,7 @@ void ridiculously_exhaustive_range_property_test() {
CONCEPT_ASSERT(models::range<immutable_unsized_range>);
CONCEPT_ASSERT(models::sized_range<immutable_unsized_range>);
//CONCEPT_ASSERT(!models::_ContainerLike<immutable_unsized_range>);
CONCEPT_ASSERT(models::view<immutable_unsized_range>);
//CONCEPT_ASSERT(models::view<immutable_unsized_range>);

CONCEPT_ASSERT(models::same_as<ns::iterator_t<immutable_unsized_range&>, CI>);
CONCEPT_ASSERT(models::same_as<ns::sentinel_t<immutable_unsized_range&>, CI>);
Expand Down Expand Up @@ -254,7 +254,7 @@ void ridiculously_exhaustive_range_property_test() {
CONCEPT_ASSERT(models::range<mutable_only_sized_range>);
CONCEPT_ASSERT(models::sized_range<mutable_only_sized_range>);
//CONCEPT_ASSERT(!models::_ContainerLike<mutable_only_sized_range>);
CONCEPT_ASSERT(models::view<mutable_only_sized_range>);
//CONCEPT_ASSERT(models::view<mutable_only_sized_range>);

CONCEPT_ASSERT(models::same_as<ns::iterator_t<mutable_only_sized_range&>, I>);
CONCEPT_ASSERT(models::same_as<ns::sentinel_t<mutable_only_sized_range&>, I>);
Expand All @@ -279,7 +279,7 @@ void ridiculously_exhaustive_range_property_test() {
CONCEPT_ASSERT(models::range<immutable_sized_range>);
CONCEPT_ASSERT(models::sized_range<immutable_sized_range>);
//CONCEPT_ASSERT(!models::_ContainerLike<immutable_sized_range>);
CONCEPT_ASSERT(models::view<immutable_sized_range>);
//CONCEPT_ASSERT(models::view<immutable_sized_range>);

CONCEPT_ASSERT(models::same_as<ns::iterator_t<immutable_sized_range&>, CI>);
CONCEPT_ASSERT(models::same_as<ns::sentinel_t<immutable_sized_range&>, CI>);
Expand Down Expand Up @@ -337,7 +337,7 @@ void ridiculously_exhaustive_range_property_test() {
CONCEPT_ASSERT(models::range<mutable_only_badsized_range>);
CONCEPT_ASSERT(!models::sized_range<mutable_only_badsized_range>);
//CONCEPT_ASSERT(!models::_ContainerLike<mutable_only_badsized_range>);
CONCEPT_ASSERT(models::view<mutable_only_badsized_range>);
//CONCEPT_ASSERT(models::view<mutable_only_badsized_range>);

CONCEPT_ASSERT(models::same_as<ns::iterator_t<mutable_only_badsized_range&>, I>);
CONCEPT_ASSERT(models::same_as<ns::sentinel_t<mutable_only_badsized_range&>, I>);
Expand All @@ -362,7 +362,7 @@ void ridiculously_exhaustive_range_property_test() {
CONCEPT_ASSERT(models::range<immutable_badsized_range>);
CONCEPT_ASSERT(!models::sized_range<immutable_badsized_range>);
//CONCEPT_ASSERT(!models::_ContainerLike<immutable_badsized_range>);
CONCEPT_ASSERT(models::view<immutable_badsized_range>);
//CONCEPT_ASSERT(models::view<immutable_badsized_range>);

CONCEPT_ASSERT(models::same_as<ns::iterator_t<immutable_badsized_range&>, CI>);
CONCEPT_ASSERT(models::same_as<ns::sentinel_t<immutable_badsized_range&>, CI>);
Expand Down Expand Up @@ -414,7 +414,7 @@ void ridiculously_exhaustive_range_property_test() {

CONCEPT_ASSERT(models::range<mutable_only_unsized_range&>);
CONCEPT_ASSERT(models::range<mutable_only_unsized_range>);
CONCEPT_ASSERT(models::view<mutable_only_unsized_range>);
//CONCEPT_ASSERT(models::view<mutable_only_unsized_range>);
CONCEPT_ASSERT(!models::view<mutable_only_unsized_range&>);
CONCEPT_ASSERT(!models::view<mutable_only_unsized_range&&>);
CONCEPT_ASSERT(!models::range<const mutable_only_unsized_range&>);
Expand Down Expand Up @@ -442,7 +442,7 @@ ns::iterator_t<R> complicated_algorithm(R&& r) {
}

template <class T>
struct array_view {
struct array_view : nano::view_base {
T* first_;
std::size_t n_;

Expand Down
2 changes: 1 addition & 1 deletion test/utility/concepts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ static_assert(
ranges::concepts::View
>::value, "");*/

struct myview {
struct myview : ranges::view_base {
const char *begin();
const char *end();
};
Expand Down