mirror of
https://github.com/bolero-MURAKAMI/Sprout.git
synced 2025-07-04 14:14:09 +00:00
fix to_string
fix from_string fix filename typo
This commit is contained in:
bolero-MURAKAMI
parent
c901c3058a
commit
09b4b56fad
6 changed files with 75 additions and 67 deletions
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef SPROUT_STRING_INT_TO_STRING_HPP
|
||||
#define SPROUT_STRING_INT_TO_STRING_HPP
|
||||
|
||||
#include <cstddef>
|
||||
#include <type_traits>
|
||||
#include <sprout/config.hpp>
|
||||
#include <sprout/string/string.hpp>
|
||||
|
|
@ -11,16 +10,26 @@
|
|||
#include <sprout/detail/char_conversion.hpp>
|
||||
|
||||
namespace sprout {
|
||||
//
|
||||
// printed_integer_digits
|
||||
//
|
||||
template<typename IntType, std::size_t Base = 10>
|
||||
struct printed_integer_digits
|
||||
: public std::integral_constant<
|
||||
std::size_t,
|
||||
sprout::integer_digits<IntType, Base>::value + (std::is_signed<IntType>::value ? 1 : 0)
|
||||
>
|
||||
{};
|
||||
|
||||
namespace detail {
|
||||
template<
|
||||
typename Elem,
|
||||
std::size_t Base,
|
||||
int Base,
|
||||
typename IntType,
|
||||
typename... Args,
|
||||
typename sprout::enabler_if<(sizeof...(Args) == sprout::integer_digits<IntType, Base>::value - 1)>::type = sprout::enabler
|
||||
typename sprout::enabler_if<(sizeof...(Args) == sprout::printed_integer_digits<IntType, Base>::value - 1)>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::integer_digits<IntType, Base>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::printed_integer_digits<IntType, Base>::value>
|
||||
int_to_string_impl_1(IntType val, bool negative, Args... args) {
|
||||
return negative ? sprout::make_string_as<Elem>(static_cast<Elem>('-'), args...)
|
||||
: sprout::make_string_as<Elem>(args...)
|
||||
|
|
@ -28,12 +37,12 @@ namespace sprout {
|
|||
}
|
||||
template<
|
||||
typename Elem,
|
||||
std::size_t Base,
|
||||
int Base,
|
||||
typename IntType,
|
||||
typename... Args,
|
||||
typename sprout::enabler_if<(sizeof...(Args) < sprout::integer_digits<IntType, Base>::value - 1)>::type = sprout::enabler
|
||||
typename sprout::enabler_if<(sizeof...(Args) < sprout::printed_integer_digits<IntType, Base>::value - 1)>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::integer_digits<IntType, Base>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::printed_integer_digits<IntType, Base>::value>
|
||||
int_to_string_impl_1(IntType val, bool negative, Args... args) {
|
||||
return val == 0
|
||||
? (negative ? sprout::make_string_as<Elem>(static_cast<Elem>('-'), args...)
|
||||
|
|
@ -42,39 +51,38 @@ namespace sprout {
|
|||
: sprout::detail::int_to_string_impl_1<Elem, Base>(
|
||||
val / Base,
|
||||
negative,
|
||||
sprout::detail::int_to_char<Elem>(val % Base, Base),
|
||||
sprout::detail::int_to_char<Elem>(negative ? -(val % Base) : val % Base, Base),
|
||||
args...
|
||||
)
|
||||
;
|
||||
}
|
||||
template<typename Elem, std::size_t Base, typename IntType>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::integer_digits<IntType, Base>::value>
|
||||
template<typename Elem, int Base, typename IntType>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::printed_integer_digits<IntType, Base>::value>
|
||||
int_to_string_impl(IntType val) {
|
||||
return val == 0 ? sprout::make_string_as<Elem>(static_cast<Elem>('0'))
|
||||
: val < 0 ? sprout::detail::int_to_string_impl_1<Elem, Base>(-val, true)
|
||||
: sprout::detail::int_to_string_impl_1<Elem, Base>(val, false)
|
||||
: sprout::detail::int_to_string_impl_1<Elem, Base>(val, val < 0)
|
||||
;
|
||||
}
|
||||
|
||||
template<
|
||||
typename Elem,
|
||||
std::size_t Base,
|
||||
int Base,
|
||||
typename UIntType,
|
||||
typename... Args,
|
||||
typename sprout::enabler_if<(sizeof...(Args) == sprout::integer_digits<UIntType, Base>::value)>::type = sprout::enabler
|
||||
typename sprout::enabler_if<(sizeof...(Args) == sprout::printed_integer_digits<UIntType, Base>::value)>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::integer_digits<UIntType, Base>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::printed_integer_digits<UIntType, Base>::value>
|
||||
uint_to_string_impl_1(UIntType val, Args... args) {
|
||||
return sprout::make_string_as<Elem>(args...);
|
||||
}
|
||||
template<
|
||||
typename Elem,
|
||||
std::size_t Base,
|
||||
int Base,
|
||||
typename UIntType,
|
||||
typename... Args,
|
||||
typename sprout::enabler_if<(sizeof...(Args) < sprout::integer_digits<UIntType, Base>::value)>::type = sprout::enabler
|
||||
typename sprout::enabler_if<(sizeof...(Args) < sprout::printed_integer_digits<UIntType, Base>::value)>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::integer_digits<UIntType, Base>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::printed_integer_digits<UIntType, Base>::value>
|
||||
uint_to_string_impl_1(UIntType val, Args... args) {
|
||||
return val == 0
|
||||
? sprout::make_string_as<Elem>(args...)
|
||||
|
|
@ -85,8 +93,8 @@ namespace sprout {
|
|||
)
|
||||
;
|
||||
}
|
||||
template<typename Elem, std::size_t Base, typename UIntType>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::integer_digits<UIntType, Base>::value>
|
||||
template<typename Elem, int Base, typename UIntType>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::printed_integer_digits<UIntType, Base>::value>
|
||||
uint_to_string_impl(UIntType val) {
|
||||
return val == 0 ? sprout::make_string_as<Elem>(static_cast<Elem>('0'))
|
||||
: sprout::detail::uint_to_string_impl_1<Elem, Base>(val)
|
||||
|
|
@ -95,21 +103,21 @@ namespace sprout {
|
|||
|
||||
template<
|
||||
typename Elem,
|
||||
std::size_t Base,
|
||||
int Base,
|
||||
typename IntType,
|
||||
typename sprout::enabler_if<std::is_signed<IntType>::value>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::integer_digits<IntType, Base>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::printed_integer_digits<IntType, Base>::value>
|
||||
int_to_string(IntType val) {
|
||||
return sprout::detail::int_to_string_impl<Elem, Base>(val);
|
||||
}
|
||||
template<
|
||||
typename Elem,
|
||||
std::size_t Base,
|
||||
int Base,
|
||||
typename IntType,
|
||||
typename sprout::enabler_if<std::is_unsigned<IntType>::value>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::integer_digits<IntType, Base>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::printed_integer_digits<IntType, Base>::value>
|
||||
int_to_string(IntType val) {
|
||||
return sprout::detail::uint_to_string_impl<Elem, Base>(val);
|
||||
}
|
||||
|
|
@ -120,11 +128,11 @@ namespace sprout {
|
|||
//
|
||||
template<
|
||||
typename Elem,
|
||||
std::size_t Base,
|
||||
int Base,
|
||||
typename IntType,
|
||||
typename sprout::enabler_if<std::is_integral<IntType>::value>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::integer_digits<IntType, Base>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::printed_integer_digits<IntType, Base>::value>
|
||||
int_to_string(IntType val) {
|
||||
return sprout::detail::int_to_string<Elem, Base>(val);
|
||||
}
|
||||
|
|
@ -133,7 +141,7 @@ namespace sprout {
|
|||
// to_string_of
|
||||
//
|
||||
template<typename Elem, typename IntType, typename sprout::enabler_if<std::is_integral<IntType>::value>::type = sprout::enabler>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::integer_digits<IntType, 10>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<Elem, sprout::printed_integer_digits<IntType, 10>::value>
|
||||
to_string_of(IntType val) {
|
||||
return sprout::int_to_string<Elem, 10>(val);
|
||||
}
|
||||
|
|
@ -141,32 +149,32 @@ namespace sprout {
|
|||
//
|
||||
// to_string
|
||||
//
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char, sprout::integer_digits<int>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char, sprout::printed_integer_digits<int>::value>
|
||||
to_string(int val) {
|
||||
return sprout::to_string_of<char>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char, sprout::integer_digits<unsigned>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char, sprout::printed_integer_digits<unsigned>::value>
|
||||
to_string(unsigned val) {
|
||||
return sprout::to_string_of<char>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char, sprout::integer_digits<long>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char, sprout::printed_integer_digits<long>::value>
|
||||
to_string(long val) {
|
||||
return sprout::to_string_of<char>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char, sprout::integer_digits<unsigned long>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char, sprout::printed_integer_digits<unsigned long>::value>
|
||||
to_string(unsigned long val) {
|
||||
return sprout::to_string_of<char>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char, sprout::integer_digits<long long>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char, sprout::printed_integer_digits<long long>::value>
|
||||
to_string(long long val) {
|
||||
return sprout::to_string_of<char>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char, sprout::integer_digits<unsigned long long>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char, sprout::printed_integer_digits<unsigned long long>::value>
|
||||
to_string(unsigned long long val) {
|
||||
return sprout::to_string_of<char>(val);
|
||||
}
|
||||
template<typename IntType, typename sprout::enabler_if<std::is_integral<IntType>::value>::type = sprout::enabler>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char, sprout::integer_digits<IntType>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char, sprout::printed_integer_digits<IntType>::value>
|
||||
to_string(IntType val) {
|
||||
return sprout::to_string_of<char>(val);
|
||||
}
|
||||
|
|
@ -174,32 +182,32 @@ namespace sprout {
|
|||
//
|
||||
// to_wstring
|
||||
//
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<wchar_t, sprout::integer_digits<int>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<wchar_t, sprout::printed_integer_digits<int>::value>
|
||||
to_wstring(int val) {
|
||||
return sprout::to_string_of<wchar_t>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<wchar_t, sprout::integer_digits<unsigned>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<wchar_t, sprout::printed_integer_digits<unsigned>::value>
|
||||
to_wstring(unsigned val) {
|
||||
return sprout::to_string_of<wchar_t>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<wchar_t, sprout::integer_digits<long>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<wchar_t, sprout::printed_integer_digits<long>::value>
|
||||
to_wstring(long val) {
|
||||
return sprout::to_string_of<wchar_t>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<wchar_t, sprout::integer_digits<unsigned long>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<wchar_t, sprout::printed_integer_digits<unsigned long>::value>
|
||||
to_wstring(unsigned long val) {
|
||||
return sprout::to_string_of<wchar_t>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<wchar_t, sprout::integer_digits<long long>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<wchar_t, sprout::printed_integer_digits<long long>::value>
|
||||
to_wstring(long long val) {
|
||||
return sprout::to_string_of<wchar_t>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<wchar_t, sprout::integer_digits<unsigned long long>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<wchar_t, sprout::printed_integer_digits<unsigned long long>::value>
|
||||
to_wstring(unsigned long long val) {
|
||||
return sprout::to_string_of<wchar_t>(val);
|
||||
}
|
||||
template<typename IntType, typename sprout::enabler_if<std::is_integral<IntType>::value>::type = sprout::enabler>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<wchar_t, sprout::integer_digits<IntType>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<wchar_t, sprout::printed_integer_digits<IntType>::value>
|
||||
to_wstring(IntType val) {
|
||||
return sprout::to_string_of<wchar_t>(val);
|
||||
}
|
||||
|
|
@ -207,32 +215,32 @@ namespace sprout {
|
|||
//
|
||||
// to_u16string
|
||||
//
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char16_t, sprout::integer_digits<int>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char16_t, sprout::printed_integer_digits<int>::value>
|
||||
to_u16string(int val) {
|
||||
return sprout::to_string_of<char16_t>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char16_t, sprout::integer_digits<unsigned>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char16_t, sprout::printed_integer_digits<unsigned>::value>
|
||||
to_u16string(unsigned val) {
|
||||
return sprout::to_string_of<char16_t>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char16_t, sprout::integer_digits<long>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char16_t, sprout::printed_integer_digits<long>::value>
|
||||
to_u16string(long val) {
|
||||
return sprout::to_string_of<char16_t>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char16_t, sprout::integer_digits<unsigned long>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char16_t, sprout::printed_integer_digits<unsigned long>::value>
|
||||
to_u16string(unsigned long val) {
|
||||
return sprout::to_string_of<char16_t>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char16_t, sprout::integer_digits<long long>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char16_t, sprout::printed_integer_digits<long long>::value>
|
||||
to_u16string(long long val) {
|
||||
return sprout::to_string_of<char16_t>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char16_t, sprout::integer_digits<unsigned long long>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char16_t, sprout::printed_integer_digits<unsigned long long>::value>
|
||||
to_u16string(unsigned long long val) {
|
||||
return sprout::to_string_of<char16_t>(val);
|
||||
}
|
||||
template<typename IntType, typename sprout::enabler_if<std::is_integral<IntType>::value>::type = sprout::enabler>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char16_t, sprout::integer_digits<IntType>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char16_t, sprout::printed_integer_digits<IntType>::value>
|
||||
to_u16string(IntType val) {
|
||||
return sprout::to_string_of<char16_t>(val);
|
||||
}
|
||||
|
|
@ -240,32 +248,32 @@ namespace sprout {
|
|||
//
|
||||
// to_u32string
|
||||
//
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char32_t, sprout::integer_digits<int>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char32_t, sprout::printed_integer_digits<int>::value>
|
||||
to_u32string(int val) {
|
||||
return sprout::to_string_of<char32_t>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char32_t, sprout::integer_digits<unsigned>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char32_t, sprout::printed_integer_digits<unsigned>::value>
|
||||
to_u32string(unsigned val) {
|
||||
return sprout::to_string_of<char32_t>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char32_t, sprout::integer_digits<long>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char32_t, sprout::printed_integer_digits<long>::value>
|
||||
to_u32string(long val) {
|
||||
return sprout::to_string_of<char32_t>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char32_t, sprout::integer_digits<unsigned long>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char32_t, sprout::printed_integer_digits<unsigned long>::value>
|
||||
to_u32string(unsigned long val) {
|
||||
return sprout::to_string_of<char32_t>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char32_t, sprout::integer_digits<long long>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char32_t, sprout::printed_integer_digits<long long>::value>
|
||||
to_u32string(long long val) {
|
||||
return sprout::to_string_of<char32_t>(val);
|
||||
}
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char32_t, sprout::integer_digits<unsigned long long>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char32_t, sprout::printed_integer_digits<unsigned long long>::value>
|
||||
to_u32string(unsigned long long val) {
|
||||
return sprout::to_string_of<char32_t>(val);
|
||||
}
|
||||
template<typename IntType, typename sprout::enabler_if<std::is_integral<IntType>::value>::type = sprout::enabler>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char32_t, sprout::integer_digits<IntType>::value>
|
||||
inline SPROUT_CONSTEXPR sprout::basic_string<char32_t, sprout::printed_integer_digits<IntType>::value>
|
||||
to_u32string(IntType val) {
|
||||
return sprout::to_string_of<char32_t>(val);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue