diff options
| -rw-r--r-- | include/gsl.h | 4 | ||||
| -rw-r--r-- | include/span.h (renamed from include/array_view.h) | 290 | ||||
| -rw-r--r-- | include/string_span.h (renamed from include/string_view.h) | 59 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/bounds_tests.cpp | 4 | ||||
| -rw-r--r-- | tests/span_tests.cpp (renamed from tests/array_view_tests.cpp) | 600 | ||||
| -rw-r--r-- | tests/string_span_tests.cpp (renamed from tests/string_view_tests.cpp) | 32 |
7 files changed, 495 insertions, 498 deletions
diff --git a/include/gsl.h b/include/gsl.h index ec75723..e20ac69 100644 --- a/include/gsl.h +++ b/include/gsl.h @@ -19,8 +19,8 @@ #ifndef GSL_GSL_H #define GSL_GSL_H -#include "array_view.h" // array_view, strided_array_view... -#include "string_view.h" // zstring, string_view, zstring_builder... +#include "span.h" // span, strided_span... +#include "string_span.h" // zstring, string_span, zstring_builder... #include <memory> #ifdef _MSC_VER diff --git a/include/array_view.h b/include/span.h index cbc33be..74da1aa 100644 --- a/include/array_view.h +++ b/include/span.h @@ -16,8 +16,8 @@ #pragma once -#ifndef GSL_ARRAY_VIEW_H -#define GSL_ARRAY_VIEW_H +#ifndef GSL_SPAN_H +#define GSL_SPAN_H #include <new> #include <stdexcept> @@ -998,7 +998,7 @@ bounds_iterator<IndexType> operator+(typename bounds_iterator<IndexType>::differ } // -// begin definitions of basic_array_view +// begin definitions of basic_span // namespace details { @@ -1036,13 +1036,13 @@ namespace details } // namespace details template <typename ArrayView> -class contiguous_array_view_iterator; +class contiguous_span_iterator; template <typename ArrayView> -class general_array_view_iterator; +class general_span_iterator; enum class byte : std::uint8_t {}; template <typename ValueType, typename BoundsType> -class basic_array_view +class basic_span { public: static const size_t rank = BoundsType::rank; @@ -1053,11 +1053,11 @@ public: using const_value_type = std::add_const_t<value_type>; using pointer = ValueType*; using reference = ValueType&; - using iterator = std::conditional_t<std::is_same<typename BoundsType::mapping_type, contiguous_mapping_tag>::value, contiguous_array_view_iterator<basic_array_view>, general_array_view_iterator<basic_array_view>>; - using const_iterator = std::conditional_t<std::is_same<typename BoundsType::mapping_type, contiguous_mapping_tag>::value, contiguous_array_view_iterator<basic_array_view<const_value_type, BoundsType>>, general_array_view_iterator<basic_array_view<const_value_type, BoundsType>>>; + using iterator = std::conditional_t<std::is_same<typename BoundsType::mapping_type, contiguous_mapping_tag>::value, contiguous_span_iterator<basic_span>, general_span_iterator<basic_span>>; + using const_iterator = std::conditional_t<std::is_same<typename BoundsType::mapping_type, contiguous_mapping_tag>::value, contiguous_span_iterator<basic_span<const_value_type, BoundsType>>, general_span_iterator<basic_span<const_value_type, BoundsType>>>; using reverse_iterator = std::reverse_iterator<iterator>; using const_reverse_iterator = std::reverse_iterator<const_iterator>; - using sliced_type = std::conditional_t<rank == 1, value_type, basic_array_view<value_type, typename BoundsType::sliced_type>>; + using sliced_type = std::conditional_t<rank == 1, value_type, basic_span<value_type, typename BoundsType::sliced_type>>; private: pointer m_pdata; @@ -1111,11 +1111,11 @@ public: } constexpr const_iterator cbegin() const { - return const_iterator {reinterpret_cast<const basic_array_view<const value_type, bounds_type> *>(this), true}; + return const_iterator {reinterpret_cast<const basic_span<const value_type, bounds_type> *>(this), true}; } constexpr const_iterator cend() const { - return const_iterator {reinterpret_cast<const basic_array_view<const value_type, bounds_type> *>(this), false}; + return const_iterator {reinterpret_cast<const basic_span<const value_type, bounds_type> *>(this), false}; } constexpr reverse_iterator rbegin() const @@ -1136,38 +1136,38 @@ public: } template <typename OtherValueType, typename OtherBoundsType, typename Dummy = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>> - constexpr bool operator== (const basic_array_view<OtherValueType, OtherBoundsType> & other) const noexcept + constexpr bool operator== (const basic_span<OtherValueType, OtherBoundsType> & other) const noexcept { return m_bounds.size() == other.m_bounds.size() && (m_pdata == other.m_pdata || std::equal(this->begin(), this->end(), other.begin())); } template <typename OtherValueType, typename OtherBoundsType, typename Dummy = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>> - constexpr bool operator!= (const basic_array_view<OtherValueType, OtherBoundsType> & other) const noexcept + constexpr bool operator!= (const basic_span<OtherValueType, OtherBoundsType> & other) const noexcept { return !(*this == other); } template <typename OtherValueType, typename OtherBoundsType, typename Dummy = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>> - constexpr bool operator< (const basic_array_view<OtherValueType, OtherBoundsType> & other) const noexcept + constexpr bool operator< (const basic_span<OtherValueType, OtherBoundsType> & other) const noexcept { return std::lexicographical_compare(this->begin(), this->end(), other.begin(), other.end()); } template <typename OtherValueType, typename OtherBoundsType, typename Dummy = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>> - constexpr bool operator<= (const basic_array_view<OtherValueType, OtherBoundsType> & other) const noexcept + constexpr bool operator<= (const basic_span<OtherValueType, OtherBoundsType> & other) const noexcept { return !(other < *this); } template <typename OtherValueType, typename OtherBoundsType, typename Dummy = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>> - constexpr bool operator> (const basic_array_view<OtherValueType, OtherBoundsType> & other) const noexcept + constexpr bool operator> (const basic_span<OtherValueType, OtherBoundsType> & other) const noexcept { return (other < *this); } template <typename OtherValueType, typename OtherBoundsType, typename Dummy = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>> - constexpr bool operator>= (const basic_array_view<OtherValueType, OtherBoundsType> & other) const noexcept + constexpr bool operator>= (const basic_span<OtherValueType, OtherBoundsType> & other) const noexcept { return !(*this < other); } @@ -1176,27 +1176,27 @@ public: template <typename OtherValueType, typename OtherBounds, typename Dummy = std::enable_if_t<std::is_convertible<OtherValueType(*)[], value_type(*)[]>::value && std::is_convertible<OtherBounds, bounds_type>::value>> - constexpr basic_array_view(const basic_array_view<OtherValueType, OtherBounds> & other ) noexcept + constexpr basic_span(const basic_span<OtherValueType, OtherBounds> & other ) noexcept : m_pdata(other.m_pdata), m_bounds(other.m_bounds) { } protected: - constexpr basic_array_view(pointer data, bounds_type bound) noexcept + constexpr basic_span(pointer data, bounds_type bound) noexcept : m_pdata(data) , m_bounds(std::move(bound)) { fail_fast_assert((m_bounds.size() > 0 && data != nullptr) || m_bounds.size() == 0); } template <typename T> - constexpr basic_array_view(T *data, std::enable_if_t<std::is_same<value_type, std::remove_all_extents_t<T>>::value, bounds_type> bound) noexcept + constexpr basic_span(T *data, std::enable_if_t<std::is_same<value_type, std::remove_all_extents_t<T>>::value, bounds_type> bound) noexcept : m_pdata(reinterpret_cast<pointer>(data)) , m_bounds(std::move(bound)) { fail_fast_assert((m_bounds.size() > 0 && data != nullptr) || m_bounds.size() == 0); } template <typename DestBounds> - constexpr basic_array_view<value_type, DestBounds> as_array_view(const DestBounds &bounds) + constexpr basic_span<value_type, DestBounds> as_span(const DestBounds &bounds) { details::verifyBoundsReshape(m_bounds, bounds); return {m_pdata, bounds}; @@ -1206,7 +1206,7 @@ private: friend iterator; friend const_iterator; template <typename ValueType2, typename BoundsType2> - friend class basic_array_view; + friend class basic_span; }; template <std::ptrdiff_t DimSize = dynamic_range> @@ -1223,10 +1223,10 @@ struct dim<dynamic_range> }; template <typename ValueType, std::ptrdiff_t FirstDimension = dynamic_range, std::ptrdiff_t... RestDimensions> -class array_view; +class span; template <typename ValueType, size_t Rank> -class strided_array_view; +class strided_span; namespace details { @@ -1238,15 +1238,15 @@ namespace details }; template <typename Traits> - struct ArrayViewTypeTraits<Traits, typename std::is_reference<typename Traits::array_view_traits &>::type> + struct ArrayViewTypeTraits<Traits, typename std::is_reference<typename Traits::span_traits &>::type> { - using value_type = typename Traits::array_view_traits::value_type; - using size_type = typename Traits::array_view_traits::size_type; + using value_type = typename Traits::span_traits::value_type; + using size_type = typename Traits::span_traits::size_type; }; template <typename T, std::ptrdiff_t... Ranks> struct ArrayViewArrayTraits { - using type = array_view<T, Ranks...>; + using type = span<T, Ranks...>; using value_type = T; using bounds_type = static_bounds<Ranks...>; using pointer = T*; @@ -1277,54 +1277,54 @@ namespace details struct Sep{}; template <typename T, typename... Args> - T static_as_array_view_helper(Sep, Args... args) + T static_as_span_helper(Sep, Args... args) { return T{static_cast<typename T::size_type>(args)...}; } template <typename T, typename Arg, typename... Args> - std::enable_if_t<!std::is_same<Arg, dim<dynamic_range>>::value && !std::is_same<Arg, Sep>::value, T> static_as_array_view_helper(Arg, Args... args) + std::enable_if_t<!std::is_same<Arg, dim<dynamic_range>>::value && !std::is_same<Arg, Sep>::value, T> static_as_span_helper(Arg, Args... args) { - return static_as_array_view_helper<T>(args...); + return static_as_span_helper<T>(args...); } template <typename T, typename... Args> - T static_as_array_view_helper(dim<dynamic_range> val, Args ... args) + T static_as_span_helper(dim<dynamic_range> val, Args ... args) { - return static_as_array_view_helper<T>(args..., val.dvalue); + return static_as_span_helper<T>(args..., val.dvalue); } template <typename ...Dimensions> - struct static_as_array_view_static_bounds_helper + struct static_as_span_static_bounds_helper { using type = static_bounds<(Dimensions::value)...>; }; template <typename T> - struct is_array_view_oracle : std::false_type + struct is_span_oracle : std::false_type {}; template <typename ValueType, std::ptrdiff_t FirstDimension, std::ptrdiff_t... RestDimensions> - struct is_array_view_oracle<array_view<ValueType, FirstDimension, RestDimensions...>> : std::true_type + struct is_span_oracle<span<ValueType, FirstDimension, RestDimensions...>> : std::true_type {}; template <typename ValueType, std::ptrdiff_t Rank> - struct is_array_view_oracle<strided_array_view<ValueType, Rank>> : std::true_type + struct is_span_oracle<strided_span<ValueType, Rank>> : std::true_type {}; template <typename T> - struct is_array_view : is_array_view_oracle<std::remove_cv_t<T>> + struct is_span : is_span_oracle<std::remove_cv_t<T>> {}; } template <typename ValueType, std::ptrdiff_t FirstDimension, std::ptrdiff_t... RestDimensions> -class array_view : public basic_array_view <ValueType, static_bounds <FirstDimension, RestDimensions...>> +class span : public basic_span <ValueType, static_bounds <FirstDimension, RestDimensions...>> { template <typename ValueType2, std::ptrdiff_t FirstDimension2, std::ptrdiff_t... RestDimensions2> - friend class array_view; + friend class span; - using Base = basic_array_view<ValueType, static_bounds<FirstDimension, RestDimensions...>>; + using Base = basic_span<ValueType, static_bounds<FirstDimension, RestDimensions...>>; public: using typename Base::bounds_type; @@ -1339,42 +1339,42 @@ public: public: // basic - constexpr array_view(pointer ptr, size_type size) : Base(ptr, bounds_type{ size }) + constexpr span(pointer ptr, size_type size) : Base(ptr, bounds_type{ size }) {} - constexpr array_view(pointer ptr, bounds_type bounds) : Base(ptr, std::move(bounds)) + constexpr span(pointer ptr, bounds_type bounds) : Base(ptr, std::move(bounds)) {} - constexpr array_view(std::nullptr_t) : Base(nullptr, bounds_type{}) + constexpr span(std::nullptr_t) : Base(nullptr, bounds_type{}) {} - constexpr array_view(std::nullptr_t, size_type size) : Base(nullptr, bounds_type{}) + constexpr span(std::nullptr_t, size_type size) : Base(nullptr, bounds_type{}) { fail_fast_assert(size == 0); } // default template <std::ptrdiff_t DynamicRank = bounds_type::dynamic_rank, typename = std::enable_if_t<DynamicRank != 0>> - constexpr array_view() : Base(nullptr, bounds_type()) + constexpr span() : Base(nullptr, bounds_type()) {} // from n-dimensions dynamic array (e.g. new int[m][4]) (precedence will be lower than the 1-dimension pointer) template <typename T, typename Helper = details::ArrayViewArrayTraits<T, dynamic_range> /*typename Dummy = std::enable_if_t<std::is_convertible<Helper::value_type (*)[], typename Base::value_type (*)[]>::value>*/> - constexpr array_view(T* const& data, size_type size) : Base(data, typename Helper::bounds_type{size}) + constexpr span(T* const& data, size_type size) : Base(data, typename Helper::bounds_type{size}) {} // from n-dimensions static array template <typename T, size_t N, typename Helper = details::ArrayViewArrayTraits<T, N>, typename = std::enable_if_t<std::is_convertible<typename Helper::value_type(*)[], typename Base::value_type(*)[]>::value>> - constexpr array_view (T (&arr)[N]) : Base(arr, typename Helper::bounds_type()) + constexpr span (T (&arr)[N]) : Base(arr, typename Helper::bounds_type()) {} // from n-dimensions static array with size template <typename T, size_t N, typename Helper = details::ArrayViewArrayTraits<T, N>, typename = std::enable_if_t<std::is_convertible<typename Helper::value_type(*)[], typename Base::value_type(*)[]>::value> > - constexpr array_view(T(&arr)[N], size_type size) : Base(arr, typename Helper::bounds_type{size}) + constexpr span(T(&arr)[N], size_type size) : Base(arr, typename Helper::bounds_type{size}) { fail_fast_assert(size <= N); } @@ -1383,14 +1383,14 @@ public: template <size_t N, typename Dummy = std::enable_if_t<std::is_convertible<static_bounds<N>, typename Base::bounds_type>::value> > - constexpr array_view (std::array<std::remove_const_t<value_type>, N> & arr) : Base(arr.data(), static_bounds<N>()) + constexpr span (std::array<std::remove_const_t<value_type>, N> & arr) : Base(arr.data(), static_bounds<N>()) {} template <size_t N, typename Dummy = std::enable_if_t<std::is_convertible<static_bounds<N>, typename Base::bounds_type>::value && std::is_const<value_type>::value> > - constexpr array_view (const std::array<std::remove_const_t<value_type>, N> & arr) : Base(arr.data(), static_bounds<N>()) + constexpr span (const std::array<std::remove_const_t<value_type>, N> & arr) : Base(arr.data(), static_bounds<N>()) {} // from begin, end pointers. We don't provide iterator pair since no way to guarantee the contiguity @@ -1398,59 +1398,59 @@ public: typename Dummy = std::enable_if_t<std::is_convertible<Ptr, pointer>::value && details::LessThan<Base::bounds_type::dynamic_rank, 2>::value> > // remove literal 0 case - constexpr array_view (pointer begin, Ptr end) : Base(begin, details::newBoundsHelper<typename Base::bounds_type>(static_cast<pointer>(end) - begin)) + constexpr span (pointer begin, Ptr end) : Base(begin, details::newBoundsHelper<typename Base::bounds_type>(static_cast<pointer>(end) - begin)) {} // from containers. It must has .size() and .data() two function signatures template <typename Cont, typename DataType = typename Cont::value_type, - typename Dummy = std::enable_if_t<!details::is_array_view<Cont>::value + typename Dummy = std::enable_if_t<!details::is_span<Cont>::value && std::is_convertible<DataType (*)[], typename Base::value_type (*)[]>::value && std::is_same<std::decay_t<decltype(std::declval<Cont>().size(), *std::declval<Cont>().data())>, DataType>::value> > - constexpr array_view (Cont& cont) : Base(static_cast<pointer>(cont.data()), details::newBoundsHelper<typename Base::bounds_type>(cont.size())) + constexpr span (Cont& cont) : Base(static_cast<pointer>(cont.data()), details::newBoundsHelper<typename Base::bounds_type>(cont.size())) {} - constexpr array_view(const array_view &) = default; + constexpr span(const span &) = default; // convertible template <typename OtherValueType, std::ptrdiff_t... OtherDimensions, - typename BaseType = basic_array_view<ValueType, static_bounds<FirstDimension, RestDimensions...>>, - typename OtherBaseType = basic_array_view<OtherValueType, static_bounds<OtherDimensions...>>, + typename BaseType = basic_span<ValueType, static_bounds<FirstDimension, RestDimensions...>>, + typename OtherBaseType = basic_span<OtherValueType, static_bounds<OtherDimensions...>>, typename Dummy = std::enable_if_t<std::is_convertible<OtherBaseType, BaseType>::value> > - constexpr array_view(const array_view<OtherValueType, OtherDimensions...> &av) - : Base(static_cast<const typename array_view<OtherValueType, OtherDimensions...>::Base&>(av)) + constexpr span(const span<OtherValueType, OtherDimensions...> &av) + : Base(static_cast<const typename span<OtherValueType, OtherDimensions...>::Base&>(av)) {} // reshape // DimCount here is a workaround for a bug in MSVC 2015 template <typename... Dimensions2, size_t DimCount = sizeof...(Dimensions2), typename = std::enable_if_t<(DimCount > 0)>> - constexpr array_view<ValueType, Dimensions2::value...> as_array_view(Dimensions2... dims) + constexpr span<ValueType, Dimensions2::value...> as_span(Dimensions2... dims) { - using BoundsType = typename array_view<ValueType, (Dimensions2::value)...>::bounds_type; - auto tobounds = details::static_as_array_view_helper<BoundsType>(dims..., details::Sep{}); + using BoundsType = typename span<ValueType, (Dimensions2::value)...>::bounds_type; + auto tobounds = details::static_as_span_helper<BoundsType>(dims..., details::Sep{}); details::verifyBoundsReshape(this->bounds(), tobounds); return {this->data(), tobounds}; } // to bytes array template <bool Enabled = std::is_standard_layout<std::decay_t<ValueType>>::value> - auto as_bytes() const noexcept -> array_view<const byte> + auto as_bytes() const noexcept -> span<const byte> { - static_assert(Enabled, "The value_type of array_view must be standarded layout"); + static_assert(Enabled, "The value_type of span must be standarded layout"); return { reinterpret_cast<const byte*>(this->data()), this->bytes() }; } template <bool Enabled = std::is_standard_layout<std::decay_t<ValueType>>::value> - auto as_writeable_bytes() const noexcept -> array_view<byte> + auto as_writeable_bytes() const noexcept -> span<byte> { - static_assert(Enabled, "The value_type of array_view must be standarded layout"); + static_assert(Enabled, "The value_type of span must be standarded layout"); return { reinterpret_cast<byte*>(this->data()), this->bytes() }; } // from bytes array template<typename U, bool IsByte = std::is_same<value_type, const byte>::value, typename = std::enable_if_t<IsByte && sizeof...(RestDimensions) == 0>> - constexpr auto as_array_view() const noexcept -> array_view<const U, (Base::bounds_type::static_size != dynamic_range ? static_cast<std::ptrdiff_t>(static_cast<size_t>(Base::bounds_type::static_size) / sizeof(U)) : dynamic_range)> + constexpr auto as_span() const noexcept -> span<const U, (Base::bounds_type::static_size != dynamic_range ? static_cast<std::ptrdiff_t>(static_cast<size_t>(Base::bounds_type::static_size) / sizeof(U)) : dynamic_range)> { static_assert(std::is_standard_layout<U>::value && (Base::bounds_type::static_size == dynamic_range || Base::bounds_type::static_size % static_cast<size_type>(sizeof(U)) == 0), "Target type must be standard layout and its size must match the byte array size"); @@ -1459,7 +1459,7 @@ public: } template<typename U, bool IsByte = std::is_same<value_type, byte>::value, typename = std::enable_if_t<IsByte && sizeof...(RestDimensions) == 0>> - constexpr auto as_array_view() const noexcept -> array_view<U, (Base::bounds_type::static_size != dynamic_range ? static_cast<ptrdiff_t>(static_cast<size_t>(Base::bounds_type::static_size) / sizeof(U)) : dynamic_range)> + constexpr auto as_span() const noexcept -> span<U, (Base::bounds_type::static_size != dynamic_range ? static_cast<ptrdiff_t>(static_cast<size_t>(Base::bounds_type::static_size) / sizeof(U)) : dynamic_range)> { static_assert(std::is_standard_layout<U>::value && (Base::bounds_type::static_size == dynamic_range || Base::bounds_type::static_size % static_cast<size_t>(sizeof(U)) == 0), "Target type must be standard layout and its size must match the byte array size"); @@ -1469,42 +1469,42 @@ public: // section on linear space template<std::ptrdiff_t Count> - constexpr array_view<ValueType, Count> first() const noexcept + constexpr span<ValueType, Count> first() const noexcept { static_assert(bounds_type::static_size == dynamic_range || Count <= bounds_type::static_size, "Index is out of bound"); fail_fast_assert(bounds_type::static_size != dynamic_range || Count <= this->size()); // ensures we only check condition when needed return { this->data(), Count }; } - constexpr array_view<ValueType, dynamic_range> first(size_type count) const noexcept + constexpr span<ValueType, dynamic_range> first(size_type count) const noexcept { fail_fast_assert(count <= this->size()); return { this->data(), count }; } template<std::ptrdiff_t Count> - constexpr array_view<ValueType, Count> last() const noexcept + constexpr span<ValueType, Count> last() const noexcept { static_assert(bounds_type::static_size == dynamic_range || Count <= bounds_type::static_size, "Index is out of bound"); fail_fast_assert(bounds_type::static_size != dynamic_range || Count <= this->size()); return { this->data() + this->size() - Count, Count }; } - constexpr array_view<ValueType, dynamic_range> last(size_type count) const noexcept + constexpr span<ValueType, dynamic_range> last(size_type count) const noexcept { fail_fast_assert(count <= this->size()); return { this->data() + this->size() - count, count }; } template<std::ptrdiff_t Offset, std::ptrdiff_t Count> - constexpr array_view<ValueType, Count> sub() const noexcept + constexpr span<ValueType, Count> sub() const noexcept { static_assert(bounds_type::static_size == dynamic_range || ((Offset == 0 || Offset <= bounds_type::static_size) && Offset + Count <= bounds_type::static_size), "Index is out of bound"); fail_fast_assert(bounds_type::static_size != dynamic_range || ((Offset == 0 || Offset <= this->size()) && Offset + Count <= this->size())); return { this->data() + Offset, Count }; } - constexpr array_view<ValueType, dynamic_range> sub(size_type offset, size_type count = dynamic_range) const noexcept + constexpr span<ValueType, dynamic_range> sub(size_type offset, size_type count = dynamic_range) const noexcept { fail_fast_assert((offset == 0 || offset <= this->size()) && (count == dynamic_range || (offset + count) <= this->size())); return { this->data() + offset, count == dynamic_range ? this->length() - offset : count }; @@ -1532,7 +1532,7 @@ public: } // section - constexpr strided_array_view<ValueType, rank> section(index_type origin, index_type extents) const + constexpr strided_span<ValueType, rank> section(index_type origin, index_type extents) const { size_type size = this->bounds().total_size() - this->bounds().linearize(origin); return{ &this->operator[](origin), size, strided_bounds<rank> {extents, details::make_stride(Base::bounds())} }; @@ -1544,7 +1544,7 @@ public: } template <bool Enabled = (rank > 1), typename Dummy = std::enable_if_t<Enabled>> - constexpr array_view<ValueType, RestDimensions...> operator[](size_type idx) const + constexpr span<ValueType, RestDimensions...> operator[](size_type idx) const { auto ret = Base::operator[](idx); return{ ret.data(), ret.bounds() }; @@ -1559,63 +1559,63 @@ public: }; template <typename T, std::ptrdiff_t... Dimensions> -constexpr auto as_array_view(T* const& ptr, dim<Dimensions>... args) -> array_view<std::remove_all_extents_t<T>, Dimensions...> +constexpr auto as_span(T* const& ptr, dim<Dimensions>... args) -> span<std::remove_all_extents_t<T>, Dimensions...> { - return {reinterpret_cast<std::remove_all_extents_t<T>*>(ptr), details::static_as_array_view_helper<static_bounds<Dimensions...>>(args..., details::Sep{})}; + return {reinterpret_cast<std::remove_all_extents_t<T>*>(ptr), details::static_as_span_helper<static_bounds<Dimensions...>>(args..., details::Sep{})}; } template <typename T> -constexpr auto as_array_view (T* arr, std::ptrdiff_t len) -> typename details::ArrayViewArrayTraits<T, dynamic_range>::type +constexpr auto as_span (T* arr, std::ptrdiff_t len) -> typename details::ArrayViewArrayTraits<T, dynamic_range>::type { return {reinterpret_cast<std::remove_all_extents_t<T>*>(arr), len}; } template <typename T, size_t N> -constexpr auto as_array_view (T (&arr)[N]) -> typename details::ArrayViewArrayTraits<T, N>::type +constexpr auto as_span (T (&arr)[N]) -> typename details::ArrayViewArrayTraits<T, N>::type { return {arr}; } template <typename T, size_t N> -constexpr array_view<const T, N> as_array_view(const std::array<T, N> &arr) +constexpr span<const T, N> as_span(const std::array<T, N> &arr) { return {arr}; } template <typename T, size_t N> -constexpr array_view<const T, N> as_array_view(const std::array<T, N> &&) = delete; +constexpr span<const T, N> as_span(const std::array<T, N> &&) = delete; template <typename T, size_t N> -constexpr array_view<T, N> as_array_view(std::array<T, N> &arr) +constexpr span<T, N> as_span(std::array<T, N> &arr) { return {arr}; } template <typename T> -constexpr array_view<T, dynamic_range> as_array_view(T *begin, T *end) +constexpr span<T, dynamic_range> as_span(T *begin, T *end) { return {begin, end}; } template <typename Cont> -constexpr auto as_array_view(Cont &arr) -> std::enable_if_t<!details::is_array_view<std::decay_t<Cont>>::value, - array_view<std::remove_reference_t<decltype(arr.size(), *arr.data())>, dynamic_range>> +constexpr auto as_span(Cont &arr) -> std::enable_if_t<!details::is_span<std::decay_t<Cont>>::value, + span<std::remove_reference_t<decltype(arr.size(), *arr.data())>, dynamic_range>> { fail_fast_assert(arr.size() < PTRDIFF_MAX); return {arr.data(), static_cast<std::ptrdiff_t>(arr.size())}; } template <typename Cont> -constexpr auto as_array_view(Cont &&arr) -> std::enable_if_t<!details::is_array_view<std::decay_t<Cont>>::value, - array_view<std::remove_reference_t<decltype(arr.size(), *arr.data())>, dynamic_range>> = delete; +constexpr auto as_span(Cont &&arr) -> std::enable_if_t<!details::is_span<std::decay_t<Cont>>::value, + span<std::remove_reference_t<decltype(arr.size(), *arr.data())>, dynamic_range>> = delete; template <typename ValueType, size_t Rank> -class strided_array_view : public basic_array_view<ValueType, strided_bounds<Rank>> +class strided_span : public basic_span<ValueType, strided_bounds<Rank>> { - using Base = basic_array_view<ValueType, strided_bounds<Rank>>; + using Base = basic_span<ValueType, strided_bounds<Rank>>; template<typename OtherValue, size_t OtherRank> - friend class strided_array_view; + friend class strided_span; public: using Base::rank; @@ -1630,36 +1630,36 @@ public: // from static array of size N template<size_type N> - strided_array_view(value_type(&values)[N], bounds_type bounds) : Base(values, std::move(bounds)) + strided_span(value_type(&values)[N], bounds_type bounds) : Base(values, std::move(bounds)) { fail_fast_assert(this->bounds().total_size() <= N, "Bounds cross data boundaries"); } // from raw data - strided_array_view(pointer ptr, size_type size, bounds_type bounds): Base(ptr, std::move(bounds)) + strided_span(pointer ptr, size_type size, bounds_type bounds): Base(ptr, std::move(bounds)) { fail_fast_assert(this->bounds().total_size() <= size, "Bounds cross data boundaries"); } // from array view template <std::ptrdiff_t... Dimensions, typename Dummy = std::enable_if<sizeof...(Dimensions) == Rank>> - strided_array_view(array_view<ValueType, Dimensions...> av, bounds_type bounds) : Base(av.data(), std::move(bounds)) + strided_span(span<ValueType, Dimensions...> av, bounds_type bounds) : Base(av.data(), std::move(bounds)) { fail_fast_assert(this->bounds().total_size() <= av.bounds().total_size(), "Bounds cross data boundaries"); } // convertible template <typename OtherValueType, - typename BaseType = basic_array_view<ValueType, strided_bounds<Rank>>, - typename OtherBaseType = basic_array_view<OtherValueType, strided_bounds<Rank>>, + typename BaseType = basic_span<ValueType, strided_bounds<Rank>>, + typename OtherBaseType = basic_span<OtherValueType, strided_bounds<Rank>>, typename Dummy = std::enable_if_t<std::is_convertible<OtherBaseType, BaseType>::value> > - constexpr strided_array_view(const strided_array_view<OtherValueType, Rank> &av) : Base(static_cast<const typename strided_array_view<OtherValueType, Rank>::Base &>(av)) // static_cast is required + constexpr strided_span(const strided_span<OtherValueType, Rank> &av) : Base(static_cast<const typename strided_span<OtherValueType, Rank>::Base &>(av)) // static_cast is required {} // convert from bytes template <typename OtherValueType> - strided_array_view<typename std::enable_if<std::is_same<value_type, const byte>::value, OtherValueType>::type, rank> as_strided_array_view() const + strided_span<typename std::enable_if<std::is_same<value_type, const byte>::value, OtherValueType>::type, rank> as_strided_span() const { static_assert((sizeof(OtherValueType) >= sizeof(value_type)) && (sizeof(OtherValueType) % sizeof(value_type) == 0), "OtherValueType should have a size to contain a multiple of ValueTypes"); auto d = static_cast<size_type>(sizeof(OtherValueType) / sizeof(value_type)); @@ -1668,7 +1668,7 @@ public: return{ (OtherValueType*)this->data(), size, bounds_type{ resize_extent(this->bounds().index_bounds(), d), resize_stride(this->bounds().strides(), d)} }; } - strided_array_view section(index_type origin, index_type extents) const + strided_span section(index_type origin, index_type extents) const { size_type size = this->bounds().total_size() - this->bounds().linearize(origin); return { &this->operator[](origin), size, bounds_type {extents, details::make_stride(Base::bounds())}}; @@ -1680,7 +1680,7 @@ public: } template <bool Enabled = (rank > 1), typename Dummy = std::enable_if_t<Enabled>> - constexpr strided_array_view<value_type, rank-1> operator[](size_type idx) const + constexpr strided_span<value_type, rank-1> operator[](size_type idx) const { auto ret = Base::operator[](idx); return{ ret.data(), ret.bounds().total_size(), ret.bounds() }; @@ -1722,7 +1722,7 @@ private: }; template <typename ArrayView> -class contiguous_array_view_iterator : public std::iterator<std::random_access_iterator_tag, typename ArrayView::value_type> +class contiguous_span_iterator : public std::iterator<std::random_access_iterator_tag, typename ArrayView::value_type> { using Base = std::iterator<std::random_access_iterator_tag, typename ArrayView::value_type>; public: @@ -1732,7 +1732,7 @@ public: private: template <typename ValueType, typename Bounds> - friend class basic_array_view; + friend class basic_span; pointer m_pdata; const ArrayView * m_validator; @@ -1740,7 +1740,7 @@ private: { fail_fast_assert(m_pdata >= m_validator->m_pdata && m_pdata < m_validator->m_pdata + m_validator->size(), "iterator is out of range of the array"); } - contiguous_array_view_iterator (const ArrayView *container, bool isbegin) : + contiguous_span_iterator (const ArrayView *container, bool isbegin) : m_pdata(isbegin ? container->m_pdata : container->m_pdata + container->size()), m_validator(container) {} public: reference operator*() const noexcept @@ -1753,48 +1753,48 @@ public: validateThis(); return m_pdata; } - contiguous_array_view_iterator& operator++() noexcept + contiguous_span_iterator& operator++() noexcept { ++m_pdata; return *this; } - contiguous_array_view_iterator operator++(int)noexcept + contiguous_span_iterator operator++(int)noexcept { auto ret = *this; ++(*this); return ret; } - contiguous_array_view_iterator& operator--() noexcept + contiguous_span_iterator& operator--() noexcept { --m_pdata; return *this; } - contiguous_array_view_iterator operator--(int)noexcept + contiguous_span_iterator operator--(int)noexcept { auto ret = *this; --(*this); return ret; } - contiguous_array_view_iterator operator+(difference_type n) const noexcept + contiguous_span_iterator operator+(difference_type n) const noexcept { - contiguous_array_view_iterator ret{ *this }; + contiguous_span_iterator ret{ *this }; return ret += n; } - contiguous_array_view_iterator& operator+=(difference_type n) noexcept + contiguous_span_iterator& operator+=(difference_type n) noexcept { m_pdata += n; return *this; } - contiguous_array_view_iterator operator-(difference_type n) const noexcept + contiguous_span_iterator operator-(difference_type n) const noexcept { - contiguous_array_view_iterator ret{ *this }; + contiguous_span_iterator ret{ *this }; return ret -= n; } - contiguous_array_view_iterator& operator-=(difference_type n) noexcept + contiguous_span_iterator& operator-=(difference_type n) noexcept { return *this += -n; } - difference_type operator-(const contiguous_array_view_iterator& rhs) const noexcept + difference_type operator-(const contiguous_span_iterator& rhs) const noexcept { fail_fast_assert(m_validator == rhs.m_validator); return m_pdata - rhs.m_pdata; @@ -1803,33 +1803,33 @@ public: { return *(*this + n); } - bool operator==(const contiguous_array_view_iterator& rhs) const noexcept + bool operator==(const contiguous_span_iterator& rhs) const noexcept { fail_fast_assert(m_validator == rhs.m_validator); return m_pdata == rhs.m_pdata; } - bool operator!=(const contiguous_array_view_iterator& rhs) const noexcept + bool operator!=(const contiguous_span_iterator& rhs) const noexcept { return !(*this == rhs); } - bool operator<(const contiguous_array_view_iterator& rhs) const noexcept + bool operator<(const contiguous_span_iterator& rhs) const noexcept { fail_fast_assert(m_validator == rhs.m_validator); return m_pdata < rhs.m_pdata; } - bool operator<=(const contiguous_array_view_iterator& rhs) const noexcept + bool operator<=(const contiguous_span_iterator& rhs) const noexcept { return !(rhs < *this); } - bool operator>(const contiguous_array_view_iterator& rhs) const noexcept + bool operator>(const contiguous_span_iterator& rhs) const noexcept { return rhs < *this; } - bool operator>=(const contiguous_array_view_iterator& rhs) const noexcept + bool operator>=(const contiguous_span_iterator& rhs) const noexcept { return !(rhs > *this); } - void swap(contiguous_array_view_iterator& rhs) noexcept + void swap(contiguous_span_iterator& rhs) noexcept { std::swap(m_pdata, rhs.m_pdata); std::swap(m_validator, rhs.m_validator); @@ -1837,13 +1837,13 @@ public: }; template <typename ArrayView> -contiguous_array_view_iterator<ArrayView> operator+(typename contiguous_array_view_iterator<ArrayView>::difference_type n, const contiguous_array_view_iterator<ArrayView>& rhs) noexcept +contiguous_span_iterator<ArrayView> operator+(typename contiguous_span_iterator<ArrayView>::difference_type n, const contiguous_span_iterator<ArrayView>& rhs) noexcept { return rhs + n; } template <typename ArrayView> -class general_array_view_iterator : public std::iterator<std::random_access_iterator_tag, typename ArrayView::value_type> +class general_span_iterator : public std::iterator<std::random_access_iterator_tag, typename ArrayView::value_type> { using Base = std::iterator<std::random_access_iterator_tag, typename ArrayView::value_type>; public: @@ -1853,11 +1853,11 @@ public: using typename Base::value_type; private: template <typename ValueType, typename Bounds> - friend class basic_array_view; + friend class basic_span; const ArrayView * m_container; typename ArrayView::bounds_type::iterator m_itr; - general_array_view_iterator(const ArrayView *container, bool isbegin) : + general_span_iterator(const ArrayView *container, bool isbegin) : m_container(container), m_itr(isbegin ? m_container->bounds().begin() : m_container->bounds().end()) {} public: @@ -1869,48 +1869,48 @@ public: { return &(*m_container)[*m_itr]; } - general_array_view_iterator& operator++() noexcept + general_span_iterator& operator++() noexcept { ++m_itr; return *this; } - general_array_view_iterator operator++(int)noexcept + general_span_iterator operator++(int)noexcept { auto ret = *this; ++(*this); return ret; } - general_array_view_iterator& operator--() noexcept + general_span_iterator& operator--() noexcept { --m_itr; return *this; } - general_array_view_iterator operator--(int)noexcept + general_span_iterator operator--(int)noexcept { auto ret = *this; --(*this); return ret; } - general_array_view_iterator operator+(difference_type n) const noexcept + general_span_iterator operator+(difference_type n) const noexcept { - general_array_view_iterator ret{ *this }; + general_span_iterator ret{ *this }; return ret += n; } - general_array_view_iterator& operator+=(difference_type n) noexcept + general_span_iterator& operator+=(difference_type n) noexcept { m_itr += n; return *this; } - general_array_view_iterator operator-(difference_type n) const noexcept + general_span_iterator operator-(difference_type n) const noexcept { - general_array_view_iterator ret{ *this }; + general_span_iterator ret{ *this }; return ret -= n; } - general_array_view_iterator& operator-=(difference_type n) noexcept + general_span_iterator& operator-=(difference_type n) noexcept { return *this += -n; } - difference_type operator-(const general_array_view_iterator& rhs) const noexcept + difference_type operator-(const general_span_iterator& rhs) const noexcept { fail_fast_assert(m_container == rhs.m_container); return m_itr - rhs.m_itr; @@ -1919,33 +1919,33 @@ public: { return (*m_container)[m_itr[n]];; } - bool operator==(const general_array_view_iterator& rhs) const noexcept + bool operator==(const general_span_iterator& rhs) const noexcept { fail_fast_assert(m_container == rhs.m_container); return m_itr == rhs.m_itr; } - bool operator !=(const general_array_view_iterator& rhs) const noexcept + bool operator !=(const general_span_iterator& rhs) const noexcept { return !(*this == rhs); } - bool operator<(const general_array_view_iterator& rhs) const noexcept + bool operator<(const general_span_iterator& rhs) const noexcept { fail_fast_assert(m_container == rhs.m_container); return m_itr < rhs.m_itr; } - bool operator<=(const general_array_view_iterator& rhs) const noexcept + bool operator<=(const general_span_iterator& rhs) const noexcept { return !(rhs < *this); } - bool operator>(const general_array_view_iterator& rhs) const noexcept + bool operator>(const general_span_iterator& rhs) const noexcept { return rhs < *this; } - bool operator>=(const general_array_view_iterator& rhs) const noexcept + bool operator>=(const general_span_iterator& rhs) const noexcept { return !(rhs > *this); } - void swap(general_array_view_iterator& rhs) noexcept + void swap(general_span_iterator& rhs) noexcept { std::swap(m_itr, rhs.m_itr); std::swap(m_container, rhs.m_container); @@ -1953,7 +1953,7 @@ public: }; template <typename ArrayView> -general_array_view_iterator<ArrayView> operator+(typename general_array_view_iterator<ArrayView>::difference_type n, const general_array_view_iterator<ArrayView>& rhs) noexcept +general_span_iterator<ArrayView> operator+(typename general_span_iterator<ArrayView>::difference_type n, const general_span_iterator<ArrayView>& rhs) noexcept { return rhs + n; } @@ -1985,4 +1985,4 @@ general_array_view_iterator<ArrayView> operator+(typename general_array_view_ite #endif // GSL_THROWS_FOR_TESTING -#endif // GSL_ARRAY_VIEW_H +#endif // GSL_SPAN_H diff --git a/include/string_view.h b/include/string_span.h index b5f73c5..beccee4 100644 --- a/include/string_view.h +++ b/include/string_span.h @@ -16,10 +16,10 @@ #pragma once -#ifndef GSL_STRING_VIEW_H -#define GSL_STRING_VIEW_H +#ifndef GSL_STRING_SPAN_H +#define GSL_STRING_SPAN_H -#include "array_view.h" +#include "span.h" #include <cstring> namespace gsl @@ -47,39 +47,36 @@ template<std::ptrdiff_t Max = dynamic_range> using wzstring = wchar_t*; // -// string_view and relatives +// string_span and relatives // // Note that Extent is always single-dimension only -// Note that SizeType is defaulted to be smaller than size_t which is the array_view default -// -// TODO (neilmac) once array_view regains configurable size_type, update these typedef's // template <class CharT, std::ptrdiff_t Extent = dynamic_range> -using basic_string_view = array_view<CharT, Extent>; +using basic_string_span = span<CharT, Extent>; template<std::ptrdiff_t Extent = dynamic_range> -using string_view = basic_string_view<char, Extent>; +using string_span = basic_string_span<char, Extent>; template<std::ptrdiff_t Extent = dynamic_range> -using cstring_view = basic_string_view<const char, Extent>; +using cstring_span = basic_string_span<const char, Extent>; template<std::ptrdiff_t Extent = dynamic_range> -using wstring_view = basic_string_view<wchar_t, Extent>; +using wstring_span = basic_string_span<wchar_t, Extent>; template<std::ptrdiff_t Extent = dynamic_range> -using cwstring_view = basic_string_view<const wchar_t, Extent>; +using cwstring_span = basic_string_span<const wchar_t, Extent>; // // ensure_sentinel() // -// Provides a way to obtain an array_view from a contiguous sequence +// Provides a way to obtain an span from a contiguous sequence // that ends with a (non-inclusive) sentinel value. // // Will fail-fast if sentinel cannot be found before max elements are examined. // template<class T, const T Sentinel> -array_view<T, dynamic_range> ensure_sentinel(const T* seq, std::ptrdiff_t max = PTRDIFF_MAX) +span<T, dynamic_range> ensure_sentinel(const T* seq, std::ptrdiff_t max = PTRDIFF_MAX) { auto cur = seq; while ((cur - seq) < max && *cur != Sentinel) ++cur; @@ -89,56 +86,56 @@ array_view<T, dynamic_range> ensure_sentinel(const T* seq, std::ptrdiff_t max = // -// ensure_z - creates a string_view for a czstring or cwzstring. +// ensure_z - creates a string_span for a czstring or cwzstring. // Will fail fast if a null-terminator cannot be found before // the limit of size_type. // template<class T> -inline basic_string_view<T, dynamic_range> ensure_z(T* const & sz, std::ptrdiff_t max = PTRDIFF_MAX) +inline basic_string_span<T, dynamic_range> ensure_z(T* const & sz, std::ptrdiff_t max = PTRDIFF_MAX) { return ensure_sentinel<T, 0>(sz, max); } // TODO (neilmac) there is probably a better template-magic way to get the const and non-const overloads to share an implementation -inline basic_string_view<char, dynamic_range> ensure_z(char* const& sz, std::ptrdiff_t max) +inline basic_string_span<char, dynamic_range> ensure_z(char* const& sz, std::ptrdiff_t max) { auto len = strnlen(sz, max); fail_fast_assert(sz[len] == 0); return{ sz, static_cast<std::ptrdiff_t>(len) }; } -inline basic_string_view<const char, dynamic_range> ensure_z(const char* const& sz, std::ptrdiff_t max) +inline basic_string_span<const char, dynamic_range> ensure_z(const char* const& sz, std::ptrdiff_t max) { auto len = strnlen(sz, max); fail_fast_assert(sz[len] == 0); return{ sz, static_cast<std::ptrdiff_t>(len) }; } -inline basic_string_view<wchar_t, dynamic_range> ensure_z(wchar_t* const& sz, std::ptrdiff_t max) +inline basic_string_span<wchar_t, dynamic_range> ensure_z(wchar_t* const& sz, std::ptrdiff_t max) { auto len = wcsnlen(sz, max); fail_fast_assert(sz[len] == 0); return{ sz, static_cast<std::ptrdiff_t>(len) }; } -inline basic_string_view<const wchar_t, dynamic_range> ensure_z(const wchar_t* const& sz, std::ptrdiff_t max) +inline basic_string_span<const wchar_t, dynamic_range> ensure_z(const wchar_t* const& sz, std::ptrdiff_t max) { auto len = wcsnlen(sz, max); fail_fast_assert(sz[len] == 0); return{ sz, static_cast<std::ptrdiff_t>(len) }; } template<class T, size_t N> -basic_string_view<T, dynamic_range> ensure_z(T(&sz)[N]) { return ensure_z(&sz[0], static_cast<std::ptrdiff_t>(N)); } +basic_string_span<T, dynamic_range> ensure_z(T(&sz)[N]) { return ensure_z(&sz[0], static_cast<std::ptrdiff_t>(N)); } template<class Cont> -basic_string_view<typename std::remove_pointer<typename Cont::pointer>::type, dynamic_range> ensure_z(Cont& cont) +basic_string_span<typename std::remove_pointer<typename Cont::pointer>::type, dynamic_range> ensure_z(Cont& cont) { return ensure_z(cont.data(), cont.length()); } // -// to_string() allow (explicit) conversions from string_view to string +// to_string() allow (explicit) conversions from string_span to string // template<class CharT, size_t Extent> -std::basic_string<typename std::remove_const<CharT>::type> to_string(basic_string_view<CharT, Extent> view) +std::basic_string<typename std::remove_const<CharT>::type> to_string(basic_string_span<CharT, Extent> view) { return{ view.data(), view.length() }; } @@ -148,11 +145,11 @@ template<class CharT, size_t Extent = dynamic_range> class basic_zstring_builder { public: - using string_view_type = basic_string_view<CharT, Extent>; + using string_span_type = basic_string_span<CharT, Extent>; using value_type = CharT; using pointer = CharT*; - using size_type = typename string_view_type::size_type; - using iterator = typename string_view_type::iterator; + using size_type = typename string_span_type::size_type; + using iterator = typename string_span_type::iterator; basic_zstring_builder(CharT* data, size_type length) : sv_(data, length) {} @@ -160,18 +157,18 @@ public: basic_zstring_builder(CharT(&arr)[Size]) : sv_(arr) {} pointer data() const { return sv_.data(); } - string_view_type view() const { return sv_; } + string_span_type view() const { return sv_; } size_type length() const { return sv_.length(); } pointer assume0() const { return data(); } - string_view_type ensure_z() const { return gsl::ensure_z(sv_); } + string_span_type ensure_z() const { return gsl::ensure_z(sv_); } iterator begin() const { return sv_.begin(); } iterator end() const { return sv_.end(); } private: - string_view_type sv_; + string_span_type sv_; }; template <size_t Max = dynamic_range> @@ -181,4 +178,4 @@ template <size_t Max = dynamic_range> using wzstring_builder = basic_zstring_builder<wchar_t, Max>; } -#endif // GSL_STRING_VIEW_H +#endif // GSL_STRING_SPAN_H diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5e4c395..3435a7f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -43,8 +43,8 @@ function(add_gsl_test name) ) endfunction() -add_gsl_test(array_view_tests) -add_gsl_test(string_view_tests) +add_gsl_test(span_tests) +add_gsl_test(string_span_tests) add_gsl_test(at_tests) add_gsl_test(bounds_tests) add_gsl_test(notnull_tests) diff --git a/tests/bounds_tests.cpp b/tests/bounds_tests.cpp index aacf3d8..53c44d1 100644 --- a/tests/bounds_tests.cpp +++ b/tests/bounds_tests.cpp @@ -15,7 +15,7 @@ /////////////////////////////////////////////////////////////////////////////// #include <UnitTest++/UnitTest++.h> -#include <array_view.h> +#include <span.h> #include <vector> using namespace std; @@ -55,7 +55,7 @@ SUITE(bounds_test) auto itr = bounds.begin(); #ifdef CONFIRM_COMPILATION_ERRORS - array_view<int, 4, dynamic_range, 2> av(nullptr, bounds); + span<int, 4, dynamic_range, 2> av(nullptr, bounds); auto itr2 = av.cbegin(); diff --git a/tests/array_view_tests.cpp b/tests/span_tests.cpp index dd2067f..4c21116 100644 --- a/tests/array_view_tests.cpp +++ b/tests/span_tests.cpp @@ -15,7 +15,7 @@ /////////////////////////////////////////////////////////////////////////////// #include <UnitTest++/UnitTest++.h> -#include <array_view.h> +#include <span.h> #include <string> #include <vector> @@ -32,11 +32,11 @@ namespace struct DerivedClass : BaseClass {}; } -SUITE(array_view_tests) +SUITE(span_tests) { TEST(basics) { - auto ptr = as_array_view(new int[10], 10); + auto ptr = as_span(new int[10], 10); fill(ptr.begin(), ptr.end(), 99); for (int num : ptr) { @@ -49,45 +49,45 @@ SUITE(array_view_tests) static_bounds<4, dynamic_range, 2> bounds{ 3 }; #ifdef CONFIRM_COMPILATION_ERRORS - array_view<int, 4, dynamic_range, 2> av(nullptr, bounds); + span<int, 4, dynamic_range, 2> av(nullptr, bounds); av.extent(); av.extent<2>(); av[8][4][3]; #endif } - TEST (array_view_convertible) + TEST (span_convertible) { #ifdef CONFIRM_COMPILATION_ERRORS - array_view<int, 7, 4, 2> av1(nullptr, b1); + span<int, 7, 4, 2> av1(nullptr, b1); #endif - auto f = [&]() { array_view<int, 7, 4, 2> av1(nullptr); }; + auto f = [&]() { span<int, 7, 4, 2> av1(nullptr); }; CHECK_THROW(f(), fail_fast); - array_view<int, 7, dynamic_range, 2> av1(nullptr); + span<int, 7, dynamic_range, 2> av1(nullptr); #ifdef CONFIRM_COMPILATION_ERRORS static_bounds<size_t, 7, dynamic_range, 2> b12(b11); b12 = b11; b11 = b12; - array_view<int, dynamic_range> av1 = nullptr; - array_view<int, 7, dynamic_range, 2> av2(av1); - array_view<int, 7, 4, 2> av2(av1); + span<int, dynamic_range> av1 = nullptr; + span<int, 7, dynamic_range, 2> av2(av1); + span<int, 7, 4, 2> av2(av1); #endif - array_view<DerivedClass> avd; + span<DerivedClass> avd; #ifdef CONFIRM_COMPILATION_ERRORS - array_view<BaseClass> avb = avd; + span<BaseClass> avb = avd; #endif - array_view<const DerivedClass> avcd = avd; + span<const DerivedClass> avcd = avd; } TEST(boundary_checks) { int arr[10][2]; - auto av = as_array_view(arr); + auto av = as_span(arr); fill(begin(av), end(av), 0); @@ -102,32 +102,32 @@ SUITE(array_view_tests) CHECK_THROW((av[{10,2}]), fail_fast); } - void overloaded_func(array_view<const int, dynamic_range, 3, 5> exp, int expected_value) { + void overloaded_func(span<const int, dynamic_range, 3, 5> exp, int expected_value) { for (auto val : exp) { CHECK(val == expected_value); } } - void overloaded_func(array_view<const char, dynamic_range, 3, 5> exp, char expected_value) { + void overloaded_func(span<const char, dynamic_range, 3, 5> exp, char expected_value) { for (auto val : exp) { CHECK(val == expected_value); } } - void fixed_func(array_view<int, 3, 3, 5> exp, int expected_value) { + void fixed_func(span<int, 3, 3, 5> exp, int expected_value) { for (auto val : exp) { CHECK(val == expected_value); } } - TEST(array_view_parameter_test) + TEST(span_parameter_test) { auto data = new int[4][3][5]; - auto av = as_array_view(data, 4); + auto av = as_span(data, 4); CHECK(av.size() == 60); @@ -138,7 +138,7 @@ SUITE(array_view_tests) CHECK(count == 34 * 60); overloaded_func(av, 34); - overloaded_func(av.as_array_view(dim<>(4), dim<>(3), dim<>(5)), 34); + overloaded_func(av.as_span(dim<>(4), dim<>(3), dim<>(5)), 34); //fixed_func(av, 34); delete[] data; @@ -153,7 +153,7 @@ SUITE(array_view_tests) auto image_ptr = new int[imgSize][3]; // size check will be done - auto image_view = as_array_view(image_ptr, imgSize).as_array_view(dim<>(height), dim<>(width), dim<3>()); + auto image_view = as_span(image_ptr, imgSize).as_span(dim<>(height), dim<>(width), dim<3>()); iota(image_view.begin(), image_view.end(), 1); @@ -178,12 +178,12 @@ SUITE(array_view_tests) } } - TEST(array_view_factory_test) + TEST(span_factory_test) { { int * arr = new int[150]; - auto av = as_array_view(arr, dim<10>(), dim<>(3), dim<5>()); + auto av = as_span(arr, dim<10>(), dim<>(3), dim<5>()); fill(av.begin(), av.end(), 24); overloaded_func(av, 24); @@ -192,54 +192,54 @@ SUITE(array_view_tests) array<int, 15> stdarr{ 0 }; - auto av2 = as_array_view(stdarr); - overloaded_func(av2.as_array_view(dim<>(1), dim<3>(), dim<5>()), 0); + auto av2 = as_span(stdarr); + overloaded_func(av2.as_span(dim<>(1), dim<3>(), dim<5>()), 0); string str = "ttttttttttttttt"; // size = 15 auto t = str.data(); - auto av3 = as_array_view(str); - overloaded_func(av3.as_array_view(dim<>(1), dim<3>(), dim<5>()), 't'); + auto av3 = as_span(str); + overloaded_func(av3.as_span(dim<>(1), dim<3>(), dim<5>()), 't'); } { int a[3][4][5]; - auto av = as_array_view(a); + auto av = as_span(a); const int (*b)[4][5]; b = a; - auto bv = as_array_view(b, 3); + auto bv = as_span(b, 3); CHECK(av == bv); const std::array<double, 3> arr = {0.0, 0.0, 0.0}; - auto cv = as_array_view(arr); + auto cv = as_span(arr); vector<float> vec(3); - auto dv = as_array_view(vec); + auto dv = as_span(vec); #ifdef CONFIRM_COMPILATION_ERRORS - auto dv2 = as_array_view(std::move(vec)); + auto dv2 = as_span(std::move(vec)); #endif } } template <class Bounds> void fn(const Bounds& b) { static_assert(Bounds::static_size == 60, "static bounds is wrong size"); } - TEST (array_view_reshape_test) + TEST (span_reshape_test) { int a[3][4][5]; - auto av = as_array_view(a); + auto av = as_span(a); fn(av.bounds()); - auto av2 = av.as_array_view(dim<60>()); - auto av3 = av2.as_array_view(dim<3>(), dim<4>(), dim<5>()); - auto av4 = av3.as_array_view(dim<4>(), dim<>(3), dim<5>()); - auto av5 = av4.as_array_view(dim<3>(), dim<4>(), dim<5>()); - auto av6 = av5.as_array_view(dim<12>(), dim<>(5)); + auto av2 = av.as_span(dim<60>()); + auto av3 = av2.as_span(dim<3>(), dim<4>(), dim<5>()); + auto av4 = av3.as_span(dim<4>(), dim<>(3), dim<5>()); + auto av5 = av4.as_span(dim<3>(), dim<4>(), dim<5>()); + auto av6 = av5.as_span(dim<12>(), dim<>(5)); fill(av6.begin(), av6.end(), 1); auto av7 = av6.as_bytes(); - auto av8 = av7.as_array_view<int>(); + auto av8 = av7.as_span<int>(); CHECK(av8.size() == av6.size()); for (auto i = 0; i < av8.size(); i++) @@ -249,97 +249,97 @@ SUITE(array_view_tests) #ifdef CONFIRM_COMPILATION_ERRORS struct Foo {char c[11];}; - auto av9 = av7.as_array_view<Foo>(); + auto av9 = av7.as_span<Foo>(); #endif } - TEST (array_view_section_test) + TEST (span_section_test) { int a[30][4][5]; - auto av = as_array_view(a); + auto av = as_span(a); auto sub = av.section({15, 0, 0}, gsl::index<3>{2, 2, 2}); auto subsub = sub.section({1, 0, 0}, gsl::index<3>{1, 1, 1}); } - TEST(array_view_section) + TEST(span_section) { std::vector<int> data(5 * 10); std::iota(begin(data), end(data), 0); - const array_view<int, 5, 10> av = as_array_view(data).as_array_view(dim<5>(), dim<10>()); + const span<int, 5, 10> av = as_span(data).as_span(dim<5>(), dim<10>()); - strided_array_view<int, 2> av_section_1 = av.section({ 1, 2 }, { 3, 4 }); + strided_span<int, 2> av_section_1 = av.section({ 1, 2 }, { 3, 4 }); CHECK((av_section_1[{0, 0}] == 12)); CHECK((av_section_1[{0, 1}] == 13)); CHECK((av_section_1[{1, 0}] == 22)); CHECK((av_section_1[{2, 3}] == 35)); - strided_array_view<int, 2> av_section_2 = av_section_1.section({ 1, 2 }, { 2,2 }); + strided_span<int, 2> av_section_2 = av_section_1.section({ 1, 2 }, { 2,2 }); CHECK((av_section_2[{0, 0}] == 24)); CHECK((av_section_2[{0, 1}] == 25)); CHECK((av_section_2[{1, 0}] == 34)); } - TEST(strided_array_view_constructors) + TEST(strided_span_constructors) { // Check stride constructor { int arr[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 }; const int carr[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 }; - strided_array_view<int, 1> sav1{ arr, {{9}, {1}} }; // T -> T + strided_span<int, 1> sav1{ arr, {{9}, {1}} }; // T -> T CHECK(sav1.bounds().index_bounds() == index<1>{ 9 }); CHECK(sav1.bounds().stride() == 1); CHECK(sav1[0] == 1 && sav1[8] == 9); - strided_array_view<const int, 1> sav2{ carr, {{ 4 }, { 2 }} }; // const T -> const T + strided_span<const int, 1> sav2{ carr, {{ 4 }, { 2 }} }; // const T -> const T CHECK(sav2.bounds().index_bounds() == index<1>{ 4 }); CHECK(sav2.bounds().strides() == index<1>{2}); CHECK(sav2[0] == 1 && sav2[3] == 7); - strided_array_view<int, 2> sav3{ arr, {{ 2, 2 },{ 6, 2 }} }; // T -> const T + strided_span<int, 2> sav3{ arr, {{ 2, 2 },{ 6, 2 }} }; // T -> const T CHECK((sav3.bounds().index_bounds() == index<2>{ 2, 2 })); CHECK((sav3.bounds().strides() == index<2>{ 6, 2 })); CHECK((sav3[{0, 0}] == 1 && sav3[{0, 1}] == 3 && sav3[{1, 0}] == 7)); } - // Check array_view constructor + // Check span constructor { int arr[] = { 1, 2 }; // From non-cv-qualified source { - const array_view<int> src = arr; + const span<int> src = arr; - strided_array_view<int, 1> sav{ src, {2, 1} }; + strided_span<int, 1> sav{ src, {2, 1} }; CHECK(sav.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav.bounds().strides() == index<1>{ 1 }); CHECK(sav[1] == 2); #if _MSC_VER > 1800 - strided_array_view<const int, 1> sav_c{ {src}, {2, 1} }; + strided_span<const int, 1> sav_c{ {src}, {2, 1} }; #else - strided_array_view<const int, 1> sav_c{ array_view<const int>{src}, strided_bounds<1>{2, 1} }; + strided_span<const int, 1> sav_c{ span<const int>{src}, strided_bounds<1>{2, 1} }; #endif CHECK(sav_c.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav_c.bounds().strides() == index<1>{ 1 }); CHECK(sav_c[1] == 2); #if _MSC_VER > 1800 - strided_array_view<volatile int, 1> sav_v{ {src}, {2, 1} }; + strided_span<volatile int, 1> sav_v{ {src}, {2, 1} }; #else - strided_array_view<volatile int, 1> sav_v{ array_view<volatile int>{src}, strided_bounds<1>{2, 1} }; + strided_span<volatile int, 1> sav_v{ span<volatile int>{src}, strided_bounds<1>{2, 1} }; #endif CHECK(sav_v.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav_v.bounds().strides() == index<1>{ 1 }); CHECK(sav_v[1] == 2); #if _MSC_VER > 1800 - strided_array_view<const volatile int, 1> sav_cv{ {src}, {2, 1} }; + strided_span<const volatile int, 1> sav_cv{ {src}, {2, 1} }; #else - strided_array_view<const volatile int, 1> sav_cv{ array_view<const volatile int>{src}, strided_bounds<1>{2, 1} }; + strided_span<const volatile int, 1> sav_cv{ span<const volatile int>{src}, strided_bounds<1>{2, 1} }; #endif CHECK(sav_cv.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav_cv.bounds().strides() == index<1>{ 1 }); @@ -348,17 +348,17 @@ SUITE(array_view_tests) // From const-qualified source { - const array_view<const int> src{ arr }; + const span<const int> src{ arr }; - strided_array_view<const int, 1> sav_c{ src, {2, 1} }; + strided_span<const int, 1> sav_c{ src, {2, 1} }; CHECK(sav_c.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav_c.bounds().strides() == index<1>{ 1 }); CHECK(sav_c[1] == 2); #if _MSC_VER > 1800 - strided_array_view<const volatile int, 1> sav_cv{ {src}, {2, 1} }; + strided_span<const volatile int, 1> sav_cv{ {src}, {2, 1} }; #else - strided_array_view<const volatile int, 1> sav_cv{ array_view<const volatile int>{src}, strided_bounds<1>{2, 1} }; + strided_span<const volatile int, 1> sav_cv{ span<const volatile int>{src}, strided_bounds<1>{2, 1} }; #endif CHECK(sav_cv.bounds().index_bounds() == index<1>{ 2 }); @@ -368,17 +368,17 @@ SUITE(array_view_tests) // From volatile-qualified source { - const array_view<volatile int> src{ arr }; + const span<volatile int> src{ arr }; - strided_array_view<volatile int, 1> sav_v{ src, {2, 1} }; + strided_span<volatile int, 1> sav_v{ src, {2, 1} }; CHECK(sav_v.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav_v.bounds().strides() == index<1>{ 1 }); CHECK(sav_v[1] == 2); #if _MSC_VER > 1800 - strided_array_view<const volatile int, 1> sav_cv{ {src}, {2, 1} }; + strided_span<const volatile int, 1> sav_cv{ {src}, {2, 1} }; #else - strided_array_view<const volatile int, 1> sav_cv{ array_view<const volatile int>{src}, strided_bounds<1>{2, 1} }; + strided_span<const volatile int, 1> sav_cv{ span<const volatile int>{src}, strided_bounds<1>{2, 1} }; #endif CHECK(sav_cv.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav_cv.bounds().strides() == index<1>{ 1 }); @@ -387,9 +387,9 @@ SUITE(array_view_tests) // From cv-qualified source { - const array_view<const volatile int> src{ arr }; + const span<const volatile int> src{ arr }; - strided_array_view<const volatile int, 1> sav_cv{ src, {2, 1} }; + strided_span<const volatile int, 1> sav_cv{ src, {2, 1} }; CHECK(sav_cv.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav_cv.bounds().strides() == index<1>{ 1 }); CHECK(sav_cv[1] == 2); @@ -400,34 +400,34 @@ SUITE(array_view_tests) { int arr[2] = { 4, 5 }; - const array_view<int, 2> av(arr, 2); - array_view<const int, 2> av2{ av }; + const span<int, 2> av(arr, 2); + span<const int, 2> av2{ av }; CHECK(av2[1] == 5); - static_assert(std::is_convertible<const array_view<int, 2>, array_view<const int, 2>>::value, "ctor is not implicit!"); + static_assert(std::is_convertible<const span<int, 2>, span<const int, 2>>::value, "ctor is not implicit!"); - const strided_array_view<int, 1> src{ arr, {2, 1} }; - strided_array_view<const int, 1> sav{ src }; + const strided_span<int, 1> src{ arr, {2, 1} }; + strided_span<const int, 1> sav{ src }; CHECK(sav.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav.bounds().stride() == 1); CHECK(sav[1] == 5); - static_assert(std::is_convertible<const strided_array_view<int, 1>, strided_array_view<const int, 1>>::value, "ctor is not implicit!"); + static_assert(std::is_convertible<const strided_span<int, 1>, strided_span<const int, 1>>::value, "ctor is not implicit!"); } // Check copy constructor { int arr1[2] = { 3, 4 }; - const strided_array_view<int, 1> src1{ arr1, {2, 1} }; - strided_array_view<int, 1> sav1{ src1 }; + const strided_span<int, 1> src1{ arr1, {2, 1} }; + strided_span<int, 1> sav1{ src1 }; CHECK(sav1.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav1.bounds().stride() == 1); CHECK(sav1[0] == 3); int arr2[6] = { 1, 2, 3, 4, 5, 6 }; - const strided_array_view<const int, 2> src2{ arr2, {{ 3, 2 }, { 2, 1 }} }; - strided_array_view<const int, 2> sav2{ src2 }; + const strided_span<const int, 2> src2{ arr2, {{ 3, 2 }, { 2, 1 }} }; + strided_span<const int, 2> sav2{ src2 }; CHECK((sav2.bounds().index_bounds() == index<2>{ 3, 2 })); CHECK((sav2.bounds().strides() == index<2>{ 2, 1 })); CHECK((sav2[{0, 0}] == 1 && sav2[{2, 0}] == 5)); @@ -438,9 +438,9 @@ SUITE(array_view_tests) int arr1[2] = { 1, 2 }; int arr2[6] = { 3, 4, 5, 6, 7, 8 }; - const strided_array_view<int, 1> src{ arr1, {{2}, {1}} }; - strided_array_view<const int, 1> sav{ arr2, {{3}, {2}} }; - strided_array_view<const int, 1>& sav_ref = (sav = src); + const strided_span<int, 1> src{ arr1, {{2}, {1}} }; + strided_span<const int, 1> sav{ arr2, {{3}, {2}} }; + strided_span<const int, 1>& sav_ref = (sav = src); CHECK(sav.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav.bounds().strides() == index<1>{ 1 }); CHECK(sav[0] == 1); @@ -451,9 +451,9 @@ SUITE(array_view_tests) { int arr1[2] = { 3, 4 }; int arr1b[1] = { 0 }; - const strided_array_view<int, 1> src1{ arr1, {2, 1} }; - strided_array_view<int, 1> sav1{ arr1b, {1, 1} }; - strided_array_view<int, 1>& sav1_ref = (sav1 = src1); + const strided_span<int, 1> src1{ arr1, {2, 1} }; + strided_span<int, 1> sav1{ arr1b, {1, 1} }; + strided_span<int, 1>& sav1_ref = (sav1 = src1); CHECK(sav1.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav1.bounds().strides() == index<1>{ 1 }); CHECK(sav1[0] == 3); @@ -461,9 +461,9 @@ SUITE(array_view_tests) const int arr2[6] = { 1, 2, 3, 4, 5, 6 }; const int arr2b[1] = { 0 }; - const strided_array_view<const int, 2> src2{ arr2, {{ 3, 2 },{ 2, 1 }} }; - strided_array_view<const int, 2> sav2{ arr2b, {{ 1, 1 },{ 1, 1 }} }; - strided_array_view<const int, 2>& sav2_ref = (sav2 = src2); + const strided_span<const int, 2> src2{ arr2, {{ 3, 2 },{ 2, 1 }} }; + strided_span<const int, 2> sav2{ arr2b, {{ 1, 1 },{ 1, 1 }} }; + strided_span<const int, 2>& sav2_ref = (sav2 = src2); CHECK((sav2.bounds().index_bounds() == index<2>{ 3, 2 })); CHECK((sav2.bounds().strides() == index<2>{ 2, 1 })); CHECK((sav2[{0, 0}] == 1 && sav2[{2, 0}] == 5)); @@ -471,23 +471,23 @@ SUITE(array_view_tests) } } - TEST(strided_array_view_slice) + TEST(strided_span_slice) { std::vector<int> data(5 * 10); std::iota(begin(data), end(data), 0); - const array_view<int, 5, 10> src = as_array_view(data).as_array_view(dim<5>(), dim<10>()); + const span<int, 5, 10> src = as_span(data).as_span(dim<5>(), dim<10>()); - const strided_array_view<int, 2> sav{ src, {{5, 10}, {10, 1}} }; + const strided_span<int, 2> sav{ src, {{5, 10}, {10, 1}} }; #ifdef CONFIRM_COMPILATION_ERRORS - const strided_array_view<const int, 2> csav{ {src},{ { 5, 10 },{ 10, 1 } } }; + const strided_span<const int, 2> csav{ {src},{ { 5, 10 },{ 10, 1 } } }; #endif - const strided_array_view<const int, 2> csav{ array_view<const int, 5, 10>{ src }, { { 5, 10 },{ 10, 1 } } }; + const strided_span<const int, 2> csav{ span<const int, 5, 10>{ src }, { { 5, 10 },{ 10, 1 } } }; - strided_array_view<int, 1> sav_sl = sav[2]; + strided_span<int, 1> sav_sl = sav[2]; CHECK(sav_sl[0] == 20); CHECK(sav_sl[9] == 29); - strided_array_view<const int, 1> csav_sl = sav[3]; + strided_span<const int, 1> csav_sl = sav[3]; CHECK(csav_sl[0] == 30); CHECK(csav_sl[9] == 39); @@ -495,9 +495,9 @@ SUITE(array_view_tests) CHECK(sav[4][9] == 49); } - TEST(strided_array_view_column_major) + TEST(strided_span_column_major) { - // strided_array_view may be used to accomodate more peculiar + // strided_span may be used to accomodate more peculiar // use cases, such as column-major multidimensional array // (aka. "FORTRAN" layout). @@ -506,7 +506,7 @@ SUITE(array_view_tests) 2, 5, 8, 11, 14, 3, 6, 9, 12, 15 }; - strided_array_view<int, 2> cm_sav{ cm_array, {{ 5, 3 },{ 1, 5 }} }; + strided_span<int, 2> cm_sav{ cm_array, {{ 5, 3 },{ 1, 5 }} }; // Accessing elements CHECK((cm_sav[{0, 0}] == 1)); @@ -515,14 +515,14 @@ SUITE(array_view_tests) CHECK((cm_sav[{4, 2}] == 15)); // Slice - strided_array_view<int, 1> cm_sl = cm_sav[3]; + strided_span<int, 1> cm_sl = cm_sav[3]; CHECK(cm_sl[0] == 10); CHECK(cm_sl[1] == 11); CHECK(cm_sl[2] == 12); // Section - strided_array_view<int, 2> cm_sec = cm_sav.section( { 2, 1 }, { 3, 2 }); + strided_span<int, 2> cm_sec = cm_sav.section( { 2, 1 }, { 3, 2 }); CHECK((cm_sec.bounds().index_bounds() == index<2>{3, 2})); CHECK((cm_sec[{0, 0}] == 8)); @@ -531,10 +531,10 @@ SUITE(array_view_tests) CHECK((cm_sec[{2, 1}] == 15)); } - TEST(strided_array_view_bounds) + TEST(strided_span_bounds) { int arr[] = { 0, 1, 2, 3 }; - array_view<int> av(arr); + span<int> av(arr); { // incorrect sections @@ -552,7 +552,7 @@ SUITE(array_view_tests) { // zero stride - strided_array_view<int, 1> sav{ av,{ { 4 },{} } }; + strided_span<int, 1> sav{ av,{ { 4 },{} } }; CHECK(sav[0] == 0); CHECK(sav[3] == 0); CHECK_THROW(sav[4], fail_fast); @@ -560,19 +560,19 @@ SUITE(array_view_tests) { // zero extent - strided_array_view<int, 1> sav{ av,{ {},{ 1 } } }; + strided_span<int, 1> sav{ av,{ {},{ 1 } } }; CHECK_THROW(sav[0], fail_fast); } { // zero extent and stride - strided_array_view<int, 1> sav{ av,{ {},{} } }; + strided_span<int, 1> sav{ av,{ {},{} } }; CHECK_THROW(sav[0], fail_fast); } { // strided array ctor with matching strided bounds - strided_array_view<int, 1> sav{ arr,{ 4, 1 } }; + strided_span<int, 1> sav{ arr,{ 4, 1 } }; CHECK(sav.bounds().index_bounds() == index<1>{ 4 }); CHECK(sav[3] == 3); CHECK_THROW(sav[4], fail_fast); @@ -580,7 +580,7 @@ SUITE(array_view_tests) { // strided array ctor with smaller strided bounds - strided_array_view<int, 1> sav{ arr,{ 2, 1 } }; + strided_span<int, 1> sav{ arr,{ 2, 1 } }; CHECK(sav.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav[1] == 1); CHECK_THROW(sav[2], fail_fast); @@ -588,7 +588,7 @@ SUITE(array_view_tests) { // strided array ctor with fitting irregular bounds - strided_array_view<int, 1> sav{ arr,{ 2, 3 } }; + strided_span<int, 1> sav{ arr,{ 2, 3 } }; CHECK(sav.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav[0] == 0); CHECK(sav[1] == 3); @@ -597,92 +597,92 @@ SUITE(array_view_tests) { // bounds cross data boundaries - from static arrays - CHECK_THROW((strided_array_view<int, 1> { arr, { 3, 2 } }), fail_fast); - CHECK_THROW((strided_array_view<int, 1> { arr, { 3, 3 } }), fail_fast); - CHECK_THROW((strided_array_view<int, 1> { arr, { 4, 5 } }), fail_fast); - CHECK_THROW((strided_array_view<int, 1> { arr, { 5, 1 } }), fail_fast); - CHECK_THROW((strided_array_view<int, 1> { arr, { 5, 5 } }), fail_fast); + CHECK_THROW((strided_span<int, 1> { arr, { 3, 2 } }), fail_fast); + CHECK_THROW((strided_span<int, 1> { arr, { 3, 3 } }), fail_fast); + CHECK_THROW((strided_span<int, 1> { arr, { 4, 5 } }), fail_fast); + CHECK_THROW((strided_span<int, 1> { arr, { 5, 1 } }), fail_fast); + CHECK_THROW((strided_span<int, 1> { arr, { 5, 5 } }), fail_fast); } { // bounds cross data boundaries - from array view - CHECK_THROW((strided_array_view<int, 1> { av, { 3, 2 } }), fail_fast); - CHECK_THROW((strided_array_view<int, 1> { av, { 3, 3 } }), fail_fast); - CHECK_THROW((strided_array_view<int, 1> { av, { 4, 5 } }), fail_fast); - CHECK_THROW((strided_array_view<int, 1> { av, { 5, 1 } }), fail_fast); - CHECK_THROW((strided_array_view<int, 1> { av, { 5, 5 } }), fail_fast); + CHECK_THROW((strided_span<int, 1> { av, { 3, 2 } }), fail_fast); + CHECK_THROW((strided_span<int, 1> { av, { 3, 3 } }), fail_fast); + CHECK_THROW((strided_span<int, 1> { av, { 4, 5 } }), fail_fast); + CHECK_THROW((strided_span<int, 1> { av, { 5, 1 } }), fail_fast); + CHECK_THROW((strided_span<int, 1> { av, { 5, 5 } }), fail_fast); } { // bounds cross data boundaries - from dynamic arrays - CHECK_THROW((strided_array_view<int, 1> { av.data(), 4, { 3, 2 } }), fail_fast); - CHECK_THROW((strided_array_view<int, 1> { av.data(), 4, { 3, 3 } }), fail_fast); - CHECK_THROW((strided_array_view<int, 1> { av.data(), 4, { 4, 5 } }), fail_fast); - CHECK_THROW((strided_array_view<int, 1> { av.data(), 4, { 5, 1 } }), fail_fast); - CHECK_THROW((strided_array_view<int, 1> { av.data(), 4, { 5, 5 } }), fail_fast); - CHECK_THROW((strided_array_view<int, 1> { av.data(), 2, { 2, 2 } }), fail_fast); + CHECK_THROW((strided_span<int, 1> { av.data(), 4, { 3, 2 } }), fail_fast); + CHECK_THROW((strided_span<int, 1> { av.data(), 4, { 3, 3 } }), fail_fast); + CHECK_THROW((strided_span<int, 1> { av.data(), 4, { 4, 5 } }), fail_fast); + CHECK_THROW((strided_span<int, 1> { av.data(), 4, { 5, 1 } }), fail_fast); + CHECK_THROW((strided_span<int, 1> { av.data(), 4, { 5, 5 } }), fail_fast); + CHECK_THROW((strided_span<int, 1> { av.data(), 2, { 2, 2 } }), fail_fast); } #ifdef CONFIRM_COMPILATION_ERRORS { - strided_array_view<int, 1> sav0{ av.data(), { 3, 2 } }; - strided_array_view<int, 1> sav1{ arr, { 1 } }; - strided_array_view<int, 1> sav2{ arr, { 1,1,1 } }; - strided_array_view<int, 1> sav3{ av, { 1 } }; - strided_array_view<int, 1> sav4{ av, { 1,1,1 } }; - strided_array_view<int, 2> sav5{ av.as_array_view(dim<2>(), dim<2>()), { 1 } }; - strided_array_view<int, 2> sav6{ av.as_array_view(dim<2>(), dim<2>()), { 1,1,1 } }; - strided_array_view<int, 2> sav7{ av.as_array_view(dim<2>(), dim<2>()), { { 1,1 },{ 1,1 },{ 1,1 } } }; + strided_span<int, 1> sav0{ av.data(), { 3, 2 } }; + strided_span<int, 1> sav1{ arr, { 1 } }; + strided_span<int, 1> sav2{ arr, { 1,1,1 } }; + strided_span<int, 1> sav3{ av, { 1 } }; + strided_span<int, 1> sav4{ av, { 1,1,1 } }; + strided_span<int, 2> sav5{ av.as_span(dim<2>(), dim<2>()), { 1 } }; + strided_span<int, 2> sav6{ av.as_span(dim<2>(), dim<2>()), { 1,1,1 } }; + strided_span<int, 2> sav7{ av.as_span(dim<2>(), dim<2>()), { { 1,1 },{ 1,1 },{ 1,1 } } }; index<1> index{ 0, 1 }; - strided_array_view<int, 1> sav8{ arr,{ 1,{ 1,1 } } }; - strided_array_view<int, 1> sav9{ arr,{ { 1,1 },{ 1,1 } } }; - strided_array_view<int, 1> sav10{ av,{ 1,{ 1,1 } } }; - strided_array_view<int, 1> sav11{ av,{ { 1,1 },{ 1,1 } } }; - strided_array_view<int, 2> sav12{ av.as_array_view(dim<2>(), dim<2>()),{ { 1 },{ 1 } } }; - strided_array_view<int, 2> sav13{ av.as_array_view(dim<2>(), dim<2>()),{ { 1 },{ 1,1,1 } } }; - strided_array_view<int, 2> sav14{ av.as_array_view(dim<2>(), dim<2>()),{ { 1,1,1 },{ 1 } } }; + strided_span<int, 1> sav8{ arr,{ 1,{ 1,1 } } }; + strided_span<int, 1> sav9{ arr,{ { 1,1 },{ 1,1 } } }; + strided_span<int, 1> sav10{ av,{ 1,{ 1,1 } } }; + strided_span<int, 1> sav11{ av,{ { 1,1 },{ 1,1 } } }; + strided_span<int, 2> sav12{ av.as_span(dim<2>(), dim<2>()),{ { 1 },{ 1 } } }; + strided_span<int, 2> sav13{ av.as_span(dim<2>(), dim<2>()),{ { 1 },{ 1,1,1 } } }; + strided_span<int, 2> sav14{ av.as_span(dim<2>(), dim<2>()),{ { 1,1,1 },{ 1 } } }; } #endif } - TEST(strided_array_view_type_conversion) + TEST(strided_span_type_conversion) { int arr[] = { 0, 1, 2, 3 }; - array_view<int> av(arr); + span<int> av(arr); { - strided_array_view<int, 1> sav{ av.data(), av.size(), { av.size() / 2, 2 } }; + strided_span<int, 1> sav{ av.data(), av.size(), { av.size() / 2, 2 } }; #ifdef CONFIRM_COMPILATION_ERRORS - strided_array_view<long, 1> lsav1 = sav.as_strided_array_view<long, 1>(); + strided_span<long, 1> lsav1 = sav.as_strided_span<long, 1>(); #endif } { - strided_array_view<int, 1> sav{ av, { av.size() / 2, 2 } }; + strided_span<int, 1> sav{ av, { av.size() / 2, 2 } }; #ifdef CONFIRM_COMPILATION_ERRORS - strided_array_view<long, 1> lsav1 = sav.as_strided_array_view<long, 1>(); + strided_span<long, 1> lsav1 = sav.as_strided_span<long, 1>(); #endif } - array_view<const byte, dynamic_range> bytes = av.as_bytes(); + span<const byte, dynamic_range> bytes = av.as_bytes(); // retype strided array with regular strides - from raw data { strided_bounds<2> bounds{ { 2, bytes.size() / 4 }, { bytes.size() / 2, 1 } }; - strided_array_view<const byte, 2> sav2{ bytes.data(), bytes.size(), bounds }; - strided_array_view<const int, 2> sav3 = sav2.as_strided_array_view<const int>(); + strided_span<const byte, 2> sav2{ bytes.data(), bytes.size(), bounds }; + strided_span<const int, 2> sav3 = sav2.as_strided_span<const int>(); CHECK(sav3[0][0] == 0); CHECK(sav3[1][0] == 2); CHECK_THROW(sav3[1][1], fail_fast); CHECK_THROW(sav3[0][1], fail_fast); } - // retype strided array with regular strides - from array_view + // retype strided array with regular strides - from span { strided_bounds<2> bounds{ { 2, bytes.size() / 4 }, { bytes.size() / 2, 1 } }; - array_view<const byte, 2, dynamic_range> bytes2 = bytes.as_array_view(dim<2>(), dim<>(bytes.size() / 2)); - strided_array_view<const byte, 2> sav2{ bytes2, bounds }; - strided_array_view<int, 2> sav3 = sav2.as_strided_array_view<int>(); + span<const byte, 2, dynamic_range> bytes2 = bytes.as_span(dim<2>(), dim<>(bytes.size() / 2)); + strided_span<const byte, 2> sav2{ bytes2, bounds }; + strided_span<int, 2> sav3 = sav2.as_strided_span<int>(); CHECK(sav3[0][0] == 0); CHECK(sav3[1][0] == 2); CHECK_THROW(sav3[1][1], fail_fast); @@ -692,47 +692,47 @@ SUITE(array_view_tests) // retype strided array with not enough elements - last dimension of the array is too small { strided_bounds<2> bounds{ { 4,2 },{ 4, 1 } }; - array_view<const byte, 2, dynamic_range> bytes2 = bytes.as_array_view(dim<2>(), dim<>(bytes.size() / 2)); - strided_array_view<const byte, 2> sav2{ bytes2, bounds }; - CHECK_THROW(sav2.as_strided_array_view<int>(), fail_fast); + span<const byte, 2, dynamic_range> bytes2 = bytes.as_span(dim<2>(), dim<>(bytes.size() / 2)); + strided_span<const byte, 2> sav2{ bytes2, bounds }; + CHECK_THROW(sav2.as_strided_span<int>(), fail_fast); } // retype strided array with not enough elements - strides are too small { strided_bounds<2> bounds{ { 4,2 },{ 2, 1 } }; - array_view<const byte, 2, dynamic_range> bytes2 = bytes.as_array_view(dim<2>(), dim<>(bytes.size() / 2)); - strided_array_view<const byte, 2> sav2{ bytes2, bounds }; - CHECK_THROW(sav2.as_strided_array_view<int>(), fail_fast); + span<const byte, 2, dynamic_range> bytes2 = bytes.as_span(dim<2>(), dim<>(bytes.size() / 2)); + strided_span<const byte, 2> sav2{ bytes2, bounds }; + CHECK_THROW(sav2.as_strided_span<int>(), fail_fast); } // retype strided array with not enough elements - last dimension does not divide by the new typesize { strided_bounds<2> bounds{ { 2,6 },{ 4, 1 } }; - array_view<const byte, 2, dynamic_range> bytes2 = bytes.as_array_view(dim<2>(), dim<>(bytes.size() / 2)); - strided_array_view<const byte, 2> sav2{ bytes2, bounds }; - CHECK_THROW(sav2.as_strided_array_view<int>(), fail_fast); + span<const byte, 2, dynamic_range> bytes2 = bytes.as_span(dim<2>(), dim<>(bytes.size() / 2)); + strided_span<const byte, 2> sav2{ bytes2, bounds }; + CHECK_THROW(sav2.as_strided_span<int>(), fail_fast); } // retype strided array with not enough elements - strides does not divide by the new typesize { strided_bounds<2> bounds{ { 2, 1 },{ 6, 1 } }; - array_view<const byte, 2, dynamic_range> bytes2 = bytes.as_array_view(dim<2>(), dim<>(bytes.size() / 2)); - strided_array_view<const byte, 2> sav2{ bytes2, bounds }; - CHECK_THROW(sav2.as_strided_array_view<int>(), fail_fast); + span<const byte, 2, dynamic_range> bytes2 = bytes.as_span(dim<2>(), dim<>(bytes.size() / 2)); + strided_span<const byte, 2> sav2{ bytes2, bounds }; + CHECK_THROW(sav2.as_strided_span<int>(), fail_fast); } // retype strided array with irregular strides - from raw data { strided_bounds<1> bounds{ bytes.size() / 2, 2 }; - strided_array_view<const byte, 1> sav2{ bytes.data(), bytes.size(), bounds }; - CHECK_THROW(sav2.as_strided_array_view<int>(), fail_fast); + strided_span<const byte, 1> sav2{ bytes.data(), bytes.size(), bounds }; + CHECK_THROW(sav2.as_strided_span<int>(), fail_fast); } - // retype strided array with irregular strides - from array_view + // retype strided array with irregular strides - from span { strided_bounds<1> bounds{ bytes.size() / 2, 2 }; - strided_array_view<const byte, 1> sav2{ bytes, bounds }; - CHECK_THROW(sav2.as_strided_array_view<int>(), fail_fast); + strided_span<const byte, 1> sav2{ bytes, bounds }; + CHECK_THROW(sav2.as_strided_span<int>(), fail_fast); } } @@ -740,14 +740,14 @@ SUITE(array_view_tests) { #ifdef CONFIRM_COMPILATION_ERRORS { - array_view<int, 1> empty; - strided_array_view<int, 2> empty2; - strided_array_view<int, 1> empty3{ nullptr,{ 0, 1 } }; + span<int, 1> empty; + strided_span<int, 2> empty2; + strided_span<int, 1> empty3{ nullptr,{ 0, 1 } }; } #endif { - array_view<int, 0> empty_av(nullptr); + span<int, 0> empty_av(nullptr); CHECK(empty_av.bounds().index_bounds() == index<1>{ 0 }); CHECK_THROW(empty_av[0], fail_fast); @@ -760,7 +760,7 @@ SUITE(array_view_tests) } { - array_view<int> empty_av = {}; + span<int> empty_av = {}; CHECK(empty_av.bounds().index_bounds() == index<1>{ 0 }); CHECK_THROW(empty_av[0], fail_fast); CHECK_THROW(empty_av.begin()[0], fail_fast); @@ -772,8 +772,8 @@ SUITE(array_view_tests) } { - array_view<int, 0> empty_av(nullptr); - strided_array_view<int, 1> empty_sav{ empty_av, { 0, 1 } }; + span<int, 0> empty_av(nullptr); + strided_span<int, 1> empty_sav{ empty_av, { 0, 1 } }; CHECK(empty_sav.bounds().index_bounds() == index<1>{ 0 }); CHECK_THROW(empty_sav[0], fail_fast); @@ -787,7 +787,7 @@ SUITE(array_view_tests) } { - strided_array_view<int, 1> empty_sav{ nullptr, 0, { 0, 1 } }; + strided_span<int, 1> empty_sav{ nullptr, 0, { 0, 1 } }; CHECK(empty_sav.bounds().index_bounds() == index<1>{ 0 }); CHECK_THROW(empty_sav[0], fail_fast); @@ -810,14 +810,14 @@ SUITE(array_view_tests) arr[2 * i + 1] = i; } - array_view<int, dynamic_range> av(arr, 8); + span<int, dynamic_range> av(arr, 8); ptrdiff_t a[1] = { 0 }; index<1> i = a; CHECK(av[i] == 4); - auto av2 = av.as_array_view(dim<4>(), dim<>(2)); + auto av2 = av.as_span(dim<4>(), dim<>(2)); ptrdiff_t a2[2] = { 0, 1 }; index<2> i2 = a2; @@ -955,7 +955,7 @@ SUITE(array_view_tests) } - void iterate_second_column(array_view<int, dynamic_range, dynamic_range> av) + void iterate_second_column(span<int, dynamic_range, dynamic_range> av) { auto length = av.size() / 2; @@ -1017,33 +1017,33 @@ SUITE(array_view_tests) } } - TEST(array_view_section_iteration) + TEST(span_section_iteration) { int arr[4][2] = { { 4,0 },{ 5,1 },{ 6,2 },{ 7,3 } }; // static bounds { - array_view<int, 4, 2> av = arr; + span<int, 4, 2> av = arr; iterate_second_column(av); } // first bound is dynamic { - array_view<int, dynamic_range, 2> av = arr; + span<int, dynamic_range, 2> av = arr; iterate_second_column(av); } // second bound is dynamic { - array_view<int, 4, dynamic_range> av = arr; + span<int, 4, dynamic_range> av = arr; iterate_second_column(av); } // both bounds are dynamic { - array_view<int, dynamic_range, dynamic_range> av = arr; + span<int, dynamic_range, dynamic_range> av = arr; iterate_second_column(av); } } - TEST(dynamic_array_view_section_iteration) + TEST(dynamic_span_section_iteration) { auto height = 4, width = 2; auto size = height * width; @@ -1054,28 +1054,28 @@ SUITE(array_view_tests) arr[i] = i; } - auto av = as_array_view(arr, size); + auto av = as_span(arr, size); // first bound is dynamic { - array_view<int, dynamic_range, 2> av2 = av.as_array_view(dim<>(height), dim<>(width)); + span<int, dynamic_range, 2> av2 = av.as_span(dim<>(height), dim<>(width)); iterate_second_column(av2); } // second bound is dynamic { - array_view<int, 4, dynamic_range> av2 = av.as_array_view(dim<>(height), dim<>(width)); + span<int, 4, dynamic_range> av2 = av.as_span(dim<>(height), dim<>(width)); iterate_second_column(av2); } // both bounds are dynamic { - array_view<int, dynamic_range, dynamic_range> av2 = av.as_array_view(dim<>(height), dim<>(width)); + span<int, dynamic_range, dynamic_range> av2 = av.as_span(dim<>(height), dim<>(width)); iterate_second_column(av2); } delete[] arr; } - void iterate_every_other_element(array_view<int, dynamic_range> av) + void iterate_every_other_element(span<int, dynamic_range> av) { // pick every other element @@ -1085,7 +1085,7 @@ SUITE(array_view_tests) #else auto bounds = strided_bounds<1>(index<1>{ length }, index<1>{ 2 }); #endif - strided_array_view<int, 1> strided(&av.data()[1], av.size() - 1, bounds); + strided_span<int, 1> strided(&av.data()[1], av.size() - 1, bounds); CHECK(strided.size() == length); CHECK(strided.bounds().index_bounds()[0] == length); @@ -1102,24 +1102,24 @@ SUITE(array_view_tests) } } - TEST(strided_array_view_section_iteration) + TEST(strided_span_section_iteration) { int arr[8] = {4,0,5,1,6,2,7,3}; // static bounds { - array_view<int, 8> av(arr, 8); + span<int, 8> av(arr, 8); iterate_every_other_element(av); } // dynamic bounds { - array_view<int, dynamic_range> av(arr, 8); + span<int, dynamic_range> av(arr, 8); iterate_every_other_element(av); } } - TEST(dynamic_strided_array_view_section_iteration) + TEST(dynamic_strided_span_section_iteration) { auto arr = new int[8]; for (int i = 0; i < 4; ++i) @@ -1128,13 +1128,13 @@ SUITE(array_view_tests) arr[2 * i + 1] = i; } - auto av = as_array_view(arr, 8); + auto av = as_span(arr, 8); iterate_every_other_element(av); delete[] arr; } - void iterate_second_slice(array_view<int, dynamic_range, dynamic_range, dynamic_range> av) + void iterate_second_slice(span<int, dynamic_range, dynamic_range, dynamic_range> av) { int expected[6] = { 2,3,10,11,18,19 }; auto section = av.section({ 0,1,0 }, { 3,1,2 }); @@ -1164,7 +1164,7 @@ SUITE(array_view_tests) } } - TEST(strided_array_view_section_iteration_3d) + TEST(strided_span_section_iteration_3d) { int arr[3][4][2]; for (auto i = 0; i < 3; ++i) @@ -1175,12 +1175,12 @@ SUITE(array_view_tests) } { - array_view<int, 3, 4, 2> av = arr; + span<int, 3, 4, 2> av = arr; iterate_second_slice(av); } } - TEST(dynamic_strided_array_view_section_iteration_3d) + TEST(dynamic_strided_span_section_iteration_3d) { auto height = 12, width = 2; auto size = height * width; @@ -1192,30 +1192,30 @@ SUITE(array_view_tests) } { - auto av = as_array_view(arr, 24).as_array_view(dim<3>(),dim<4>(),dim<2>()); + auto av = as_span(arr, 24).as_span(dim<3>(),dim<4>(),dim<2>()); iterate_second_slice(av); } { - auto av = as_array_view(arr, 24).as_array_view(dim<>(3), dim<4>(), dim<2>()); + auto av = as_span(arr, 24).as_span(dim<>(3), dim<4>(), dim<2>()); iterate_second_slice(av); } { - auto av = as_array_view(arr, 24).as_array_view(dim<3>(), dim<>(4), dim<2>()); + auto av = as_span(arr, 24).as_span(dim<3>(), dim<>(4), dim<2>()); iterate_second_slice(av); } { - auto av = as_array_view(arr, 24).as_array_view(dim<3>(), dim<4>(), dim<>(2)); + auto av = as_span(arr, 24).as_span(dim<3>(), dim<4>(), dim<>(2)); iterate_second_slice(av); } delete[] arr; } - TEST(strided_array_view_conversion) + TEST(strided_span_conversion) { - // get an array_view of 'c' values from the list of X's + // get an span of 'c' values from the list of X's struct X { int a; int b; int c; }; @@ -1226,7 +1226,7 @@ SUITE(array_view_tests) auto d1 = sizeof(int) * 12 / d2; // convert to 4x12 array of bytes - auto av = as_array_view(arr, 4).as_bytes().as_array_view(dim<>(d1), dim<>(d2)); + auto av = as_span(arr, 4).as_bytes().as_span(dim<>(d1), dim<>(d2)); CHECK(av.bounds().index_bounds()[0] == 4); CHECK(av.bounds().index_bounds()[1] == 12); @@ -1235,7 +1235,7 @@ SUITE(array_view_tests) auto section = av.section({ 0, 2 * s }, { 4, s }); // { { arr[0].c[0], arr[0].c[1], arr[0].c[2], arr[0].c[3] } , { arr[1].c[0], ... } , ... } // convert to array 4x1 array of integers - auto cs = section.as_strided_array_view<int>(); // { { arr[0].c }, {arr[1].c } , ... } + auto cs = section.as_strided_span<int>(); // { { arr[0].c }, {arr[1].c } , ... } CHECK(cs.bounds().index_bounds()[0] == 4); CHECK(cs.bounds().index_bounds()[1] == 1); @@ -1246,10 +1246,10 @@ SUITE(array_view_tests) { cs.bounds().strides()[1], cs.bounds().strides()[0] } }; - strided_array_view<int, 2> transposed{ cs.data(), cs.bounds().total_size(), reverse_bounds }; + strided_span<int, 2> transposed{ cs.data(), cs.bounds().total_size(), reverse_bounds }; // slice to get a one-dimensional array of c's - strided_array_view<int, 1> result = transposed[0]; + strided_span<int, 1> result = transposed[0]; CHECK(result.bounds().index_bounds()[0] == 4); CHECK_THROW(result.bounds().index_bounds()[1], fail_fast); @@ -1265,80 +1265,80 @@ SUITE(array_view_tests) TEST(constructors) { - array_view<int, dynamic_range> av(nullptr); + span<int, dynamic_range> av(nullptr); CHECK(av.length() == 0); - array_view<int, dynamic_range> av2; + span<int, dynamic_range> av2; CHECK(av2.length() == 0); - array_view<int, dynamic_range> av3(nullptr, 0); + span<int, dynamic_range> av3(nullptr, 0); CHECK(av3.length() == 0); // Constructing from a nullptr + length is specifically disallowed - auto f = [&]() {array_view<int, dynamic_range> av4(nullptr, 2);}; + auto f = [&]() {span<int, dynamic_range> av4(nullptr, 2);}; CHECK_THROW(f(), fail_fast); int arr1[2][3]; - array_view<int, 2, dynamic_range> av5(arr1); + span<int, 2, dynamic_range> av5(arr1); array<int, 15> arr2; - array_view<int, 15> av6(arr2); + span<int, 15> av6(arr2); vector<int> vec1(19); - array_view<int> av7(vec1); + span<int> av7(vec1); CHECK(av7.length() == 19); - array_view<int> av8; + span<int> av8; CHECK(av8.length() == 0); - array_view<int> av9(arr2); + span<int> av9(arr2); CHECK(av9.length() == 15); #ifdef CONFIRM_COMPILATION_ERRORS - array_view<int, 4> av10; + span<int, 4> av10; DerivedClass *p = nullptr; - array_view<BaseClass> av11(p, 0); + span<BaseClass> av11(p, 0); #endif } TEST(copyandassignment) { - array_view<int, dynamic_range> av1; + span<int, dynamic_range> av1; int arr[] = {3, 4, 5}; av1 = arr; - array_view<const int, dynamic_range> av2; + span<const int, dynamic_range> av2; av2 = av1; } - TEST(array_view_first) + TEST(span_first) { int arr[5] = { 1, 2, 3, 4, 5 }; { - array_view<int, 5> av = arr; + span<int, 5> av = arr; CHECK((av.first<2>().bounds() == static_bounds<2>())); CHECK(av.first<2>().length() == 2); CHECK(av.first(2).length() == 2); } { - array_view<int, 5> av = arr; + span<int, 5> av = arr; CHECK((av.first<0>().bounds() == static_bounds<0>())); CHECK(av.first<0>().length() == 0); CHECK(av.first(0).length() == 0); } { - array_view<int, 5> av = arr; + span<int, 5> av = arr; CHECK((av.first<5>().bounds() == static_bounds<5>())); CHECK(av.first<5>().length() == 5); CHECK(av.first(5).length() == 5); } { - array_view<int, 5> av = arr; + span<int, 5> av = arr; #ifdef CONFIRM_COMPILATION_ERRORS CHECK(av.first<6>().bounds() == static_bounds<6>()); CHECK(av.first<6>().length() == 6); @@ -1347,33 +1347,33 @@ SUITE(array_view_tests) } { - array_view<int, dynamic_range> av; + span<int, dynamic_range> av; CHECK((av.first<0>().bounds() == static_bounds<0>())); CHECK(av.first<0>().length() == 0); CHECK(av.first(0).length() == 0); } } - TEST(array_view_last) + TEST(span_last) { int arr[5] = { 1, 2, 3, 4, 5 }; { - array_view<int, 5> av = arr; + span<int, 5> av = arr; CHECK((av.last<2>().bounds() == static_bounds<2>())); CHECK(av.last<2>().length() == 2); CHECK(av.last(2).length() == 2); } { - array_view<int, 5> av = arr; + span<int, 5> av = arr; CHECK((av.last<0>().bounds() == static_bounds<0>())); CHECK(av.last<0>().length() == 0); CHECK(av.last(0).length() == 0); } { - array_view<int, 5> av = arr; + span<int, 5> av = arr; CHECK((av.last<5>().bounds() == static_bounds<5>())); CHECK(av.last<5>().length() == 5); CHECK(av.last(5).length() == 5); @@ -1381,7 +1381,7 @@ SUITE(array_view_tests) { - array_view<int, 5> av = arr; + span<int, 5> av = arr; #ifdef CONFIRM_COMPILATION_ERRORS CHECK((av.last<6>().bounds() == static_bounds<6>())); CHECK(av.last<6>().length() == 6); @@ -1390,17 +1390,17 @@ SUITE(array_view_tests) } { - array_view<int, dynamic_range> av; + span<int, dynamic_range> av; CHECK((av.last<0>().bounds() == static_bounds<0>())); CHECK(av.last<0>().length() == 0); CHECK(av.last(0).length() == 0); } } - TEST(custmized_array_view_size) + TEST(custmized_span_size) { double (*arr)[3][4] = new double[100][3][4]; - array_view<double, dynamic_range, 3, 4> av1(arr, 10); + span<double, dynamic_range, 3, 4> av1(arr, 10); struct EffectiveStructure { @@ -1411,16 +1411,16 @@ SUITE(array_view_tests) CHECK_THROW(av1[10][3][4], fail_fast); - array_view<const double, dynamic_range, 6, 4> av2 = av1.as_array_view(dim<>(5), dim<6>(), dim<4>()); + span<const double, dynamic_range, 6, 4> av2 = av1.as_span(dim<>(5), dim<6>(), dim<4>()); } - TEST(array_view_sub) + TEST(span_sub) { int arr[5] = { 1, 2, 3, 4, 5 }; { - array_view<int, 5> av = arr; + span<int, 5> av = arr; CHECK((av.sub<2,2>().bounds() == static_bounds<2>())); CHECK((av.sub<2,2>().length() == 2)); CHECK(av.sub(2,2).length() == 2); @@ -1429,14 +1429,14 @@ SUITE(array_view_tests) { - array_view<int, 5> av = arr; + span<int, 5> av = arr; CHECK((av.sub<0,0>().bounds() == static_bounds<0>())); CHECK((av.sub<0,0>().length() == 0)); CHECK(av.sub(0,0).length() == 0); } { - array_view<int, 5> av = arr; + span<int, 5> av = arr; CHECK((av.sub<0,5>().bounds() == static_bounds<5>())); CHECK((av.sub<0,5>().length() == 5)); CHECK(av.sub(0,5).length() == 5); @@ -1445,7 +1445,7 @@ SUITE(array_view_tests) } { - array_view<int, 5> av = arr; + span<int, 5> av = arr; CHECK((av.sub<5,0>().bounds() == static_bounds<0>())); CHECK((av.sub<5, 0>().length() == 0)); CHECK(av.sub(5,0).length() == 0); @@ -1453,7 +1453,7 @@ SUITE(array_view_tests) } { - array_view<int, dynamic_range> av; + span<int, dynamic_range> av; CHECK((av.sub<0,0>().bounds() == static_bounds<0>())); CHECK((av.sub<0,0>().length() == 0)); CHECK(av.sub(0,0).length() == 0); @@ -1461,13 +1461,13 @@ SUITE(array_view_tests) } { - array_view<int> av; + span<int> av; CHECK(av.sub(0).length() == 0); CHECK_THROW(av.sub(1).length(), fail_fast); } { - array_view<int> av = arr; + span<int> av = arr; CHECK(av.sub(0).length() == 5); CHECK(av.sub(1).length() == 4); CHECK(av.sub(4).length() == 1); @@ -1479,7 +1479,7 @@ SUITE(array_view_tests) } { - array_view<int,5> av = arr; + span<int,5> av = arr; CHECK(av.sub(0).length() == 5); CHECK(av.sub(1).length() == 4); CHECK(av.sub(4).length() == 1); @@ -1491,7 +1491,7 @@ SUITE(array_view_tests) } } - void AssertNullEmptyProperties(array_view<int, dynamic_range>& av) + void AssertNullEmptyProperties(span<int, dynamic_range>& av) { CHECK(av.length() == 0); CHECK(av.data() == nullptr); @@ -1508,10 +1508,10 @@ SUITE(array_view_tests) TEST(TestNullConstruction) { - array_view<int, dynamic_range> av; + span<int, dynamic_range> av; AssertNullEmptyProperties(av); - array_view<int, dynamic_range> av2(nullptr); + span<int, dynamic_range> av2(nullptr); AssertNullEmptyProperties(av2); } @@ -1519,13 +1519,13 @@ SUITE(array_view_tests) { int a[] = { 1, 2, 3, 4 }; - array_view<int, dynamic_range> av = { &a[1], 3 }; + span<int, dynamic_range> av = { &a[1], 3 }; CHECK(av.length() == 3); - array_view<int, dynamic_range> av3 = { a, 2 }; + span<int, dynamic_range> av3 = { a, 2 }; CHECK(av3.length() == 2); - array_view<int, dynamic_range> av2 = a; + span<int, dynamic_range> av2 = a; CHECK(av2.length() == 4); } @@ -1534,11 +1534,11 @@ SUITE(array_view_tests) int a[] = { 1, 2, 3, 4 }; #ifdef CONFIRM_COMPILATION_ERRORS - array_view<const int, dynamic_range> cav = a; - array_view<int, dynamic_range> av = cav; + span<const int, dynamic_range> cav = a; + span<int, dynamic_range> av = cav; #else - array_view<int, dynamic_range> av = a; - array_view<const int, dynamic_range> cav = av; + span<int, dynamic_range> av = a; + span<const int, dynamic_range> cav = av; #endif AssertContentsMatch(av, cav); } @@ -1547,43 +1547,43 @@ SUITE(array_view_tests) { int arr[] = { 1, 2, 3, 4 }; - // converting to an array_view from an equal size array is ok - array_view<int, 4> av4 = arr; + // converting to an span from an equal size array is ok + span<int, 4> av4 = arr; CHECK(av4.length() == 4); // converting to dynamic_range a_v is always ok { - array_view<int, dynamic_range> av = av4; + span<int, dynamic_range> av = av4; } { - array_view<int, dynamic_range> av = arr; + span<int, dynamic_range> av = arr; } - // initialization or assignment to static array_view that REDUCES size is NOT ok + // initialization or assignment to static span that REDUCES size is NOT ok #ifdef CONFIRM_COMPILATION_ERRORS { - array_view<int, 2> av2 = arr; + span<int, 2> av2 = arr; } { - array_view<int, 2> av2 = av4; + span<int, 2> av2 = av4; } #endif { - array_view<int, dynamic_range> av = arr; - array_view<int, 2> av2 = av; + span<int, dynamic_range> av = arr; + span<int, 2> av2 = av; } #ifdef CONFIRM_COMPILATION_ERRORS { - array_view<int, dynamic_range> av = arr; - array_view<int, 2, 1> av2 = av.as_array_view(dim<2>(), dim<2>()); + span<int, dynamic_range> av = arr; + span<int, 2, 1> av2 = av.as_span(dim<2>(), dim<2>()); } #endif { - array_view<int, dynamic_range> av = arr; - auto f = [&]() {array_view<int, 2, 1> av2 = av.as_array_view(dim<>(2), dim<>(2));}; + span<int, dynamic_range> av = arr; + auto f = [&]() {span<int, 2, 1> av2 = av.as_span(dim<>(2), dim<>(2));}; CHECK_THROW(f(), fail_fast); } @@ -1591,38 +1591,38 @@ SUITE(array_view_tests) // you can convert statically { - array_view<int, 2> av2 = {arr, 2}; + span<int, 2> av2 = {arr, 2}; } { - array_view<int, 1> av2 = av4.first<1>(); + span<int, 1> av2 = av4.first<1>(); } // ...or dynamically { - // NB: implicit conversion to array_view<int,2> from array_view<int,dynamic_range> - array_view<int, 1> av2 = av4.first(1); + // NB: implicit conversion to span<int,2> from span<int,dynamic_range> + span<int, 1> av2 = av4.first(1); } - // initialization or assignment to static array_view that requires size INCREASE is not ok. + // initialization or assignment to static span that requires size INCREASE is not ok. int arr2[2] = { 1, 2 }; #ifdef CONFIRM_COMPILATION_ERRORS { - array_view<int, 4> av4 = arr2; + span<int, 4> av4 = arr2; } { - array_view<int, 2> av2 = arr2; - array_view<int, 4> av4 = av2; + span<int, 2> av2 = arr2; + span<int, 4> av4 = av2; } #endif { - auto f = [&]() {array_view<int, 4> av4 = {arr2, 2};}; + auto f = [&]() {span<int, 4> av4 = {arr2, 2};}; CHECK_THROW(f(), fail_fast); } // this should fail - we are trying to assign a small dynamic a_v to a fixed_size larger one - array_view<int, dynamic_range> av = arr2; - auto f = [&](){ array_view<int, 4> av2 = av; }; + span<int, dynamic_range> av = arr2; + auto f = [&](){ span<int, 4> av2 = av; }; CHECK_THROW(f(), fail_fast); } @@ -1633,13 +1633,13 @@ SUITE(array_view_tests) { #ifdef CONFIRM_COMPILATION_ERRORS // you should not be able to get writeable bytes for const objects - array_view<const int, dynamic_range> av = a; + span<const int, dynamic_range> av = a; auto wav = av.as_writeable_bytes(); #endif } { - array_view<int, dynamic_range> av; + span<int, dynamic_range> av; auto wav = av.as_writeable_bytes(); CHECK(wav.length() == av.length()); CHECK(wav.length() == 0); @@ -1647,7 +1647,7 @@ SUITE(array_view_tests) } { - array_view<int, dynamic_range> av = a; + span<int, dynamic_range> av = a; auto wav = av.as_writeable_bytes(); CHECK(wav.data() == (byte*)&a[0]); CHECK(wav.length() == sizeof(a)); @@ -1659,7 +1659,7 @@ SUITE(array_view_tests) int a[] = { 1, 2, 3, 4 }; { - array_view<int, dynamic_range> av = a; + span<int, dynamic_range> av = a; auto wav = av.as_writeable_bytes(); for (auto& b : wav) { @@ -1672,7 +1672,7 @@ SUITE(array_view_tests) } { - array_view<int, dynamic_range> av = a; + span<int, dynamic_range> av = a; for (auto& n : av) { n = 1; @@ -1688,12 +1688,12 @@ SUITE(array_view_tests) { { int arr[10][2]; - auto av1 = as_array_view(arr); - array_view<const int, dynamic_range, 2> av2 = av1; + auto av1 = as_span(arr); + span<const int, dynamic_range, 2> av2 = av1; CHECK(av1 == av2); - array_view<int, 20> av3 = av1.as_array_view(dim<>(20)); + span<int, 20> av3 = av1.as_span(dim<>(20)); CHECK(av3 == av2 && av3 == av1); } @@ -1717,8 +1717,8 @@ SUITE(array_view_tests) { int arr[] = { 2, 1 }; // bigger - array_view<int> av1 = nullptr; - array_view<int> av2 = arr; + span<int> av1 = nullptr; + span<int> av2 = arr; CHECK(av1 != av2); CHECK(av2 != av1); @@ -1737,8 +1737,8 @@ SUITE(array_view_tests) { int arr1[] = { 1, 2 }; int arr2[] = { 1, 2 }; - array_view<int> av1 = arr1; - array_view<int> av2 = arr2; + span<int> av1 = arr1; + span<int> av2 = arr2; CHECK(av1 == av2); CHECK(!(av1 != av2)); @@ -1757,8 +1757,8 @@ SUITE(array_view_tests) { int arr[] = { 1, 2, 3 }; - array_view<int> av1 = { &arr[0], 2 }; // shorter - array_view<int> av2 = arr; // longer + span<int> av1 = { &arr[0], 2 }; // shorter + span<int> av2 = arr; // longer CHECK(av1 != av2); CHECK(av2 != av1); @@ -1778,8 +1778,8 @@ SUITE(array_view_tests) int arr1[] = { 1, 2 }; // smaller int arr2[] = { 2, 1 }; // bigger - array_view<int> av1 = arr1; - array_view<int> av2 = arr2; + span<int> av1 = arr1; + span<int> av2 = arr2; CHECK(av1 != av2); CHECK(av2 != av1); diff --git a/tests/string_view_tests.cpp b/tests/string_span_tests.cpp index e553ccd..dc3ccf5 100644 --- a/tests/string_view_tests.cpp +++ b/tests/string_span_tests.cpp @@ -15,38 +15,38 @@ /////////////////////////////////////////////////////////////////////////////// #include <UnitTest++/UnitTest++.h> -#include <string_view.h> +#include <string_span.h> #include <vector> #include <cstdlib> using namespace std; using namespace gsl; -SUITE(string_view_tests) +SUITE(string_span_tests) { TEST(TestLiteralConstruction) { - cwstring_view<> v = ensure_z(L"Hello"); + cwstring_span<> v = ensure_z(L"Hello"); CHECK(5 == v.length()); #ifdef CONFIRM_COMPILATION_ERRORS - wstring_view<> v2 = ensure0(L"Hello"); + wstring_span<> v2 = ensure0(L"Hello"); #endif } TEST(TestConstructFromStdString) { std::string s = "Hello there world"; - cstring_view<> v = s; + cstring_span<> v = s; CHECK(v.length() == s.length()); } TEST(TestConstructFromStdVector) { std::vector<char> vec(5, 'h'); - string_view<> v = vec; + string_span<> v = vec; CHECK(v.length() == vec.size()); } @@ -55,25 +55,25 @@ SUITE(string_view_tests) wchar_t stack_string[] = L"Hello"; { - cwstring_view<> v = ensure_z(stack_string); + cwstring_span<> v = ensure_z(stack_string); CHECK(v.length() == 5); CHECK(v.used_length() == v.length()); } { - cwstring_view<> v = stack_string; + cwstring_span<> v = stack_string; CHECK(v.length() == 6); CHECK(v.used_length() == v.length()); } { - wstring_view<> v = ensure_z(stack_string); + wstring_span<> v = ensure_z(stack_string); CHECK(v.length() == 5); CHECK(v.used_length() == v.length()); } { - wstring_view<> v = stack_string; + wstring_span<> v = stack_string; CHECK(v.length() == 6); CHECK(v.used_length() == v.length()); } @@ -82,7 +82,7 @@ SUITE(string_view_tests) TEST(TestConstructFromConstCharPointer) { const char* s = "Hello"; - cstring_view<> v = ensure_z(s); + cstring_span<> v = ensure_z(s); CHECK(v.length() == 5); CHECK(v.used_length() == v.length()); } @@ -90,18 +90,18 @@ SUITE(string_view_tests) TEST(TestConversionToConst) { char stack_string[] = "Hello"; - string_view<> v = ensure_z(stack_string); - cstring_view<> v2 = v; + string_span<> v = ensure_z(stack_string); + cstring_span<> v2 = v; CHECK(v.length() == v2.length()); } TEST(TestConversionFromConst) { char stack_string[] = "Hello"; - cstring_view<> v = ensure_z(stack_string); + cstring_span<> v = ensure_z(stack_string); #ifdef CONFIRM_COMPILATION_ERRORS - string_view<> v2 = v; - string_view<> v3 = "Hello"; + string_span<> v2 = v; + string_span<> v3 = "Hello"; #endif } } |