mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-01-31 11:37:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix stdio fmt of "%.0e" and "%.0g" (#544)

Browse source 
* Fix %.0e by always rounding even if precision is 0
* Fix %.0g by treating it the same as %.1g
* Fix %g tests to match glibc, add more tests
This commit is contained in:
Gavin Hayes 2022-08-18 18:53:07 -04:00 committed by GitHub
parent 27416e7dd6
commit 897e33ccc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libc/stdio/dtoa.c
View file

@ -335,10 +335,10 @@ int __fmt_dtoa(int (*out)(const char *, void *, size_t), void *arg, int d,
case 'G':
case 'g':
if (!(flags & FLAGS_PRECISION)) prec = 6;
if (prec < 0) prec = 0;
if (prec < 1) prec = 1;
if (!longdouble) {
x = va_arg(va, double);
s = s0 = dtoa(x, prec ? 2 : 0, prec, &decpt, &fpb.sign, &se);
s = s0 = dtoa(x, 2, prec, &decpt, &fpb.sign, &se);
if (decpt == 9999) {
if (s && s[0] == 'N') {
fpb.kind = STRTOG_NaN;
@ -379,7 +379,7 @@ int __fmt_dtoa(int (*out)(const char *, void *, size_t), void *arg, int d,
if (prec < 0) prec = 0;
if (!longdouble) {
x = va_arg(va, double);
s = s0 = dtoa(x, prec ? 2 : 0, prec + 1, &decpt, &fpb.sign, &se);
s = s0 = dtoa(x, 2, prec + 1, &decpt, &fpb.sign, &se);
if (decpt == 9999) {
if (s && s[0] == 'N') {
fpb.kind = STRTOG_NaN;

16
test/libc/fmt/fmt_test.c
View file

@ -70,12 +70,24 @@ TEST(fmt, g) {
EXPECT_STREQ("+1", gc(xasprintf("%+g", 1.)));
EXPECT_STREQ("-1", gc(xasprintf("%g", -1.)));
EXPECT_STREQ("10", gc(xasprintf("%g", 10.)));
EXPECT_STREQ("10", gc(xasprintf("%.0g", 10.)));
EXPECT_STREQ("-10", gc(xasprintf("%g", -10.)));
EXPECT_STREQ("-10", gc(xasprintf("%.0g", -10.)));
EXPECT_STREQ("1e+01", gc(xasprintf("%.0g", 10.)));
EXPECT_STREQ("-1e+01", gc(xasprintf("%.0g", -10.)));
EXPECT_STREQ("1", gc(xasprintf("%.0g", 1.0)));
EXPECT_STREQ("1e-05", gc(xasprintf("%.0g", 0.00001)));
EXPECT_STREQ("0.0001", gc(xasprintf("%.0g", 0.0001)));
EXPECT_STREQ("1e+01", gc(xasprintf("%.1g", 10.)));
EXPECT_STREQ("-1e+01", gc(xasprintf("%.1g", -10.)));
EXPECT_STREQ("1", gc(xasprintf("%.1g", 1.0)));
EXPECT_STREQ("1e-05", gc(xasprintf("%.1g", 0.00001)));
EXPECT_STREQ("0.0001", gc(xasprintf("%.1g", 0.0001)));
EXPECT_STREQ("0.007812", gc(xasprintf("%.4g", 0.0078125)));
EXPECT_STREQ("0.023438", gc(xasprintf("%.5g", 0.0234375)));
EXPECT_STREQ("1e+100", gc(xasprintf("%g", 1e100)));
EXPECT_STREQ("1e-100", gc(xasprintf("%g", 1e-100)));
EXPECT_STREQ("-1e-100", gc(xasprintf("%g", -1e-100)));
EXPECT_STREQ("0.123456", gc(xasprintf("%g", 0.1234564)));
EXPECT_STREQ("0.123457", gc(xasprintf("%g", 0.1234566)));
EXPECT_STREQ("3.14159", gc(xasprintf("%g", 0x1.921fb54442d1846ap+1)));
EXPECT_STREQ("0", gc(xasprintf("%g", 0.)));
EXPECT_STREQ("-0", gc(xasprintf("%g", -0.)));