Fix handling of hexfloat

pauldreik · Jun 13, 2019 · cbbee1b · cbbee1b
1 parent 92a44db
commit cbbee1b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h
@@ -786,20 +786,21 @@ void sprintf_format(Double value, internal::buffer<char>& buf,
         // Find the decimal point.
         auto p = buf.data(), end = p + n;
         if (*p == '+' || *p == '-') ++p;
-        if (spec.type == 'a' || spec.type == 'A') p += 2;  // Skip "0x".
-        while (p < end && *p >= '0' && *p <= '9') ++p;
-        if (p < end && *p != 'e' && *p != 'E') {
-          if (*p != '.') *p = '.';
-          if (!spec.type) {
-            // Keep only one trailing zero after the decimal point.
-            ++p;
-            if (*p == '0') ++p;
-            while (p != end && *p >= '1' && *p <= '9') ++p;
-            char* where = p;
-            while (p != end && *p == '0') ++p;
-            if (p == end || *p < '0' || *p > '9') {
-              if (p != end) std::memmove(where, p, to_unsigned(end - p));
-              n -= static_cast<unsigned>(p - where);
+        if (spec.type != 'a' && spec.type != 'A') {
+          while (p < end && *p >= '0' && *p <= '9') ++p;
+          if (p < end && *p != 'e' && *p != 'E') {
+            if (*p != '.') *p = '.';
+            if (!spec.type) {
+              // Keep only one trailing zero after the decimal point.
+              ++p;
+              if (*p == '0') ++p;
+              while (p != end && *p >= '1' && *p <= '9') ++p;
+              char* where = p;
+              while (p != end && *p == '0') ++p;
+              if (p == end || *p < '0' || *p > '9') {
+                if (p != end) std::memmove(where, p, to_unsigned(end - p));
+                n -= static_cast<unsigned>(p - where);
+              }
             }
           }
         }

diff --git a/test/format-test.cc b/test/format-test.cc
@@ -1506,6 +1506,8 @@ TEST(FormatterTest, FormatLongDouble) {
   safe_sprintf(buffer, "%Le", 392.65l);
   EXPECT_EQ(buffer, format("{0:e}", 392.65l));
   EXPECT_EQ("+0000392.6", format("{0:+010.4g}", 392.64l));
+  safe_sprintf(buffer, "%La", 3.31l);
+  EXPECT_EQ(buffer, format("{:a}", 3.31l));
 }
 
 TEST(FormatterTest, FormatChar) {