mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-05-10 09:23:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix string::assign

Browse source
This commit is contained in:
bolero-MURAKAMI 2013-09-08 19:07:01 +09:00
parent 7fae5004a7
commit 3cba63db54
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sprout/string/string.hpp
View file

@ -26,6 +26,7 @@
#include <sprout/algorithm/find.hpp> #include <sprout/algorithm/find.hpp>
#include <sprout/utility/forward.hpp> #include <sprout/utility/forward.hpp>
#include <sprout/utility/swap.hpp> #include <sprout/utility/swap.hpp>
#include <sprout/type_traits/identity.hpp>
#include <sprout/math/comparison.hpp> #include <sprout/math/comparison.hpp>
#include <sprout/string/char_traits.hpp> #include <sprout/string/char_traits.hpp>
#include <sprout/string/npos.hpp> #include <sprout/string/npos.hpp>
@ -285,6 +286,12 @@ namespace sprout {
throw std::out_of_range("basic_string<>: index out of range"); throw std::out_of_range("basic_string<>: index out of range");
} }
} }
void
lengthcheck(size_type n) const {
if (n > static_size) {
throw std::length_error("basic_string<>: length error");
}
}
public: public:
// construct/copy/destroy: // construct/copy/destroy:
SPROUT_CONSTEXPR basic_string() = default; SPROUT_CONSTEXPR basic_string() = default;
@ -461,7 +468,7 @@ namespace sprout {
} }
void void
resize(size_type n, value_type c) { resize(size_type n, value_type c) {
maxcheck(n); lengthcheck(n);
if (n > size()) { if (n > size()) {
traits_type::assign(end(), n - size(), c); traits_type::assign(end(), n - size(), c);
} }
@ -473,7 +480,7 @@ namespace sprout {
resize(n, value_type()); resize(n, value_type());
} }
void void
clear() { clear() SPROUT_NOEXCEPT {
traits_type::assign(begin(), static_size, value_type()); traits_type::assign(begin(), static_size, value_type());
len = 0; len = 0;
} }
@ -522,19 +529,19 @@ namespace sprout {
template<std::size_t N2> template<std::size_t N2>
basic_string& basic_string&
assign(basic_string<T, N2, Traits> const& str) { assign(basic_string<T, N2, Traits> const& str) {
return assign(str.begin(), str.size()); return assign(str, 0, npos);
} }
template<std::size_t N2> template<std::size_t N2>
basic_string& basic_string&
assign(basic_string<T, N2, Traits> const& str, size_type pos, size_type n) { assign(basic_string<T, N2, Traits> const& str, size_type pos, size_type n) {
if (str.size() < pos + n) { if (str.size() < pos) {
throw std::out_of_range("basic_string<>: index out of range"); throw std::out_of_range("basic_string<>: index out of range");
} }
return assign(str.begin() + pos, n); return assign(str.begin() + pos, NS_SSCRISK_CEL_OR_SPROUT::min(n, str.size() - pos));
} }
basic_string& basic_string&
assign(value_type const* s, size_type n) { assign(value_type const* s, size_type n) {
maxcheck(n); lengthcheck(n);
for (size_type i = 0; i < n; ++i) { for (size_type i = 0; i < n; ++i) {
traits_type::assign(elems[i], s[i]); traits_type::assign(elems[i], s[i]);
} }
@ -556,9 +563,9 @@ namespace sprout {
len = n; len = n;
return *this; return *this;
} }
template<typename Iterator> template<typename InputIterator>
basic_string& basic_string&
assign(Iterator first, Iterator last) { assign(InputIterator first, InputIterator last) {
size_type n = 0; size_type n = 0;
for (; n < static_size || first != last; ++n, ++first) { for (; n < static_size || first != last; ++n, ++first) {
traits_type::assign(elems[n], *first); traits_type::assign(elems[n], *first);
@ -771,7 +778,7 @@ namespace sprout {
basic_string& basic_string&
>::type >::type
assign(StringConstIterator s, size_type n) { assign(StringConstIterator s, size_type n) {
maxcheck(n); lengthcheck(n);
for (size_type i = 0; i < n; ++i) { for (size_type i = 0; i < n; ++i) {
traits_type::assign(elems[i], s[i]); traits_type::assign(elems[i], s[i]);
} }