Skip to content
This repository has been archived by the owner on Jul 24, 2022. It is now read-only.

Commit

Permalink
fix(printf): fixed support of NaN
Browse files Browse the repository at this point in the history
(hot) fixes mpaland#37
  • Loading branch information
mpaland committed Jan 26, 2019
1 parent bf72dfb commit 80b42fe
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Therefore I decided to write an own, final implementation which meets the follow
- Support of decimal/floating number representation (with an own fast itoa/ftoa)
- Reentrant and thread-safe, malloc free, no static vars/buffers
- LINT and compiler L4 warning free, mature, coverity clean, automotive ready
- Extensive test suite (> 350 test cases) passing
- Extensive test suite (> 370 test cases) passing
- Simply the best *printf* around the net
- MIT license

Expand Down
14 changes: 12 additions & 2 deletions printf.c
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,14 @@ static size_t _ftoa(out_fct_type out, char* buffer, size_t idx, size_t maxlen, d
// powers of 10
static const double pow10[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000 };

// test for NaN
if (value != value) {
out('n', buffer, idx++, maxlen);
out('a', buffer, idx++, maxlen);
out('n', buffer, idx++, maxlen);
return idx;
}

// test for negative
bool negative = false;
if (value < 0) {
Expand Down Expand Up @@ -341,8 +349,10 @@ static size_t _ftoa(out_fct_type out, char* buffer, size_t idx, size_t maxlen, d
++whole;
}
}
else if ((diff == 0.5) && ((frac == 0U) || (frac & 1U))) {
// if halfway, round up if odd, OR if last digit is 0
else if (diff < 0.5) {
}
else if ((frac == 0U) || (frac & 1U)) {
// if halfway, round up if odd OR if last digit is 0
++frac;
}

Expand Down
4 changes: 4 additions & 0 deletions test/test_suite.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "catch.hpp"

#include <string.h>
#include <math.h>

namespace test {
// use functions in own test namespace to avoid stdio conflicts
Expand Down Expand Up @@ -1019,6 +1020,9 @@ TEST_CASE("length", "[]" ) {
TEST_CASE("float", "[]" ) {
char buffer[100];

test::sprintf(buffer, "%.4f", NAN); // using the NAN macro of math.h
REQUIRE(!strcmp(buffer, "nan"));

test::sprintf(buffer, "%.4f", 3.1415354);
REQUIRE(!strcmp(buffer, "3.1415"));

Expand Down

0 comments on commit 80b42fe

Please sign in to comment.