External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't duplicate integer format specifiers when formatting char as integer.

Browse Source
This commit is contained in:
Victor Zverovich 2014-07-25 08:24:27 -07:00
parent a997de90eb
commit d699c2a0d9
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
format.cc
View File

@ -432,14 +432,9 @@ class fmt::internal::ArgFormatter :
void visit_char(int value) { void visit_char(int value) {
if (spec_.type_ && spec_.type_ != 'c') { if (spec_.type_ && spec_.type_ != 'c') {
switch (spec_.type_) { spec_.flags_ |= CHAR_FLAG;
// TODO: don't duplicate integer format specifiers here writer_.write_int(value, spec_);
case 'd': case 'x': case 'X': case 'b': case 'B': case 'o': return;
writer_.write_int(value, spec_);
return;
default:
internal::ReportUnknownType(spec_.type_, "char");
}
} }
if (spec_.align_ == ALIGN_NUMERIC || spec_.flags_ != 0) if (spec_.align_ == ALIGN_NUMERIC || spec_.flags_ != 0)
throw FormatError("invalid format specifier for char"); throw FormatError("invalid format specifier for char");

11
format.h
View File

@ -906,7 +906,10 @@ enum Alignment {
}; };
// Flags. // Flags.
enum { SIGN_FLAG = 1, PLUS_FLAG = 2, MINUS_FLAG = 4, HASH_FLAG = 8 }; enum {
SIGN_FLAG = 1, PLUS_FLAG = 2, MINUS_FLAG = 4, HASH_FLAG = 8,
CHAR_FLAG = 0x10 // Argument has char type - used in error reporting.
};
// An empty format specifier. // An empty format specifier.
struct EmptySpec {}; struct EmptySpec {};
@ -921,6 +924,7 @@ struct TypeSpec : EmptySpec {
bool sign_flag() const { return false; } bool sign_flag() const { return false; }
bool plus_flag() const { return false; } bool plus_flag() const { return false; }
bool hash_flag() const { return false; } bool hash_flag() const { return false; }
bool char_flag() const { return false; }
char type() const { return TYPE; } char type() const { return TYPE; }
char fill() const { return ' '; } char fill() const { return ' '; }
@ -959,6 +963,7 @@ struct AlignTypeSpec : AlignSpec {
bool sign_flag() const { return false; } bool sign_flag() const { return false; }
bool plus_flag() const { return false; } bool plus_flag() const { return false; }
bool hash_flag() const { return false; } bool hash_flag() const { return false; }
bool char_flag() const { return false; }
char type() const { return TYPE; } char type() const { return TYPE; }
}; };
@ -976,6 +981,7 @@ struct FormatSpec : AlignSpec {
bool sign_flag() const { return (flags_ & SIGN_FLAG) != 0; } bool sign_flag() const { return (flags_ & SIGN_FLAG) != 0; }
bool plus_flag() const { return (flags_ & PLUS_FLAG) != 0; } bool plus_flag() const { return (flags_ & PLUS_FLAG) != 0; }
bool hash_flag() const { return (flags_ & HASH_FLAG) != 0; } bool hash_flag() const { return (flags_ & HASH_FLAG) != 0; }
bool char_flag() const { return (flags_ & CHAR_FLAG) != 0; }
int precision() const { return precision_; } int precision() const { return precision_; }
@ -1682,7 +1688,8 @@ void BasicWriter<Char>::write_int(T value, const Spec &spec) {
break; break;
} }
default: default:
internal::ReportUnknownType(spec.type(), "integer"); internal::ReportUnknownType(
spec.type(), spec.char_flag() ? "char" : "integer");
break; break;
} }
} }