Skip to content

Test Stream::parseFloat() with many input digits #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 25, 2021
Merged

Test Stream::parseFloat() with many input digits #133

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
129ae52
Test Stream::parseFloat() with many digits
edgar-bonet Dec 10, 2020
8eb4013
Use Approx() macro for fuzzy comparison
edgar-bonet Dec 11, 2020
5445db3
Test Stream::parseFloat() with a large number
edgar-bonet Dec 11, 2020
fae13e5
Exchanging the type of 'value' from 'long' to 'double' prevents overf…
aentinger Dec 14, 2020
1266b08
Replacing computational expensive pow call with result of accumulated…
aentinger Dec 14, 2020
91c5e29
Test Stream::parseFloat() with a huge number of digits
edgar-bonet Jan 25, 2021
6197511
Avoid overflowing parseFloat()'s internal 'value'
edgar-bonet Jan 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions api/Stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ float Stream::parseFloat(LookaheadMode lookahead, char ignore)
{
bool isNegative = false;
bool isFraction = false;
long value = 0;
double value = 0.0;
int c;
float fraction = 1.0;
double fraction = 1.0;

c = peekNextDigit(lookahead, true);
// ignore non numeric leading characters
Expand All @@ -190,10 +190,11 @@ float Stream::parseFloat(LookaheadMode lookahead, char ignore)

if(isNegative)
value = -value;

if(isFraction)
return value * fraction;
else
return value;
value *= fraction;

return value;
}

// read characters from stream into buffer
Expand Down
12 changes: 12 additions & 0 deletions test/src/Stream/test_parseFloat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#include <StreamMock.h>

#include <float.h>

/**************************************************************************************
* TEST CODE
**************************************************************************************/
Expand Down Expand Up @@ -43,6 +45,16 @@ TEST_CASE ("Testing parseFloat(LookaheadMode lookahead = SKIP_ALL, char ignore =
mock << "\r\n\t 12.34";
REQUIRE(mock.parseFloat() == 12.34f);
}
WHEN ("A float is provided with too many digits after the decimal point")
{
mock << "3.1415926535897932384";
REQUIRE(mock.parseFloat() == Approx(3.141592654f));
}
WHEN ("A float is larger than LONG_MAX")
{
mock << "602200000000000000000000.00";
REQUIRE(mock.parseFloat() == Approx(6.022e23f));
}
}

TEST_CASE ("Testing parseFloat(LookaheadMode lookahead = SKIP_NONE, char ignore = NO_IGNORE_CHAR)", "[Stream-parseFloat-02]")
Expand Down