mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2025-02-05 00:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor pointer formatting

Browse Source
This commit is contained in:
Victor Zverovich 2020-05-03 20:33:25 -07:00
parent 9cc7edfddc
commit bab3f58003
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/fmt/format.h
View File

@ -1577,6 +1577,21 @@ template <typename OutputIt, typename Char, typename UInt> struct int_writer {
} }
}; };
template <typename Char, typename OutputIt, typename UIntPtr>
OutputIt write_ptr(OutputIt out, UIntPtr value,
const basic_format_specs<Char>* specs) {
int num_digits = count_digits<4>(value);
auto size = to_unsigned(num_digits) + size_t(2);
using iterator = remove_reference_t<decltype(reserve(out, 0))>;
auto write = [=](iterator it) {
*it++ = static_cast<Char>('0');
*it++ = static_cast<Char>('x');
return format_uint<4, Char>(it, value, num_digits);
};
return specs ? write_padded<align::right>(out, *specs, size, write)
: base_iterator(out, write(reserve(out, size)));
}
// This template provides operations for formatting and writing data into a // This template provides operations for formatting and writing data into a
// character range. // character range.
template <typename Range> class basic_writer { template <typename Range> class basic_writer {
@ -1742,17 +1757,7 @@ template <typename Range> class basic_writer {
template <typename UIntPtr> template <typename UIntPtr>
void write_pointer(UIntPtr value, const format_specs* specs) { void write_pointer(UIntPtr value, const format_specs* specs) {
int num_digits = count_digits<4>(value); out_ = write_ptr<char_type>(out_, value, specs);
auto size = to_unsigned(num_digits) + size_t(2);
auto write = [=](reserve_iterator it) {
*it++ = static_cast<char_type>('0');
*it++ = static_cast<char_type>('x');
return format_uint<4, char_type>(it, value, num_digits);
};
if (!specs) return void(write(reserve(size)));
format_specs specs_copy = *specs;
if (specs_copy.align == align::none) specs_copy.align = align::right;
out_ = write_padded(out_, specs_copy, size, write);
} }
}; };

10
test/format-impl-test.cc
View File

@ -450,11 +450,11 @@ TEST(UtilTest, CountDigits) {
test_count_digits<uint64_t>(); test_count_digits<uint64_t>();
} }
TEST(UtilTest, WriteUIntPtr) { TEST(UtilTest, WriteFallbackUIntPtr) {
fmt::memory_buffer buf; std::string s;
fmt::internal::writer writer(buf); fmt::internal::write_ptr<char>(
writer.write_pointer( std::back_inserter(s),
fmt::internal::fallback_uintptr(reinterpret_cast<void*>(0xface)), fmt::internal::fallback_uintptr(reinterpret_cast<void*>(0xface)),
nullptr); nullptr);
EXPECT_EQ("0xface", to_string(buf)); EXPECT_EQ(s, "0xface");
} }