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

Fix https://github.com/cppformat/cppformat/issues/57.

Browse Source
This commit is contained in:
Victor Zverovich 2014-07-25 07:10:33 -07:00
parent 89468c2a23
commit a997de90eb
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
format.cc
View File

@ -436,7 +436,7 @@ class fmt::internal::ArgFormatter :
// TODO: don't duplicate integer format specifiers here // TODO: don't duplicate integer format specifiers here
case 'd': case 'x': case 'X': case 'b': case 'B': case 'o': case 'd': case 'x': case 'X': case 'b': case 'B': case 'o':
writer_.write_int(value, spec_); writer_.write_int(value, spec_);
break; return;
default: default:
internal::ReportUnknownType(spec_.type_, "char"); internal::ReportUnknownType(spec_.type_, "char");
} }

9
test/format-test.cc
View File

@ -1268,10 +1268,17 @@ TEST(FormatterTest, FormatLongDouble) {
} }
TEST(FormatterTest, FormatChar) { TEST(FormatterTest, FormatChar) {
CheckUnknownTypes('a', "cbBdoxX", "char"); const char types[] = "cbBdoxX";
CheckUnknownTypes('a', types, "char");
EXPECT_EQ("a", format("{0}", 'a')); EXPECT_EQ("a", format("{0}", 'a'));
EXPECT_EQ("z", format("{0:c}", 'z')); EXPECT_EQ("z", format("{0:c}", 'z'));
EXPECT_EQ(L"a", format(L"{0}", 'a')); EXPECT_EQ(L"a", format(L"{0}", 'a'));
int n = 'x';
for (const char *type = types + 1; *type; ++type) {
std::string format_str = fmt::format("{{:{}}}", *type);
EXPECT_EQ(fmt::format(format_str, n), fmt::format(format_str, 'x'));
}
EXPECT_EQ(fmt::format("{:02X}", n), fmt::format("{:02X}", 'x'));
} }
TEST(FormatterTest, FormatWChar) { TEST(FormatterTest, FormatWChar) {