mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2025-01-12 15:39:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement precision + fill.

Browse Source
This commit is contained in:
Victor Zverovich 2014-06-20 07:59:23 -07:00
parent 879838a539
commit c556926597
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
format.h
View File

@ -1306,16 +1306,27 @@ typename BasicWriter<Char>::CharPtr BasicWriter<Char>::FormatString(
template <typename Char> template <typename Char>
template <typename Spec> template <typename Spec>
typename fmt::BasicWriter<Char>::CharPtr typename fmt::BasicWriter<Char>::CharPtr
fmt::BasicWriter<Char>::PrepareFilledBuffer(unsigned num_digits, fmt::BasicWriter<Char>::PrepareFilledBuffer(
const Spec &spec, const char *prefix, unsigned prefix_size) { unsigned num_digits, const Spec &spec,
if (spec.precision() >= 0) { const char *prefix, unsigned prefix_size) {
// TODO: fill up to width if necessary unsigned width = spec.width();
if (spec.precision() > static_cast<int>(num_digits)) {
// Octal prefix '0' is counted as a digit, so ignore it if precision
// is specified.
if (prefix_size == 1)
prefix_size = 0;
unsigned number_size = prefix_size + spec.precision();
if (number_size < width) {
buffer_.reserve(width);
unsigned size = width - number_size;
CharPtr p = GrowBuffer(size);
std::fill(p, p + size, spec.fill());
// TODO: take alignment into account
}
return PrepareFilledBuffer(num_digits, return PrepareFilledBuffer(num_digits,
AlignSpec(spec.precision() + prefix_size, '0', ALIGN_NUMERIC), AlignSpec(number_size, '0', ALIGN_NUMERIC), prefix, prefix_size);
prefix, prefix_size);
} }
unsigned size = prefix_size + num_digits; unsigned size = prefix_size + num_digits;
unsigned width = spec.width();
if (width <= size) { if (width <= size) {
CharPtr p = GrowBuffer(size); CharPtr p = GrowBuffer(size);
std::copy(prefix, prefix + prefix_size, p); std::copy(prefix, prefix + prefix_size, p);

14
test/printf-test.cc
View File

@ -229,8 +229,20 @@ TEST(PrintfTest, DynamicWidth) {
TEST(PrintfTest, Precision) { TEST(PrintfTest, Precision) {
EXPECT_PRINTF("00042", "%.5d", 42); EXPECT_PRINTF("00042", "%.5d", 42);
EXPECT_PRINTF("00042", "%.5x", 0x42);
EXPECT_PRINTF("0x00042", "%#.5x", 0x42);
EXPECT_PRINTF("00042", "%.5o", 042);
EXPECT_PRINTF("00042", "%#.5o", 042);
EXPECT_PRINTF(" 00042", "%7.5d", 42);
EXPECT_PRINTF(" 00042", "%7.5x", 0x42);
EXPECT_PRINTF(" 0x00042", "%#10.5x", 0x42);
EXPECT_PRINTF(" 00042", "%7.5o", 042);
EXPECT_PRINTF(" 00042", "%#10.5o", 042);
// TODO: test left alignment
} }
// TODO: test precision, length and type specifier // TODO: test length and type specifier
#endif #endif