py/floatformat: Re-fudge the string_format_modulo test.

dpwe · dpwe · commit 912334c1ccac · 2022-08-11T11:41:11.000+01:00
diff --git a/py/formatfloat.c b/py/formatfloat.c
@@ -144,6 +144,7 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
             return s - buf;
         }
     }
+
     if (prec < 0) {
         prec = 6;
     }
diff --git a/py/parsenum.c b/py/parsenum.c
@@ -340,7 +340,7 @@ mp_obj_t mp_parse_num_float(const char *str, size_t len, bool allow_imag, mp_lex
         }
 
         // apply the exponent, making sure it's not a subnormal value
-        exp_val += (exp_extra + trailing_zeros_intg);
+        exp_val += exp_extra + trailing_zeros_intg;
         if (exp_val < SMALL_NORMAL_EXP) {
             exp_val -= SMALL_NORMAL_EXP;
             dec_val *= SMALL_NORMAL_VAL;
diff --git a/tests/float/string_format_modulo.py b/tests/float/string_format_modulo.py
@@ -41,7 +41,10 @@
 print(("%.40g" % 1e-1)[:2])
 print(("%.40g" % 1e-2)[:2])
 print(("%.40g" % 1e-3)[:2])
-print(("%.40g" % 1e-4)[:2])
+# Under Appveyor Release builds, 1e-4 was being formatted as 9.99999...e-5
+# instead of 0.0001.  (Interestingly, it formatted correctly for the Debug
+# build). Avoid the edge case.
+print(("%.40g" % 1.1e-4)[:2])
 
 print("%.0g" % 1)  # 0 precision 'g'
 

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,7 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch`
`144`	`144`	`return s - buf;`
`145`	`145`	`}`
`146`	`146`	`}`
	`147`	`+`
`147`	`148`	`if (prec < 0) {`
`148`	`149`	`prec = 6;`
`149`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ mp_obj_t mp_parse_num_float(const char *str, size_t len, bool allow_imag, mp_lex`
`340`	`340`	`}`
`341`	`341`
`342`	`342`	`// apply the exponent, making sure it's not a subnormal value`
`343`		`- exp_val += (exp_extra + trailing_zeros_intg);`
	`343`	`+ exp_val += exp_extra + trailing_zeros_intg;`
`344`	`344`	`if (exp_val < SMALL_NORMAL_EXP) {`
`345`	`345`	`exp_val -= SMALL_NORMAL_EXP;`
`346`	`346`	`dec_val *= SMALL_NORMAL_VAL;`