generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-06-08 01:24:57 +02:00
Code Issues Projects Releases Wiki Activity

Simplify Reader::decodeNumber()

Browse Source
This commit is contained in:
datadiode 2015-01-17 13:21:42 +01:00
parent 8f3aa220db
commit 50753bb808
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib_json/json_reader.cpp
View File

@ -517,13 +517,6 @@ bool Reader::decodeNumber(Token& token) {
} }
bool Reader::decodeNumber(Token& token, Value& decoded) { bool Reader::decodeNumber(Token& token, Value& decoded) {
bool isDouble = false;
for (Location inspect = token.start_; inspect != token.end_; ++inspect) {
isDouble = isDouble || in(*inspect, '.', 'e', 'E', '+') ||
(*inspect == '-' && inspect != token.start_);
}
if (isDouble)
return decodeDouble(token, decoded);
// Attempts to parse the number as an integer. If the number is // Attempts to parse the number as an integer. If the number is
// larger than the maximum supported value of an integer then // larger than the maximum supported value of an integer then
// we decode the number as a double. // we decode the number as a double.
@ -531,6 +524,7 @@ bool Reader::decodeNumber(Token& token, Value& decoded) {
bool isNegative = *current == '-'; bool isNegative = *current == '-';
if (isNegative) if (isNegative)
++current; ++current;
// TODO: Help the compiler do the div and mod at compile time or get rid of them.
Value::LargestUInt maxIntegerValue = Value::LargestUInt maxIntegerValue =
isNegative ? Value::LargestUInt(-Value::minLargestInt) isNegative ? Value::LargestUInt(-Value::minLargestInt)
: Value::maxLargestUInt; : Value::maxLargestUInt;
@ -539,9 +533,7 @@ bool Reader::decodeNumber(Token& token, Value& decoded) {
while (current < token.end_) { while (current < token.end_) {
Char c = *current++; Char c = *current++;
if (c < '0' || c > '9') if (c < '0' || c > '9')
return addError("'" + std::string(token.start_, token.end_) + return decodeDouble(token, decoded);
"' is not a number.",
token);
Value::UInt digit(c - '0'); Value::UInt digit(c - '0');
if (value >= threshold) { if (value >= threshold) {
// We've hit or exceeded the max value divided by 10 (rounded down). If // We've hit or exceeded the max value divided by 10 (rounded down). If