Allow %s as generic format specifier in printf #453
Conversation
Signed integers are formatted as %d Unsigned integers are formatted as %u Doubles are formatted as %f Chars are formatted as %c Void Pointers are formatted as %p
|
For #449 |
| @@ -92,9 +92,18 @@ class ArgConverter : public ArgVisitor<ArgConverter<T>, void> { | |||
| visit_any_int(value); | |||
| } | |||
|
|
|||
| void visit_char(char value) { | |||
| if (type_ != 's' && type_ != 'S') | |||
There was a problem hiding this comment.
I think that having uppercase S is redundant and inconsistent with other specifiers. Please leave only s here and below.
| // all floating point types | ||
| spec.type_ = 'f'; | ||
| } | ||
| } |
There was a problem hiding this comment.
Please convert this if-else chain into a visitor and merge with the similar logic under for integers right below.
| void visit_char(char value) { | ||
| if (type_ != 's') | ||
| visit_any_int(value); | ||
| } |
There was a problem hiding this comment.
Isn't this handled by DefaultType?
There was a problem hiding this comment.
ArgConverter runs before DefaultType, and I couldn't see a clean way to switch it around.
| wchar_t visit_any_int(T) { return 'd'; } | ||
|
|
||
| template <typename T> | ||
| wchar_t visit_any_double(T) { return 'f'; } |
There was a problem hiding this comment.
I suggest using g here because it is the default floating-point format.
| template <typename U> | ||
| void visit_any_int(U value) { | ||
| bool is_signed = type_ == 'd' || type_ == 'i'; | ||
| if (type_ == 's') { | ||
| is_signed = std::numeric_limits<U>::is_signed; | ||
| } |
|
|
||
| if (spec.type_ == 's') { | ||
| // set the format type to the default if 's' is specified | ||
| spec.type_ = internal::DefaultType().visit(arg); |
There was a problem hiding this comment.
nit: please use 2 space indent
|
Merged, thanks! |
|
Thankyou :) |
|
@mojoBrendan @vitaut #504 reported warnings because the return type of your |
|
Nevermind, it was done in PR #502. |
Signed integers are formatted as %d
Unsigned integers are formatted as %u
Doubles are formatted as %f
Chars are formatted as %c
Void Pointers are formatted as %p