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

Improve handling of 'h' length specifier in printf.

Browse Source
This commit is contained in:
Victor Zverovich 2014-07-30 08:08:08 -07:00
parent eeca22357b
commit 39b0930aee
2 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
format.cc
View File

@ -218,7 +218,7 @@ class ArgConverter : public fmt::internal::ArgVisitor<ArgConverter<T>, void> {
template <typename U> template <typename U>
void visit_any_int(U value) { void visit_any_int(U value) {
if (std::numeric_limits<U>::is_signed) { if (std::numeric_limits<T>::is_signed) {
arg_.type = fmt::internal::Arg::INT; arg_.type = fmt::internal::Arg::INT;
arg_.int_value = static_cast<T>(value); arg_.int_value = static_cast<T>(value);
} else { } else {
@ -892,10 +892,16 @@ void fmt::internal::PrintfFormatter<Char>::format(
// Parse length. // Parse length.
switch (*s) { switch (*s) {
case 'h': case 'h': {
++s; ++s;
ArgConverter<short>(arg).visit(arg); // TODO: handle 'hh'
char type = *s;
if (type == 'd' || type == 'i')
ArgConverter<short>(arg).visit(arg);
else
ArgConverter<unsigned short>(arg).visit(arg);
break; break;
}
case 'l': case 'l':
case 'j': case 'j':
case 'z': case 'z':
@ -912,6 +918,8 @@ void fmt::internal::PrintfFormatter<Char>::format(
if (error_) if (error_)
throw FormatError(error_); throw FormatError(error_);
spec.type_ = static_cast<char>(*s++); spec.type_ = static_cast<char>(*s++);
if (arg.type <= Arg::LAST_INTEGER_TYPE && spec.type_ == 'u')
spec.type_ = 'd';
start = s; start = s;

40
test/printf-test.cc
View File

@ -272,14 +272,38 @@ TEST(PrintfTest, DynamicPrecision) {
} }
} }
TEST(PrintfTest, Length) { #define EXPECT_STD_PRINTF(format, arg) { \
EXPECT_PRINTF("42", "%hd", 42); char buffer[BUFFER_SIZE]; \
char buffer[BUFFER_SIZE]; safe_sprintf(buffer, "%hd", arg); \
safe_sprintf(buffer, "%hd", SHRT_MAX + 1); EXPECT_PRINTF(buffer, "%hd", arg); \
EXPECT_PRINTF(buffer, "%hd", SHRT_MAX + 1); }
safe_sprintf(buffer, "%hd", fmt::LongLong(SHRT_MAX) + 1);
EXPECT_PRINTF(buffer, "%hd", fmt::LongLong(SHRT_MAX) + 1); template <typename T>
// TODO void TestLength(const char *length_spec) {
EXPECT_STD_PRINTF(format, 42);
T min = std::numeric_limits<T>::min(), max = std::numeric_limits<T>::max();
const char types[] = {'d', 'i', 'u', 'o', 'x', 'X'};
for (int i = 0; i < sizeof(types); ++i) {
std::string format = fmt::format("%{}{}", length_spec, types[i]);
EXPECT_STD_PRINTF(format, min);
EXPECT_STD_PRINTF(format, max);
EXPECT_STD_PRINTF(format, fmt::LongLong(min) - 1);
EXPECT_STD_PRINTF(format, fmt::LongLong(max) + 1);
EXPECT_STD_PRINTF(format, std::numeric_limits<int>::min());
EXPECT_STD_PRINTF(format, std::numeric_limits<int>::max());
EXPECT_STD_PRINTF(format, std::numeric_limits<unsigned>::min());
EXPECT_STD_PRINTF(format, std::numeric_limits<unsigned>::max());
EXPECT_STD_PRINTF(format, std::numeric_limits<fmt::LongLong>::min());
EXPECT_STD_PRINTF(format, std::numeric_limits<fmt::LongLong>::max());
EXPECT_STD_PRINTF(format, std::numeric_limits<fmt::ULongLong>::min());
EXPECT_STD_PRINTF(format, std::numeric_limits<fmt::ULongLong>::max());
}
}
TEST(PrintfTest, ShortLength) {
TestLength<short>("h");
TestLength<unsigned short>("h");
// TODO: more tests
} }
// TODO: test type specifier // TODO: test type specifier