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

Default for floating point is now "%g" rather than "%f"

Browse Source
This commit is contained in:
Brendan McCarthy 2017-01-14 06:17:29 +10:00
parent a59af231f4
commit b49a92d654
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fmt/printf.h
View File

@ -74,7 +74,7 @@ class DefaultType : public ArgVisitor<DefaultType, wchar_t> {
wchar_t visit_any_int(T) { return 'd'; } wchar_t visit_any_int(T) { return 'd'; }
template <typename T> template <typename T>
wchar_t visit_any_double(T) { return 'f'; } wchar_t visit_any_double(T) { return 'g'; }
wchar_t visit_unhandled_arg() { return 's'; } wchar_t visit_unhandled_arg() { return 's'; }
}; };
@ -119,7 +119,7 @@ class ArgConverter : public ArgVisitor<ArgConverter<T>, void> {
void visit_any_int(U value) { void visit_any_int(U value) {
bool is_signed = type_ == 'd' || type_ == 'i'; bool is_signed = type_ == 'd' || type_ == 'i';
if (type_ == 's') { if (type_ == 's') {
is_signed = std::numeric_limits<U>::is_signed; is_signed = std::numeric_limits<U>::is_signed;
} }
using internal::Arg; using internal::Arg;
@ -492,8 +492,8 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str) {
spec.type_ = static_cast<char>(*s++); spec.type_ = static_cast<char>(*s++);
if (spec.type_ == 's') { if (spec.type_ == 's') {
// set the format type to the default if 's' is specified // set the format type to the default if 's' is specified
spec.type_ = internal::DefaultType().visit(arg); spec.type_ = internal::DefaultType().visit(arg);
} }
if (arg.type <= Arg::LAST_INTEGER_TYPE) { if (arg.type <= Arg::LAST_INTEGER_TYPE) {

2
test/printf-test.cc
View File

@ -402,7 +402,7 @@ TEST(PrintfTest, LongLong) {
TEST(PrintfTest, Float) { TEST(PrintfTest, Float) {
EXPECT_PRINTF("392.650000", "%f", 392.65); EXPECT_PRINTF("392.650000", "%f", 392.65);
EXPECT_PRINTF("392.650000", "%F", 392.65); EXPECT_PRINTF("392.650000", "%F", 392.65);
EXPECT_PRINTF("392.650000", "%s", 392.65); EXPECT_PRINTF("392.65", "%s", 392.65);
char buffer[BUFFER_SIZE]; char buffer[BUFFER_SIZE];
safe_sprintf(buffer, "%e", 392.65); safe_sprintf(buffer, "%e", 392.65);
EXPECT_PRINTF(buffer, "%e", 392.65); EXPECT_PRINTF(buffer, "%e", 392.65);