outman/jsoncpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR changes: add document of makeCharReader, revert changes made by reformat.sh script

Browse Source
This commit is contained in:
Assaf Passal 2022-08-05 15:41:07 +03:00
parent f2ec46663f
commit d60e466dd1
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/json/reader.h
View File

@ -271,6 +271,10 @@ public:
* \throw std::exception if something goes wrong (e.g. invalid settings) * \throw std::exception if something goes wrong (e.g. invalid settings)
*/ */
virtual CharReader* newCharReader() const = 0; virtual CharReader* newCharReader() const = 0;
/** \brief Allocate a CharReader via newCharReader().
* wrap the object in std::unique_ptr<CharReader> to esnure deletion.
* \throw std::exception if something goes wrong (e.g. invalid settings)
*/
std::unique_ptr<CharReader> makeCharReader() const; std::unique_ptr<CharReader> makeCharReader() const;
}; // Factory }; // Factory
}; // CharReader }; // CharReader

5
src/lib_json/json_reader.cpp
View File

@ -608,7 +608,7 @@ bool Reader::decodeDouble(Token& token, Value& decoded) {
value = -std::numeric_limits<double>::infinity(); value = -std::numeric_limits<double>::infinity();
else if (!std::isinf(value)) else if (!std::isinf(value))
return addError( return addError(
"'" + String(token.start_, token.end_) + "' is not a number.", token); "'" + String(token.start_, token.end_) + "' is not a number.", token);
} }
decoded = value; decoded = value;
return true; return true;
@ -1660,7 +1660,7 @@ bool OurReader::decodeDouble(Token& token, Value& decoded) {
value = -std::numeric_limits<double>::infinity(); value = -std::numeric_limits<double>::infinity();
else if (!std::isinf(value)) else if (!std::isinf(value))
return addError( return addError(
"'" + String(token.start_, token.end_) + "' is not a number.", token); "'" + String(token.start_, token.end_) + "' is not a number.", token);
} }
decoded = value; decoded = value;
return true; return true;
@ -1895,7 +1895,6 @@ public:
CharReaderBuilder::CharReaderBuilder() { setDefaults(&settings_); } CharReaderBuilder::CharReaderBuilder() { setDefaults(&settings_); }
CharReaderBuilder::~CharReaderBuilder() = default; CharReaderBuilder::~CharReaderBuilder() = default;
CharReader* CharReaderBuilder::newCharReader() const { CharReader* CharReaderBuilder::newCharReader() const {
bool collectComments = settings_["collectComments"].asBool(); bool collectComments = settings_["collectComments"].asBool();
OurFeatures features = OurFeatures::all(); OurFeatures features = OurFeatures::all();

5
src/lib_json/json_writer.cpp
View File

@ -132,9 +132,8 @@ String valueToString(double value, bool useSpecialFloats,
if (!isfinite(value)) { if (!isfinite(value)) {
static const char* const reps[2][3] = {{"NaN", "-Infinity", "Infinity"}, static const char* const reps[2][3] = {{"NaN", "-Infinity", "Infinity"},
{"null", "-1e+9999", "1e+9999"}}; {"null", "-1e+9999", "1e+9999"}};
return reps[useSpecialFloats ? 0 : 1][isnan(value) ? 0 return reps[useSpecialFloats ? 0 : 1]
: (value < 0) ? 1 [isnan(value) ? 0 : (value < 0) ? 1 : 2];
: 2];
} }
String buffer(size_t(36), '\0'); String buffer(size_t(36), '\0');