1
0
Fork 0

fix(printf): remove float comparison

Add more float test cases
development v3.1.4
Marco Paland 6 years ago
parent e9375ed897
commit 369b7bbc98

@ -363,11 +363,7 @@ static size_t _ftoa(out_fct_type out, char* buffer, size_t idx, size_t maxlen, d
if (prec == 0U) {
diff = value - (double)whole;
if (diff > 0.5) {
// greater than 0.5, round up, e.g. 1.6 -> 2
++whole;
}
else if ((diff == 0.5) && (whole & 1)) {
if ((!(diff < 0.5) || (diff > 0.5)) && (whole & 1)) {
// exactly 0.5 and ODD, then round up
// 1.5 -> 2, but 2.5 -> 2
++whole;

@ -1036,6 +1036,15 @@ TEST_CASE("float", "[]" ) {
test::sprintf(buffer, "%.0f", 34.1415354);
REQUIRE(!strcmp(buffer, "34"));
test::sprintf(buffer, "%.0f", 1.3);
REQUIRE(!strcmp(buffer, "1"));
test::sprintf(buffer, "%.0f", 1.55);
REQUIRE(!strcmp(buffer, "2"));
test::sprintf(buffer, "%.1f", 1.64);
REQUIRE(!strcmp(buffer, "1.6"));
test::sprintf(buffer, "%.2f", 42.8952);
REQUIRE(!strcmp(buffer, "42.90"));
@ -1082,6 +1091,9 @@ TEST_CASE("float", "[]" ) {
test::sprintf(buffer, "%.0f", 3.5);
REQUIRE(!strcmp(buffer, "4"));
test::sprintf(buffer, "%.0f", 4.5);
REQUIRE(!strcmp(buffer, "4"));
test::sprintf(buffer, "%.0f", 3.49);
REQUIRE(!strcmp(buffer, "3"));

Loading…
Cancel
Save