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

Simplify char_traits

Browse Source
This commit is contained in:
Victor Zverovich
2018-04-08 13:38:12 -07:00
parent 7610c5362a
commit 096c4051b2
1 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
include/fmt/format.h
View File

@ -532,23 +532,17 @@ class basic_fixed_buffer : public internal::basic_buffer<Char> {
namespace internal { namespace internal {
template <typename Char> template <typename Char>
class basic_char_traits { struct char_traits {
public: template <typename T>
static Char cast(int value) { return static_cast<Char>(value); } static int format_float(Char *buffer, std::size_t size,
const Char *format, unsigned width, int precision, T value) {
// TODO
return 0;
}
}; };
template <typename Char>
class char_traits;
template <> template <>
class char_traits<char> : public basic_char_traits<char> { struct char_traits<char> {
private:
// Conversion from wchar_t to char is not allowed.
static char convert(wchar_t);
public:
static char convert(char value) { return value; }
// Formats a floating-point number. // Formats a floating-point number.
template <typename T> template <typename T>
FMT_API static int format_float(char *buffer, std::size_t size, FMT_API static int format_float(char *buffer, std::size_t size,
@ -556,11 +550,7 @@ class char_traits<char> : public basic_char_traits<char> {
}; };
template <> template <>
class char_traits<wchar_t> : public basic_char_traits<wchar_t> { struct char_traits<wchar_t> {
public:
static wchar_t convert(char value) { return value; }
static wchar_t convert(wchar_t value) { return value; }
template <typename T> template <typename T>
FMT_API static int format_float(wchar_t *buffer, std::size_t size, FMT_API static int format_float(wchar_t *buffer, std::size_t size,
const wchar_t *format, unsigned width, int precision, T value); const wchar_t *format, unsigned width, int precision, T value);
@ -1412,9 +1402,7 @@ class arg_formatter_base {
struct char_writer { struct char_writer {
char_type value; char_type value;
template <typename It> template <typename It>
void operator()(It &&it) const { void operator()(It &&it) const { *it++ = value; }
*it++ = internal::char_traits<char_type>::cast(value);
}
}; };
void write_char(char_type value) { void write_char(char_type value) {
@ -2667,7 +2655,7 @@ void basic_writer<Range>::write_padded(
if (width <= size) if (width <= size)
return f(reserve(size)); return f(reserve(size));
auto &&it = reserve(width); auto &&it = reserve(width);
char_type fill = internal::char_traits<char_type>::cast(spec.fill()); char_type fill = spec.fill();
std::size_t padding = width - size; std::size_t padding = width - size;
if (spec.align() == ALIGN_RIGHT) { if (spec.align() == ALIGN_RIGHT) {
it = std::fill_n(it, padding, fill); it = std::fill_n(it, padding, fill);
@ -2687,8 +2675,6 @@ template <typename Range>
template <typename Char> template <typename Char>
void basic_writer<Range>::write_str( void basic_writer<Range>::write_str(
basic_string_view<Char> s, const format_specs &spec) { basic_string_view<Char> s, const format_specs &spec) {
// Check if Char is convertible to char_type.
internal::char_traits<char_type>::convert(Char());
const Char *data = s.data(); const Char *data = s.data();
std::size_t size = s.size(); std::size_t size = s.size();
std::size_t precision = static_cast<std::size_t>(spec.precision_); std::size_t precision = static_cast<std::size_t>(spec.precision_);