generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-10-14 23:07:55 +02:00
Code Issues Projects Releases Wiki Activity

use SwapPayload() to retain comments

Browse Source 
All tests pass, but we might be missing coverage.

issue #47
This commit is contained in:
Christopher Dunn
2015-01-20 11:02:22 -06:00
parent 94b0297dc5
commit 66eb72f121
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib_json/json_reader.cpp
View File

@@ -173,9 +173,12 @@ bool Reader::readValue() {
currentValue().setOffsetLimit(token.end_ - begin_);
break;
case tokenNull:
currentValue() = Value();
{
Value v;
currentValue().swapPayload(v);
currentValue().setOffsetStart(token.start_ - begin_);
currentValue().setOffsetLimit(token.end_ - begin_);
}
break;
case tokenArraySeparator:
if (features_.allowDroppedNullPlaceholders_) {
@@ -393,7 +396,8 @@ bool Reader::readString() {
bool Reader::readObject(Token& tokenStart) {
Token tokenName;
std::string name;
currentValue() = Value(objectValue);
Value init(objectValue);
currentValue().swapPayload(init);
currentValue().setOffsetStart(tokenStart.start_ - begin_);
while (readToken(tokenName)) {
bool initialTokenOk = true;
@@ -486,7 +490,7 @@ bool Reader::decodeNumber(Token& token) {
Value decoded;
if (!decodeNumber(token, decoded))
return false;
currentValue() = decoded;
currentValue().swapPayload(decoded);
currentValue().setOffsetStart(token.start_ - begin_);
currentValue().setOffsetLimit(token.end_ - begin_);
return true;

2
src/lib_json/json_value.cpp
View File

@@ -406,7 +406,7 @@ Value::~Value() {
}
Value& Value::operator=(Value other) {
swapPayload(other);
swap(other);
return *this;
}