mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-07-02 14:04:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[sprout.array] support for C++14 constexpr

Browse source
This commit is contained in:
bolero-MURAKAMI 2013-10-26 00:32:36 +09:00
parent 227e7789ec
commit c40b33067e
34 changed files with 87 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

53
sprout/array/array.hpp
View file

@ -18,6 +18,11 @@
#include <sprout/container/functions.hpp>
#include <sprout/iterator/operation.hpp>
#include <sprout/iterator/reverse_iterator.hpp>
#include <sprout/algorithm/copy.hpp>
#include <sprout/algorithm/move.hpp>
#include <sprout/algorithm/fill_n.hpp>
#include <sprout/algorithm/swap_ranges.hpp>
#include <sprout/utility/swap.hpp>
#if SPROUT_USE_INDEX_ITERATOR_IMPLEMENTATION
# include <sprout/iterator/index_iterator.hpp>
#endif
@ -63,68 +68,68 @@ namespace sprout {
public:
// construct/copy/destroy:
template<typename T2>
array& operator=(array<T2, N> const& rhs) {
std::copy(rhs.begin(), rhs.end(), begin());
SPROUT_CXX14_CONSTEXPR array& operator=(array<T2, N> const& rhs) {
sprout::copy(rhs.begin(), rhs.end(), begin());
return *this;
}
template<typename T2>
array& operator=(array<T2, N>&& rhs) {
std::move(rhs.begin(), rhs.end(), begin());
SPROUT_CXX14_CONSTEXPR array& operator=(array<T2, N>&& rhs) {
sprout::move(rhs.begin(), rhs.end(), begin());
return *this;
}
// modifiers:
void fill(const_reference value) {
std::fill_n(begin(), size(), value);
SPROUT_CXX14_CONSTEXPR void fill(const_reference value) {
sprout::fill_n(begin(), size(), value);
}
SPROUT_CONSTEXPR array fill(const_reference value) const {
return fill_impl(value, sprout::index_n<0, N>::make());
}
void assign(const_reference value) {
SPROUT_CXX14_CONSTEXPR void assign(const_reference value) {
fill(value);
}
SPROUT_CONSTEXPR array assign(const_reference value) const {
return fill(value);
}
void swap(array& other)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::swap(std::declval<T&>(), std::declval<T&>())))
SPROUT_CXX14_CONSTEXPR void swap(array& other)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::swap(std::declval<T&>(), std::declval<T&>())))
{
std::swap_ranges(other.begin(), other.end(), begin());
sprout::swap_ranges(other.begin(), other.end(), begin());
}
// iterators:
#if SPROUT_USE_INDEX_ITERATOR_IMPLEMENTATION
iterator begin() SPROUT_NOEXCEPT {
SPROUT_CXX14_CONSTEXPR iterator begin() SPROUT_NOEXCEPT {
return iterator(*this, 0);
}
SPROUT_CONSTEXPR const_iterator begin() const SPROUT_NOEXCEPT {
return const_iterator(*this, 0);
}
iterator end() SPROUT_NOEXCEPT {
SPROUT_CXX14_CONSTEXPR iterator end() SPROUT_NOEXCEPT {
return iterator(*this, size());
}
SPROUT_CONSTEXPR const_iterator end() const SPROUT_NOEXCEPT {
return const_iterator(*this, size());
}
#else
iterator begin() SPROUT_NOEXCEPT {
SPROUT_CXX14_CONSTEXPR iterator begin() SPROUT_NOEXCEPT {
return &elems[0];
}
SPROUT_CONSTEXPR const_iterator begin() const SPROUT_NOEXCEPT {
return &elems[0];
}
iterator end() SPROUT_NOEXCEPT {
SPROUT_CXX14_CONSTEXPR iterator end() SPROUT_NOEXCEPT {
return &elems[0] + size();
}
SPROUT_CONSTEXPR const_iterator end() const SPROUT_NOEXCEPT {
return &elems[0] + size();
}
#endif
reverse_iterator rbegin() SPROUT_NOEXCEPT {
SPROUT_CXX14_CONSTEXPR reverse_iterator rbegin() SPROUT_NOEXCEPT {
return reverse_iterator(end());
}
SPROUT_CONSTEXPR const_reverse_iterator rbegin() const SPROUT_NOEXCEPT {
return const_reverse_iterator(end());
}
reverse_iterator rend() SPROUT_NOEXCEPT {
SPROUT_CXX14_CONSTEXPR reverse_iterator rend() SPROUT_NOEXCEPT {
return reverse_iterator(begin());
}
SPROUT_CONSTEXPR const_reverse_iterator rend() const SPROUT_NOEXCEPT {
@ -162,13 +167,13 @@ namespace sprout {
return size() == 0;
}
// element access:
reference operator[](size_type i) {
SPROUT_CXX14_CONSTEXPR reference operator[](size_type i) {
return elems[i];
}
SPROUT_CONSTEXPR const_reference operator[](size_type i) const {
return elems[i];
}
reference at(size_type i) {
SPROUT_CXX14_CONSTEXPR reference at(size_type i) {
return i < size()
? elems[i]
: (throw std::out_of_range("array<>: index out of range"), elems[i])
@ -180,33 +185,33 @@ namespace sprout {
: (throw std::out_of_range("array<>: index out of range"), elems[i])
;
}
reference front() {
SPROUT_CXX14_CONSTEXPR reference front() {
return elems[0];
}
SPROUT_CONSTEXPR const_reference front() const {
return elems[0];
}
reference back() {
SPROUT_CXX14_CONSTEXPR reference back() {
return elems[size() - 1];
}
SPROUT_CONSTEXPR const_reference back() const {
return elems[size() - 1];
}
pointer data() SPROUT_NOEXCEPT {
SPROUT_CXX14_CONSTEXPR pointer data() SPROUT_NOEXCEPT {
return &elems[0];
}
SPROUT_CONSTEXPR const_pointer data() const SPROUT_NOEXCEPT {
return &elems[0];
}
pointer c_array() SPROUT_NOEXCEPT {
SPROUT_CXX14_CONSTEXPR pointer c_array() SPROUT_NOEXCEPT {
return data();
}
SPROUT_CONSTEXPR const_pointer c_array() const SPROUT_NOEXCEPT {
return data();
}
// others:
void rangecheck(size_type i) const {
SPROUT_CXX14_CONSTEXPR void rangecheck(size_type i) const {
if (i >= size()) {
throw std::out_of_range("array<>: index out of range");
}
@ -219,7 +224,7 @@ namespace sprout {
// swap
//
template<typename T, std::size_t N>
inline void
inline SPROUT_CXX14_CONSTEXPR void
swap(sprout::array<T, N>& lhs, sprout::array<T, N>& rhs)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(lhs.swap(rhs)))
{

17
sprout/array/make_array.hpp
View file

@ -21,31 +21,32 @@ namespace sprout {
// make_array
//
template<typename T, typename... Types>
inline SPROUT_CONSTEXPR sprout::array<T, sizeof...(Types)>
inline SPROUT_CONSTEXPR sprout::array<typename std::remove_cv<T>::type, sizeof...(Types)>
make_array(Types&&... args) {
return sprout::array<T, sizeof...(Types)>{{T(sprout::forward<Types>(args))...}};
return sprout::array<typename std::remove_cv<T>::type, sizeof...(Types)>{{T(sprout::forward<Types>(args))...}};
}
// !!!
// template<typename... Types>
// inline SPROUT_CONSTEXPR sprout::array<typename sprout::common_decay<Types&&...>::type, sizeof...(Types)>
// inline SPROUT_CONSTEXPR sprout::array<typename sprout::common_decay<Types...>::type, sizeof...(Types)>
// make_array(Types&&... args) {
// typedef sprout::array<
// typename sprout::common_decay<Types&&...>::type,
// typename sprout::common_decay<Types...>::type,
// sizeof...(Types)
// > type;
// return type{{typename sprout::common_decay<Types&&...>::type(sprout::forward<Types>(args))...}};
// return type{{typename sprout::common_decay<Types...>::type(sprout::forward<Types>(args))...}};
// }
//
// make_common_array
//
template<typename... Types>
inline SPROUT_CONSTEXPR sprout::array<typename sprout::common_decay<Types&&...>::type, sizeof...(Types)>
inline SPROUT_CONSTEXPR sprout::array<typename sprout::common_decay<Types...>::type, sizeof...(Types)>
make_common_array(Types&&... args) {
typedef sprout::array<
typename sprout::common_decay<Types&&...>::type,
typename sprout::common_decay<Types...>::type,
sizeof...(Types)
> type;
return type{{typename sprout::common_decay<Types&&...>::type(sprout::forward<Types>(args))...}};
return type{{typename sprout::common_decay<Types...>::type(sprout::forward<Types>(args))...}};
}
//