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

Handle 'h' length specifier in printf.

Browse Source
This commit is contained in:
Victor Zverovich 2014-07-30 07:37:16 -07:00
parent e4c4e4e944
commit eeca22357b
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
format.cc
View File

@ -207,6 +207,27 @@ class PrecisionHandler :
} }
}; };
// Converts an integer argument to type T.
template <typename T>
class ArgConverter : public fmt::internal::ArgVisitor<ArgConverter<T>, void> {
private:
fmt::internal::Arg &arg_;
public:
explicit ArgConverter(fmt::internal::Arg &arg) : arg_(arg) {}
template <typename U>
void visit_any_int(U value) {
if (std::numeric_limits<U>::is_signed) {
arg_.type = fmt::internal::Arg::INT;
arg_.int_value = static_cast<T>(value);
} else {
arg_.type = fmt::internal::Arg::UINT;
arg_.uint_value = static_cast<T>(value);
}
}
};
// This function template is used to prevent compile errors when handling // This function template is used to prevent compile errors when handling
// incompatible string arguments, e.g. handling a wide string in a narrow // incompatible string arguments, e.g. handling a wide string in a narrow
// string formatter. // string formatter.
@ -859,7 +880,7 @@ void fmt::internal::PrintfFormatter<Char>::format(
} }
} }
const Arg &arg = handle_arg_index(arg_index); Arg arg = handle_arg_index(arg_index);
if (spec.flag(HASH_FLAG) && IsZeroInt().visit(arg)) if (spec.flag(HASH_FLAG) && IsZeroInt().visit(arg))
spec.flags_ &= ~HASH_FLAG; spec.flags_ &= ~HASH_FLAG;
if (spec.fill_ == '0') { if (spec.fill_ == '0') {
@ -872,7 +893,9 @@ void fmt::internal::PrintfFormatter<Char>::format(
// Parse length. // Parse length.
switch (*s) { switch (*s) {
case 'h': case 'h':
// TODO: convert to short ++s;
ArgConverter<short>(arg).visit(arg);
break;
case 'l': case 'l':
case 'j': case 'j':
case 'z': case 'z':

6
test/printf-test.cc
View File

@ -273,6 +273,12 @@ TEST(PrintfTest, DynamicPrecision) {
} }
TEST(PrintfTest, Length) { TEST(PrintfTest, Length) {
EXPECT_PRINTF("42", "%hd", 42);
char buffer[BUFFER_SIZE];
safe_sprintf(buffer, "%hd", SHRT_MAX + 1);
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);
// TODO // TODO
} }