fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 02:37:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor float localization

Browse Source
This commit is contained in:
Victor Zverovich
2022-09-05 14:35:34 -07:00
parent 8ae56161c8
commit c3494ae364
1 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
include/fmt/format.h
View File

@ -2053,7 +2053,16 @@ auto write_int(OutputIt out, UInt value, unsigned prefix,
}); });
} }
// Writes localized value. template <typename Char, typename T, FMT_ENABLE_IF(!is_float128<T>::value)>
auto make_loc_value(T value) -> basic_format_arg<buffer_context<Char>> {
return make_arg<buffer_context<Char>>(value);
}
template <typename Char, typename T, FMT_ENABLE_IF(is_float128<T>::value)>
auto make_loc_value(T) -> basic_format_arg<buffer_context<Char>> {
return {};
}
// Writes a localized value.
FMT_API auto write_loc(appender out, basic_format_arg<format_context> value, FMT_API auto write_loc(appender out, basic_format_arg<format_context> value,
const format_specs& specs, locale_ref loc) -> bool; const format_specs& specs, locale_ref loc) -> bool;
@ -2182,7 +2191,7 @@ FMT_CONSTEXPR FMT_INLINE auto write(OutputIt out, T value,
const basic_format_specs<Char>& specs, const basic_format_specs<Char>& specs,
locale_ref loc) -> OutputIt { locale_ref loc) -> OutputIt {
if (specs.localized && if (specs.localized &&
write_loc(out, make_arg<buffer_context<Char>>(value), specs, loc)) { write_loc(out, make_loc_value<Char>(value), specs, loc)) {
return out; return out;
} }
return write_int_noinline(out, make_write_int_arg(value, specs.sign), specs, return write_int_noinline(out, make_write_int_arg(value, specs.sign), specs,
@ -2197,7 +2206,7 @@ FMT_CONSTEXPR FMT_INLINE auto write(OutputIt out, T value,
const basic_format_specs<Char>& specs, const basic_format_specs<Char>& specs,
locale_ref loc) -> OutputIt { locale_ref loc) -> OutputIt {
if (specs.localized && if (specs.localized &&
write_loc(out, make_arg<buffer_context<Char>>(value), specs, loc)) { write_loc(out, make_loc_value<Char>(value), specs, loc)) {
return out; return out;
} }
return write_int(out, make_write_int_arg(value, specs.sign), specs, loc); return write_int(out, make_write_int_arg(value, specs.sign), specs, loc);
@ -3251,13 +3260,10 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
} }
return exp; return exp;
} }
template <typename Char, typename OutputIt, typename T>
template <typename Char, typename OutputIt, typename T, FMT_CONSTEXPR20 auto write_float(OutputIt out, T value,
FMT_ENABLE_IF(is_floating_point<T>::value)> basic_format_specs<Char> specs, locale_ref loc)
FMT_CONSTEXPR20 auto write(OutputIt out, T value,
basic_format_specs<Char> specs, locale_ref loc = {})
-> OutputIt { -> OutputIt {
if (const_check(!is_supported_floating_point(value))) return out;
float_specs fspecs = parse_float_type_spec(specs); float_specs fspecs = parse_float_type_spec(specs);
fspecs.sign = specs.sign; fspecs.sign = specs.sign;
if (detail::signbit(value)) { // value < 0 is false for NaN so use signbit. if (detail::signbit(value)) { // value < 0 is false for NaN so use signbit.
@ -3303,6 +3309,19 @@ FMT_CONSTEXPR20 auto write(OutputIt out, T value,
return write_float(out, f, specs, fspecs, loc); return write_float(out, f, specs, fspecs, loc);
} }
template <typename Char, typename OutputIt, typename T,
FMT_ENABLE_IF(is_floating_point<T>::value)>
FMT_CONSTEXPR20 auto write(OutputIt out, T value,
basic_format_specs<Char> specs, locale_ref loc = {})
-> OutputIt {
if (const_check(!is_supported_floating_point(value))) return out;
if (specs.localized &&
write_loc(out, make_loc_value<Char>(value), specs, loc)) {
return out;
}
return write_float(out, value, specs, loc);
}
template <typename Char, typename OutputIt, typename T, template <typename Char, typename OutputIt, typename T,
FMT_ENABLE_IF(is_fast_float<T>::value)> FMT_ENABLE_IF(is_fast_float<T>::value)>
FMT_CONSTEXPR20 auto write(OutputIt out, T value) -> OutputIt { FMT_CONSTEXPR20 auto write(OutputIt out, T value) -> OutputIt {