mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2024-12-23 21:25:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix nth(), index_of()

Browse source
This commit is contained in:
bolero-MURAKAMI 2015-03-23 12:04:57 +09:00
parent 251c1d174e
commit a5e7d61ad3
3 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sprout/array/array.hpp
View file

@ -230,7 +230,7 @@ namespace sprout {
: (throw std::out_of_range("array<>: index out of range"), const_iterator()) : (throw std::out_of_range("array<>: index out of range"), const_iterator())
; ;
} }
SPROUT_CONSTEXPR size_type index_of(iterator p) const SPROUT_NOEXCEPT { SPROUT_CXX14_CONSTEXPR size_type index_of(iterator p) SPROUT_NOEXCEPT {
return p.index(); return p.index();
} }
SPROUT_CONSTEXPR size_type index_of(const_iterator p) const SPROUT_NOEXCEPT { SPROUT_CONSTEXPR size_type index_of(const_iterator p) const SPROUT_NOEXCEPT {
@ -249,7 +249,7 @@ namespace sprout {
: (throw std::out_of_range("array<>: index out of range"), const_iterator()) : (throw std::out_of_range("array<>: index out of range"), const_iterator())
; ;
} }
SPROUT_CONSTEXPR size_type index_of(iterator p) const SPROUT_NOEXCEPT { SPROUT_CXX14_CONSTEXPR size_type index_of(iterator p) SPROUT_NOEXCEPT {
return sprout::distance(begin(), p); return sprout::distance(begin(), p);
} }
SPROUT_CONSTEXPR size_type index_of(const_iterator p) const SPROUT_NOEXCEPT { SPROUT_CONSTEXPR size_type index_of(const_iterator p) const SPROUT_NOEXCEPT {

6
sprout/string/string.hpp
View file

@ -947,7 +947,7 @@ namespace sprout {
: (throw std::out_of_range("basic_string<>: index out of range"), const_iterator()) : (throw std::out_of_range("basic_string<>: index out of range"), const_iterator())
; ;
} }
SPROUT_CONSTEXPR size_type index_of(iterator p) const SPROUT_NOEXCEPT { SPROUT_CXX14_CONSTEXPR size_type index_of(iterator p) SPROUT_NOEXCEPT {
return p.index(); return p.index();
} }
SPROUT_CONSTEXPR size_type index_of(const_iterator p) const SPROUT_NOEXCEPT { SPROUT_CONSTEXPR size_type index_of(const_iterator p) const SPROUT_NOEXCEPT {
@ -965,8 +965,8 @@ namespace sprout {
? data() + i ? data() + i
: (throw std::out_of_range("basic_string<>: index out of range"), const_iterator()) : (throw std::out_of_range("basic_string<>: index out of range"), const_iterator())
; ;
} }SPROUT_CXX14_CONSTEXPR
SPROUT_CONSTEXPR size_type index_of(iterator p) const SPROUT_NOEXCEPT { SPROUT_CONSTEXPR size_type index_of(iterator p) SPROUT_NOEXCEPT {
return sprout::distance(begin(), p); return sprout::distance(begin(), p);
} }
SPROUT_CONSTEXPR size_type index_of(const_iterator p) const SPROUT_NOEXCEPT { SPROUT_CONSTEXPR size_type index_of(const_iterator p) const SPROUT_NOEXCEPT {

42
sprout/sub_array/sub_array.hpp
View file

@ -271,8 +271,8 @@ namespace sprout {
array_tag(), array_tag(),
impl_type::template to_param<Container>(other.array_), impl_type::template to_param<Container>(other.array_),
sprout::make_index_tuple<enumerable_size>::make(), sprout::make_index_tuple<enumerable_size>::make(),
sprout::distance(sprout::begin(other.get_array()), first), sprout::distance(sprout::begin(other.get_internal()), first),
sprout::distance(sprout::begin(other.get_array()), last) sprout::distance(sprout::begin(other.get_internal()), last)
) )
{} {}
SPROUT_CONSTEXPR sub_array(sub_array const& other, difference_type to_first, difference_type to_last) SPROUT_CONSTEXPR sub_array(sub_array const& other, difference_type to_first, difference_type to_last)
@ -312,22 +312,22 @@ namespace sprout {
} }
// iterators: // iterators:
SPROUT_CXX14_CONSTEXPR iterator begin() { SPROUT_CXX14_CONSTEXPR iterator begin() {
return sprout::next(sprout::begin(get_array()), to_first_); return sprout::next(sprout::begin(get_internal()), to_first_);
} }
SPROUT_CONSTEXPR const_iterator begin() const { SPROUT_CONSTEXPR const_iterator begin() const {
return sprout::next(sprout::begin(get_array()), to_first_); return sprout::next(sprout::begin(get_internal()), to_first_);
} }
SPROUT_CXX14_CONSTEXPR iterator end() { SPROUT_CXX14_CONSTEXPR iterator end() {
return sprout::next(sprout::begin(get_array()), to_last_); return sprout::next(sprout::begin(get_internal()), to_last_);
} }
SPROUT_CONSTEXPR const_iterator end() const { SPROUT_CONSTEXPR const_iterator end() const {
return sprout::next(sprout::begin(get_array()), to_last_); return sprout::next(sprout::begin(get_internal()), to_last_);
} }
SPROUT_CONSTEXPR const_iterator cbegin() const { SPROUT_CONSTEXPR const_iterator cbegin() const {
return sprout::next(sprout::begin(get_array()), to_first_); return sprout::next(sprout::begin(get_internal()), to_first_);
} }
SPROUT_CONSTEXPR const_iterator cend() const { SPROUT_CONSTEXPR const_iterator cend() const {
return sprout::next(sprout::begin(get_array()), to_last_); return sprout::next(sprout::begin(get_internal()), to_last_);
} }
// capacity: // capacity:
SPROUT_CONSTEXPR size_type size() const { SPROUT_CONSTEXPR size_type size() const {
@ -341,39 +341,39 @@ namespace sprout {
} }
// element access: // element access:
SPROUT_CXX14_CONSTEXPR reference operator[](size_type i) { SPROUT_CXX14_CONSTEXPR reference operator[](size_type i) {
return *sprout::next(sprout::begin(get_array()), to_first_ + i); return *sprout::next(sprout::begin(get_internal()), to_first_ + i);
} }
SPROUT_CONSTEXPR const_reference operator[](size_type i) const { SPROUT_CONSTEXPR const_reference operator[](size_type i) const {
return *sprout::next(sprout::begin(get_array()), to_first_ + i); return *sprout::next(sprout::begin(get_internal()), to_first_ + i);
} }
SPROUT_CXX14_CONSTEXPR reference at(size_type i) { SPROUT_CXX14_CONSTEXPR reference at(size_type i) {
return i < size() ? *sprout::next(sprout::begin(get_array()), to_first_ + i) return i < size() ? *sprout::next(sprout::begin(get_internal()), to_first_ + i)
: (throw std::out_of_range("sub_array<>: index out of range"), *sprout::next(sprout::begin(get_array()), to_first_ + i)) : (throw std::out_of_range("sub_array<>: index out of range"), *sprout::next(sprout::begin(get_internal()), to_first_ + i))
; ;
} }
SPROUT_CONSTEXPR const_reference at(size_type i) const { SPROUT_CONSTEXPR const_reference at(size_type i) const {
return i < size() ? *sprout::next(sprout::begin(get_array()), to_first_ + i) return i < size() ? *sprout::next(sprout::begin(get_internal()), to_first_ + i)
: (throw std::out_of_range("sub_array<>: index out of range"), *sprout::next(sprout::begin(get_array()), to_first_ + i)) : (throw std::out_of_range("sub_array<>: index out of range"), *sprout::next(sprout::begin(get_internal()), to_first_ + i))
; ;
} }
SPROUT_CXX14_CONSTEXPR reference front() { SPROUT_CXX14_CONSTEXPR reference front() {
return *sprout::next(sprout::begin(get_array()), to_first_); return *sprout::next(sprout::begin(get_internal()), to_first_);
} }
SPROUT_CONSTEXPR const_reference front() const { SPROUT_CONSTEXPR const_reference front() const {
return *sprout::next(sprout::begin(get_array()), to_first_); return *sprout::next(sprout::begin(get_internal()), to_first_);
} }
SPROUT_CXX14_CONSTEXPR reference back() { SPROUT_CXX14_CONSTEXPR reference back() {
return *sprout::next(sprout::begin(get_array()), to_last_ - 1); return *sprout::next(sprout::begin(get_internal()), to_last_ - 1);
} }
SPROUT_CONSTEXPR const_reference back() const { SPROUT_CONSTEXPR const_reference back() const {
return *sprout::next(sprout::begin(get_array()), to_last_ - 1); return *sprout::next(sprout::begin(get_internal()), to_last_ - 1);
} }
SPROUT_CXX14_CONSTEXPR pointer data() { SPROUT_CXX14_CONSTEXPR pointer data() {
return get_array().data() + to_first_; return get_internal().data() + to_first_;
} }
SPROUT_CONSTEXPR const_pointer data() const { SPROUT_CONSTEXPR const_pointer data() const {
return get_array().data() + to_first_; return get_internal().data() + to_first_;
} }
// others: // others:
SPROUT_CXX14_CONSTEXPR pointer c_array() { SPROUT_CXX14_CONSTEXPR pointer c_array() {
@ -413,7 +413,7 @@ namespace sprout {
return to_first_; return to_first_;
} }
SPROUT_CONSTEXPR difference_type from_end() const { SPROUT_CONSTEXPR difference_type from_end() const {
return to_last_ - sprout::size(get_array()); return to_last_ - sprout::size(get_internal());
} }
SPROUT_CXX14_CONSTEXPR iterator nth(size_type i) { SPROUT_CXX14_CONSTEXPR iterator nth(size_type i) {