diff --git a/include/span.h b/include/span.h index 7152c2d..676fdf2 100644 --- a/include/span.h +++ b/include/span.h @@ -77,6 +77,11 @@ template class span; +// [views.constants], constants +constexpr const std::ptrdiff_t dynamic_extent = -1; + + +// implementation details namespace details { template @@ -96,45 +101,55 @@ struct is_span : is_span_oracle> template struct is_allowed_pointer_conversion - : std::integral_constant::value && - std::is_pointer::value && - std::is_convertible::value + : std::bool_constant< + std::is_pointer::value && + std::is_pointer::value && + std::is_convertible::value > { }; template struct is_allowed_integral_conversion - : std::integral_constant::value && - std::is_integral::value && - sizeof(From) == sizeof(To) && - alignof(From) == alignof(To) && - std::is_convertible::value + : std::bool_constant< + std::is_integral::value && + std::is_integral::value && + sizeof(From) == sizeof(To) && + alignof(From) == alignof(To) && + std::is_convertible::value + > +{ +}; + +template +struct is_allowed_extent_conversion + : std::bool_constant< + From == To || + From == gsl::dynamic_extent || + To == gsl::dynamic_extent > { }; template struct is_allowed_element_type_conversion - : std::integral_constant>::value || - is_allowed_pointer_conversion::value || - is_allowed_integral_conversion::value + : std::bool_constant< + std::is_same>::value || + is_allowed_pointer_conversion::value || + is_allowed_integral_conversion::value > { }; template struct is_allowed_element_type_conversion - : std::integral_constant::value> + : std::bool_constant::value> { }; template struct is_allowed_element_type_conversion - : std::integral_constant + : std::true_type { }; @@ -191,7 +206,7 @@ public: auto ret{*this}; return ret += n; } - + span_iterator& operator+=(difference_type n) noexcept { index_ += n; @@ -217,10 +232,14 @@ public: } reference operator[](difference_type n) const noexcept - { return *(*this + n); } + { + return *(*this + n); + } bool operator==(const span_iterator& rhs) const noexcept - { return span_ == rhs.span_ && index_ == rhs.index_; } + { + return span_ == rhs.span_ && index_ == rhs.index_; + } bool operator!=(const span_iterator& rhs) const noexcept { return !(*this == rhs); } @@ -231,9 +250,9 @@ public: } bool operator<=(const span_iterator& rhs) const noexcept { return !(rhs < *this); } - + bool operator>(const span_iterator& rhs) const noexcept { return rhs < *this; } - + bool operator>=(const span_iterator& rhs) const noexcept { return !(rhs > *this); } void swap(span_iterator& rhs) noexcept @@ -250,21 +269,20 @@ private: template span_iterator operator+(typename span_iterator::difference_type n, const span_iterator& rhs) noexcept -{ return rhs + n; } +{ + return rhs + n; +} template span_iterator operator-(typename span_iterator::difference_type n, const span_iterator& rhs) noexcept -{ return rhs - n; } - +{ + return rhs - n; +} } // namespace details -// [views.constants], constants -constexpr const std::ptrdiff_t dynamic_extent = -1; - - // [span], class template span template class span { @@ -330,21 +348,23 @@ public: constexpr span(span&& other) noexcept = default; template ::value && + class = std::enable_if_t< + details::is_allowed_extent_conversion::value && details::is_allowed_element_type_conversion::value > > constexpr span(const span& other) - : storage_(reinterpret_cast(other.data()), other.length()) + : storage_(reinterpret_cast(other.data()), extent_type(other.size())) {} template ::value && + class = std::enable_if_t< + details::is_allowed_extent_conversion::value && details::is_allowed_element_type_conversion::value > > constexpr span(span&& other) - : storage_(reinterpret_cast(other.data()), other.length()) + : storage_(reinterpret_cast(other.data()), extent_type(other.size())) {} ~span() noexcept = default; @@ -418,6 +438,8 @@ public: reverse_iterator rend() const noexcept { return {this, 0}; } private: + constexpr static const bool is_span_type = true; + template class extent_type; @@ -430,10 +452,11 @@ private: constexpr extent_type() noexcept {} template - constexpr extent_type(extent_type) noexcept + constexpr extent_type(extent_type ext) noexcept { - static_assert(Other == Extent, + static_assert(Other == Extent || Other == dynamic_extent, "Mismatch between fixed-size extent and size of initializing data."); + Expects(ext.size() == Extent); } constexpr extent_type(index_type size) diff --git a/tests/span_tests.cpp b/tests/span_tests.cpp index ddae404..81784c3 100644 --- a/tests/span_tests.cpp +++ b/tests/span_tests.cpp @@ -395,14 +395,14 @@ SUITE(span_tests) { auto get_an_array = []()->std::array { return{1, 2, 3, 4}; }; - auto take_a_span = [](span s) { (void)s; }; + auto take_a_span = [](span s) { static_cast(s); }; // try to take a temporary std::array take_a_span(get_an_array()); } #endif { auto get_an_array = []() -> std::array { return { 1, 2, 3, 4 }; }; - auto take_a_span = [](span s) { (void)s; }; + auto take_a_span = [](span s) { static_cast(s); }; // try to take a temporary std::array take_a_span(get_an_array()); } @@ -438,7 +438,7 @@ SUITE(span_tests) { auto get_an_array = []() -> const std::array { return {1, 2, 3, 4}; }; - auto take_a_span = [](span s) { (void) s; }; + auto take_a_span = [](span s) { static_cast(s); }; // try to take a temporary std::array take_a_span(get_an_array()); } @@ -482,35 +482,35 @@ SUITE(span_tests) { #ifdef CONFIRM_COMPILATION_ERRORS auto get_temp_vector = []() -> std::vector { return {}; }; - auto use_span = [](span s) { (void) s; }; + auto use_span = [](span s) { static_cast(s); }; use_span(get_temp_vector()); #endif } { auto get_temp_vector = []() -> std::vector { return{}; }; - auto use_span = [](span s) { (void)s; }; + auto use_span = [](span s) { static_cast(s); }; use_span(get_temp_vector()); } { #ifdef CONFIRM_COMPILATION_ERRORS auto get_temp_string = []() -> std::string { return{}; }; - auto use_span = [](span s) { (void)s; }; + auto use_span = [](span s) { static_cast(s); }; use_span(get_temp_string()); #endif } { auto get_temp_string = []() -> std::string { return {}; }; - auto use_span = [](span s) { (void) s; }; + auto use_span = [](span s) { static_cast(s); }; use_span(get_temp_string()); } { #ifdef CONFIRM_COMPILATION_ERRORS auto get_temp_vector = []() -> const std::vector { return {}; }; - auto use_span = [](span s) { (void) s; }; + auto use_span = [](span s) { static_cast(s); }; use_span(get_temp_vector()); #endif } @@ -518,7 +518,7 @@ SUITE(span_tests) { #ifdef CONFIRM_COMPILATION_ERRORS auto get_temp_string = []() -> const std::string { return {}; }; - auto use_span = [](span s) { (void) s; }; + auto use_span = [](span s) { static_cast(s); }; use_span(get_temp_string()); #endif } @@ -536,34 +536,34 @@ SUITE(span_tests) { span avd; span avcd = avd; - (void)avcd; + static_cast(avcd); } { #ifdef CONFIRM_COMPILATION_ERRORS span avd; span avb = avd; - (void) avb; + static_cast(avb); #endif } { span s; span s2 = s; - (void)s2; + static_cast(s2); } { span s; span s2 = s; - (void)s2; + static_cast(s2); } { #ifdef CONFIRM_COMPILATION_ERRORS span s; span s2 = s; - (void)s2; + static_cast(s2); #endif } } @@ -984,72 +984,59 @@ SUITE(span_tests) } } -#if 0 TEST(fixed_size_conversions) { int arr[] = {1, 2, 3, 4}; // converting to an span from an equal size array is ok - span av4 = arr; - CHECK(av4.length() == 4); + span s4 = arr; + CHECK(s4.length() == 4); - // converting to dynamic_range a_v is always ok + // converting to dynamic_range is always ok { - span av = av4; - (void) av; - } - { - span av = arr; - (void) av; + span s = s4; + CHECK(s.length() == s4.length()); + static_cast(s); } // initialization or assignment to static span that REDUCES size is NOT ok #ifdef CONFIRM_COMPILATION_ERRORS { - span av2 = arr; + span s = arr; } { - span av2 = av4; + span s2 = s4; + static_cast(s2); } #endif + // even when done dynamically { - span av = arr; - span av2 = av; - (void) av2; - } - -#ifdef CONFIRM_COMPILATION_ERRORS - { - span av = arr; - span av2 = av.as_span(dim<2>(), dim<2>()); - } -#endif - - { - span av = arr; - span av2 = as_span(av, dim<>(2), dim<>(2)); - auto workaround_macro = [&]() { return av2[{1, 0}] == 2; }; - CHECK(workaround_macro()); + span s = arr; + auto f = [&]() { + span s2 = s; + static_cast(s2); + }; + CHECK_THROW(f(), fail_fast); } // but doing so explicitly is ok // you can convert statically { - span av2 = {arr, 2}; - (void) av2; + span s2 = {arr, 2}; + static_cast(s2); } { - span av2 = av4.first<1>(); - (void) av2; + span s1 = s4.first<1>(); + static_cast(s1); } // ...or dynamically { - // NB: implicit conversion to span from span - span av2 = av4.first(1); - (void) av2; + // NB: implicit conversion to span from span + span s1 = s4.first(1); + static_cast(s1); } // initialization or assignment to static span that requires size INCREASE is not ok. @@ -1057,31 +1044,29 @@ SUITE(span_tests) #ifdef CONFIRM_COMPILATION_ERRORS { - span av4 = arr2; + span s3 = arr2; } { - span av2 = arr2; - span av4 = av2; + span s2 = arr2; + span s4a = s2; } #endif { auto f = [&]() { - span av9 = {arr2, 2}; - (void) av9; - }; + span s4 = {arr2, 2}; + static_cast(s4); + }; CHECK_THROW(f(), fail_fast); } - // this should fail - we are trying to assign a small dynamic a_v to a fixed_size larger one - span av = arr2; + // this should fail - we are trying to assign a small dynamic span to a fixed_size larger one + span av = arr2; auto f = [&]() { - span av2 = av; - (void) av2; + span s4 = av; + static_cast(s4); }; CHECK_THROW(f(), fail_fast); } - -#endif } int main(int, const char* []) { return UnitTest::RunAllTests(); }