Merge pull request #833 from JordanMaples/dev/jomaples/noexceptspan

Update noexcept in span and span_iterator
This commit is contained in:
Jordan Maples [MSFT] 2020-01-09 12:45:17 -08:00 committed by GitHub
commit 3c0b38b777
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -164,67 +164,67 @@ namespace details
return span_->data() + index_; return span_->data() + index_;
} }
constexpr span_iterator& operator++() constexpr span_iterator& operator++() noexcept
{ {
Expects(0 <= index_ && index_ != span_->size()); Expects(0 <= index_ && index_ != span_->size());
++index_; ++index_;
return *this; return *this;
} }
constexpr span_iterator operator++(int) constexpr span_iterator operator++(int) noexcept
{ {
auto ret = *this; auto ret = *this;
++(*this); ++(*this);
return ret; return ret;
} }
constexpr span_iterator& operator--() constexpr span_iterator& operator--() noexcept
{ {
Expects(index_ != 0 && index_ <= span_->size()); Expects(index_ != 0 && index_ <= span_->size());
--index_; --index_;
return *this; return *this;
} }
constexpr span_iterator operator--(int) constexpr span_iterator operator--(int) noexcept
{ {
auto ret = *this; auto ret = *this;
--(*this); --(*this);
return ret; return ret;
} }
constexpr span_iterator operator+(difference_type n) const constexpr span_iterator operator+(difference_type n) const noexcept
{ {
auto ret = *this; auto ret = *this;
return ret += n; return ret += n;
} }
friend constexpr span_iterator operator+(difference_type n, span_iterator const& rhs) friend constexpr span_iterator operator+(difference_type n, span_iterator const& rhs) noexcept
{ {
return rhs + n; return rhs + n;
} }
constexpr span_iterator& operator+=(difference_type n) constexpr span_iterator& operator+=(difference_type n) noexcept
{ {
Expects((index_ + n) >= 0 && (index_ + n) <= span_->size()); Expects((index_ + n) >= 0 && (index_ + n) <= span_->size());
index_ += n; index_ += n;
return *this; return *this;
} }
constexpr span_iterator operator-(difference_type n) const constexpr span_iterator operator-(difference_type n) const noexcept
{ {
auto ret = *this; auto ret = *this;
return ret -= n; return ret -= n;
} }
constexpr span_iterator& operator-=(difference_type n) { return *this += -n; } constexpr span_iterator& operator-=(difference_type n) noexcept { return *this += -n; }
constexpr difference_type operator-(span_iterator rhs) const constexpr difference_type operator-(span_iterator rhs) const noexcept
{ {
Expects(span_ == rhs.span_); Expects(span_ == rhs.span_);
return index_ - rhs.index_; return index_ - rhs.index_;
} }
constexpr reference operator[](difference_type n) const { return *(*this + n); } constexpr reference operator[](difference_type n) const noexcept { return *(*this + n); }
constexpr friend bool operator==(span_iterator lhs, span_iterator rhs) noexcept constexpr friend bool operator==(span_iterator lhs, span_iterator rhs) noexcept
{ {
@ -383,9 +383,9 @@ public:
constexpr span() noexcept : storage_(nullptr, details::extent_type<0>()) constexpr span() noexcept : storage_(nullptr, details::extent_type<0>())
{} {}
constexpr span(pointer ptr, index_type count) : storage_(ptr, count) {} constexpr span(pointer ptr, index_type count) noexcept: storage_(ptr, count) {}
constexpr span(pointer firstElem, pointer lastElem) constexpr span(pointer firstElem, pointer lastElem) noexcept
: storage_(firstElem, std::distance(firstElem, lastElem)) : storage_(firstElem, std::distance(firstElem, lastElem))
{} {}
@ -424,7 +424,7 @@ public:
std::is_convertible<typename Container::pointer, pointer>::value && std::is_convertible<typename Container::pointer, pointer>::value &&
std::is_convertible<typename Container::pointer, std::is_convertible<typename Container::pointer,
decltype(std::declval<Container>().data())>::value>> decltype(std::declval<Container>().data())>::value>>
constexpr span(Container& cont) : span(cont.data(), narrow<index_type>(cont.size())) constexpr span(Container& cont) noexcept : span(cont.data(), narrow<index_type>(cont.size()))
{} {}
template <class Container, template <class Container,
@ -433,7 +433,7 @@ public:
std::is_convertible<typename Container::pointer, pointer>::value && std::is_convertible<typename Container::pointer, pointer>::value &&
std::is_convertible<typename Container::pointer, std::is_convertible<typename Container::pointer,
decltype(std::declval<Container>().data())>::value>> decltype(std::declval<Container>().data())>::value>>
constexpr span(const Container& cont) : span(cont.data(), narrow<index_type>(cont.size())) constexpr span(const Container& cont) noexcept : span(cont.data(), narrow<index_type>(cont.size()))
{} {}
constexpr span(const span& other) noexcept = default; constexpr span(const span& other) noexcept = default;
@ -443,7 +443,7 @@ public:
class = std::enable_if_t< class = std::enable_if_t<
details::is_allowed_extent_conversion<OtherExtent, Extent>::value && details::is_allowed_extent_conversion<OtherExtent, Extent>::value &&
details::is_allowed_element_type_conversion<OtherElementType, element_type>::value>> details::is_allowed_element_type_conversion<OtherElementType, element_type>::value>>
constexpr span(const span<OtherElementType, OtherExtent>& other) constexpr span(const span<OtherElementType, OtherExtent>& other) noexcept
: storage_(other.data(), details::extent_type<OtherExtent>(other.size())) : storage_(other.data(), details::extent_type<OtherExtent>(other.size()))
{} {}
@ -452,7 +452,7 @@ public:
// [span.sub], span subviews // [span.sub], span subviews
template <std::ptrdiff_t Count> template <std::ptrdiff_t Count>
constexpr span<element_type, Count> first() const constexpr span<element_type, Count> first() const noexcept
{ {
Expects(Count >= 0 && Count <= size()); Expects(Count >= 0 && Count <= size());
return {data(), Count}; return {data(), Count};
@ -460,7 +460,7 @@ public:
template <std::ptrdiff_t Count> template <std::ptrdiff_t Count>
GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
constexpr span<element_type, Count> last() const constexpr span<element_type, Count> last() const noexcept
{ {
Expects(Count >= 0 && size() - Count >= 0); Expects(Count >= 0 && size() - Count >= 0);
return {data() + (size() - Count), Count}; return {data() + (size() - Count), Count};
@ -468,7 +468,7 @@ public:
template <std::ptrdiff_t Offset, std::ptrdiff_t Count = dynamic_extent> template <std::ptrdiff_t Offset, std::ptrdiff_t Count = dynamic_extent>
GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
constexpr auto subspan() const -> constexpr auto subspan() const noexcept ->
typename details::calculate_subspan_type<ElementType, Extent, Offset, Count>::type typename details::calculate_subspan_type<ElementType, Extent, Offset, Count>::type
{ {
Expects((Offset >= 0 && size() - Offset >= 0) && Expects((Offset >= 0 && size() - Offset >= 0) &&
@ -477,19 +477,19 @@ public:
return {data() + Offset, Count == dynamic_extent ? size() - Offset : Count}; return {data() + Offset, Count == dynamic_extent ? size() - Offset : Count};
} }
constexpr span<element_type, dynamic_extent> first(index_type count) const constexpr span<element_type, dynamic_extent> first(index_type count) const noexcept
{ {
Expects(count >= 0 && count <= size()); Expects(count >= 0 && count <= size());
return {data(), count}; return {data(), count};
} }
constexpr span<element_type, dynamic_extent> last(index_type count) const constexpr span<element_type, dynamic_extent> last(index_type count) const noexcept
{ {
return make_subspan(size() - count, dynamic_extent, subspan_selector<Extent>{}); return make_subspan(size() - count, dynamic_extent, subspan_selector<Extent>{});
} }
constexpr span<element_type, dynamic_extent> subspan(index_type offset, constexpr span<element_type, dynamic_extent> subspan(index_type offset,
index_type count = dynamic_extent) const index_type count = dynamic_extent) const noexcept
{ {
return make_subspan(offset, count, subspan_selector<Extent>{}); return make_subspan(offset, count, subspan_selector<Extent>{});
} }
@ -504,14 +504,14 @@ public:
// [span.elem], span element access // [span.elem], span element access
GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
constexpr reference operator[](index_type idx) const constexpr reference operator[](index_type idx) const noexcept
{ {
Expects(CheckRange(idx, storage_.size())); Expects(CheckRange(idx, storage_.size()));
return data()[idx]; return data()[idx];
} }
constexpr reference at(index_type idx) const { return this->operator[](idx); } constexpr reference at(index_type idx) const noexcept{ return this->operator[](idx); }
constexpr reference operator()(index_type idx) const { return this->operator[](idx); } constexpr reference operator()(index_type idx) const noexcept{ return this->operator[](idx); }
constexpr pointer data() const noexcept { return storage_.data(); } constexpr pointer data() const noexcept { return storage_.data(); }
// [span.iter], span iterator support // [span.iter], span iterator support