feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Added a line-break after each "if" to get more accurate coverage report

Browse Source
This commit is contained in:
Benoit Blanchon
2020-02-16 15:05:23 +01:00
parent 8f8c82d400
commit 0814fc185f
38 changed files with 429 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ArduinoJson/Numbers/parseNumber.hpp
View File

@ -73,7 +73,8 @@ inline ParsedNumber<TFloat, TUInt> parseNumber(const char *s) {
}
#if ARDUINOJSON_ENABLE_NAN
if (*s == 'n' || *s == 'N') return traits::nan();
if (*s == 'n' || *s == 'N')
return traits::nan();
#endif
#if ARDUINOJSON_ENABLE_INFINITY
@ -81,7 +82,8 @@ inline ParsedNumber<TFloat, TUInt> parseNumber(const char *s) {
return is_negative ? -traits::inf() : traits::inf();
#endif
if (!isdigit(*s) && *s != '.') return return_type();
if (!isdigit(*s) && *s != '.')
return return_type();
mantissa_t mantissa = 0;
exponent_t exponent_offset = 0;
@ -89,14 +91,17 @@ inline ParsedNumber<TFloat, TUInt> parseNumber(const char *s) {
while (isdigit(*s)) {
uint8_t digit = uint8_t(*s - '0');
if (mantissa > maxUint / 10) break;
if (mantissa > maxUint / 10)
break;
mantissa *= 10;
if (mantissa > maxUint - digit) break;
if (mantissa > maxUint - digit)
break;
mantissa += digit;
s++;
}
if (*s == '\0') return return_type(TUInt(mantissa), is_negative);
if (*s == '\0')
return return_type(TUInt(mantissa), is_negative);
// avoid mantissa overflow
while (mantissa > traits::mantissa_max) {
@ -142,12 +147,14 @@ inline ParsedNumber<TFloat, TUInt> parseNumber(const char *s) {
}
s++;
}
if (negative_exponent) exponent = -exponent;
if (negative_exponent)
exponent = -exponent;
}
exponent += exponent_offset;
// we should be at the end of the string, otherwise it's an error
if (*s != '\0') return return_type();
if (*s != '\0')
return return_type();
TFloat result = traits::make_float(static_cast<TFloat>(mantissa), exponent);