mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-12-25 15:21:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore '0' flag for non-numeric types as printf does.

Browse Source
This commit is contained in:
Victor Zverovich 2014-06-07 07:31:25 -07:00
parent 80c99760fb
commit bf790d2819
2 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
format.cc
View File

@ -575,6 +575,33 @@ void fmt::BasicWriter<Char>::FormatParser::CheckSign(
++s;
}
template <typename Char>
void fmt::BasicWriter<Char>::PrintfParser::ParseFlags(
FormatSpec &spec, const Char *&s) {
// TODO: parse optional flags
for (;;) {
switch (*s) {
case '-':
++s;
spec.align_ = ALIGN_LEFT;
break;
case '+':
// TODO
++s;
spec.flags_ |= SIGN_FLAG | PLUS_FLAG;
break;
case '0':
spec.fill_ = '0';
case ' ':
case '#':
++s;
break;
default:
return;
}
}
}
template <typename Char>
void fmt::BasicWriter<Char>::PrintfParser::Format(
BasicWriter<Char> &writer, BasicStringRef<Char> format,
@ -655,29 +682,7 @@ void fmt::BasicWriter<Char>::PrintfParser::Format(
switch (spec.width_) {
case UINT_MAX: {
spec.width_ = 0;
// TODO: parse optional flags
bool stop = false;
do {
switch (*s) {
case '-':
++s;
spec.align_ = ALIGN_LEFT;
break;
case '+':
// TODO
++s;
spec.flags_ |= SIGN_FLAG | PLUS_FLAG;
break;
case '0':
spec.fill_ = '0';
case ' ':
case '#':
++s;
break;
default:
stop = true;
}
} while (!stop);
ParseFlags(spec, s);
/*
// Parse fill and alignment.
@ -744,9 +749,10 @@ void fmt::BasicWriter<Char>::PrintfParser::Format(
// Fall through.
default:
if (spec.fill_ == '0') {
spec.align_ = ALIGN_NUMERIC;
if (arg->type > LAST_NUMERIC_TYPE)
throw FormatError("format specifier '0' requires numeric argument");
if (arg->type <= LAST_NUMERIC_TYPE)
spec.align_ = ALIGN_NUMERIC;
else
spec.fill_ = ' '; // Ignore '0' flag for non-numeric types.
}
break;
}

4
format.h
View File

@ -1033,7 +1033,9 @@ class BasicWriter {
const ArgInfo *args_;
int next_arg_index_;
public:
void ParseFlags(FormatSpec &spec, const Char *&s);
public:
void Format(BasicWriter<Char> &writer,
BasicStringRef<Char> format, std::size_t num_args, const ArgInfo *args);
};