mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-02-11 10:03:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix copy_backward implementation

Browse source
This commit is contained in:
bolero-MURAKAMI 2016-03-21 15:32:43 +09:00
parent c9cce4582e
commit 8a4fca3aec
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sprout/algorithm/cxx14/copy_backward.hpp
View file

@ -23,7 +23,7 @@ namespace sprout {
inline SPROUT_CXX14_CONSTEXPR BidirectionalIterator2 inline SPROUT_CXX14_CONSTEXPR BidirectionalIterator2
copy_backward(BidirectionalIterator1 first, BidirectionalIterator1 last, BidirectionalIterator2 result) { copy_backward(BidirectionalIterator1 first, BidirectionalIterator1 last, BidirectionalIterator2 result) {
while (first != last) { while (first != last) {
*--result = *--first; *--result = *--last;
} }
return result; return result;
} }

4
sprout/string/char_traits.hpp
View file

@ -113,7 +113,7 @@ namespace sprout {
); );
} }
static SPROUT_CXX14_CONSTEXPR char_type* move(char_type* s1, char_type const* s2, std::size_t n) { static SPROUT_CXX14_CONSTEXPR char_type* move(char_type* s1, char_type const* s2, std::size_t n) {
sprout::copy_backward(s2, s2 + n, s1); sprout::copy_backward(s2, s2 + n, s1 + n);
return s1; return s1;
} }
static SPROUT_CXX14_CONSTEXPR char_type* copy(char_type* s1, char_type const* s2, std::size_t n) { static SPROUT_CXX14_CONSTEXPR char_type* copy(char_type* s1, char_type const* s2, std::size_t n) {
@ -199,7 +199,7 @@ namespace sprout {
} }
template<typename OutputIterator, typename ConstInputIterator> template<typename OutputIterator, typename ConstInputIterator>
static SPROUT_CXX14_CONSTEXPR OutputIterator move(OutputIterator s1, ConstInputIterator s2, std::size_t n) { static SPROUT_CXX14_CONSTEXPR OutputIterator move(OutputIterator s1, ConstInputIterator s2, std::size_t n) {
sprout::copy_backward(s2, s2 + n, s1); sprout::copy_backward(s2, s2 + n, s1 + n);
return s1; return s1;
} }
template<typename OutputIterator, typename ConstInputIterator> template<typename OutputIterator, typename ConstInputIterator>

8
sprout/string/shift_concat.hpp
View file

@ -162,13 +162,14 @@ namespace sprout {
)... )...
); );
} }
} // namespace detail
// //
// operator>> // operator>>
// //
template<typename T, std::size_t N, typename Traits> template<typename T, std::size_t N, typename Traits>
inline SPROUT_CONSTEXPR sprout::basic_string<T, N, Traits> inline SPROUT_CONSTEXPR sprout::basic_string<T, N, Traits>
operator>>(sprout::basic_string<T, N, Traits> const& lhs, T const& rhs) { operator>>(sprout::basic_string<T, N, Traits> const& lhs, T const& rhs) {
return sprout::detail::string_rshift( return sprout::detail::string_lshift(
lhs, lhs.size(), lhs, lhs.size(),
rhs, rhs,
sprout::make_index_tuple<N>::make() sprout::make_index_tuple<N>::make()
@ -178,7 +179,7 @@ namespace sprout {
inline SPROUT_CONSTEXPR sprout::basic_string<T, N, Traits> inline SPROUT_CONSTEXPR sprout::basic_string<T, N, Traits>
operator>>(sprout::basic_string<T, N, Traits> const& lhs, T const (& rhs)[M]) { operator>>(sprout::basic_string<T, N, Traits> const& lhs, T const (& rhs)[M]) {
typedef sprout::char_traits_helper<Traits> traits_type; typedef sprout::char_traits_helper<Traits> traits_type;
return sprout::detail::string_rshift( return sprout::detail::string_lshift(
lhs, lhs.size(), lhs, lhs.size(),
rhs, traits_type::length(rhs, M - 1), rhs, traits_type::length(rhs, M - 1),
sprout::make_index_tuple<N>::make() sprout::make_index_tuple<N>::make()
@ -187,13 +188,12 @@ namespace sprout {
template<typename T, std::size_t N1, std::size_t N2, typename Traits> template<typename T, std::size_t N1, std::size_t N2, typename Traits>
inline SPROUT_CONSTEXPR sprout::basic_string<T, N1, Traits> inline SPROUT_CONSTEXPR sprout::basic_string<T, N1, Traits>
operator>>(sprout::basic_string<T, N1, Traits> const& lhs, sprout::basic_string<T, N2, Traits> const& rhs) { operator>>(sprout::basic_string<T, N1, Traits> const& lhs, sprout::basic_string<T, N2, Traits> const& rhs) {
return sprout::detail::string_rshift( return sprout::detail::string_lshift(
lhs, lhs.size(), lhs, lhs.size(),
rhs, rhs.size(), rhs, rhs.size(),
sprout::make_index_tuple<N1>::make() sprout::make_index_tuple<N1>::make()
); );
} }
} // namespace detail
} // namespace sprout } // namespace sprout
#endif // #ifndef SPROUT_STRING_SHIFT_CONCAT_HPP #endif // #ifndef SPROUT_STRING_SHIFT_CONCAT_HPP

6
sprout/string/string.hpp
View file

@ -982,7 +982,8 @@ namespace sprout {
} }
template<std::size_t M> template<std::size_t M>
SPROUT_CXX14_CONSTEXPR basic_string& operator<<=(T const (& rhs)[M]) { SPROUT_CXX14_CONSTEXPR basic_string& operator<<=(T const (& rhs)[M]) {
std::size_t rsize = traits_type::length(rhs, M - 1); typedef sprout::char_traits_helper<traits_type> helper_type;
std::size_t rsize = helper_type::length(rhs, M - 1);
lengthcheck(size() + rsize); lengthcheck(size() + rsize);
traits_type::copy(end(), rhs, rsize); traits_type::copy(end(), rhs, rsize);
put_terminator(impl_.len + rsize); put_terminator(impl_.len + rsize);
@ -1004,7 +1005,8 @@ namespace sprout {
} }
template<std::size_t M> template<std::size_t M>
SPROUT_CXX14_CONSTEXPR basic_string& operator>>=(T const (& rhs)[M]) { SPROUT_CXX14_CONSTEXPR basic_string& operator>>=(T const (& rhs)[M]) {
std::size_t rsize = traits_type::length(rhs, M - 1); typedef sprout::char_traits_helper<traits_type> helper_type;
std::size_t rsize = helper_type::length(rhs, M - 1);
lengthcheck(size() + rsize); lengthcheck(size() + rsize);
traits_type::move(begin() + rsize, begin(), size()); traits_type::move(begin() + rsize, begin(), size());
traits_type::copy(begin(), rhs, rsize); traits_type::copy(begin(), rhs, rsize);