fix(printf): remove float comparison

Add more float test cases

2 files changed, 13 insertions, 5 deletions

diff --git a/printf.c b/printf.c
index e9d714a..ed2b3ba 100644
--- a/printf.c
+++ b/printf.c
@@ -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;

diff --git a/test/test_suite.cpp b/test/test_suite.cpp
index e3630d7..00e5f48 100644
--- a/test/test_suite.cpp
+++ b/test/test_suite.cpp
@@ -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"));