generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-01-31 14:39:52 +01:00
Code Issues Projects Releases Wiki Activity

from Itzik S; see issue #28

Browse Source 
with minor corrections
This commit is contained in:
Christopher Dunn 2015-01-20 16:24:11 -06:00
parent 9de2c2d84d
commit e87e41cdb0
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/json/value.h
View File

@ -400,8 +400,7 @@ Json::Value obj_value(Json::objectValue); // {}
O(n) expensive operations. O(n) expensive operations.
Update 'removed' iff removed. Update 'removed' iff removed.
(This is a better pattern than removeMember().) (This is a better pattern than removeMember().)
JSON_FAIL if !isValidIndex(i) or if not arrayObject \return true iff removed (no exceptions)
\return true iff removed
*/ */
bool removeIndex(ArrayIndex i, Value* removed); bool removeIndex(ArrayIndex i, Value* removed);

30
src/lib_json/json_value.cpp
View File

@ -1018,12 +1018,32 @@ Value Value::removeMember(const std::string& key) {
return removeMember(key.c_str()); return removeMember(key.c_str());
} }
bool Value::removeIndex(ArrayIndex i, Value* removed) { bool Value::removeIndex(ArrayIndex index, Value* removed) {
JSON_ASSERT_MESSAGE(this->type_ == arrayValue, if (this->type_ != arrayValue) {
"in Json::Value::removeIndex(): requires arrayValue"); return false;
JSON_ASSERT_MESSAGE(this->isValidIndex(i), }
"invalid index i=" << i << " for array of size " << this->size()); #ifdef JSON_VALUE_USE_INTERNAL_MAP
JSON_FAIL_MESSAGE("removeIndex is not implemented for ValueInternalArray.");
return false;
#else
CZString key(index);
ObjectValues::iterator it = this->value_.map_->find(key);
if (it == this->value_.map_->end()) {
return false;
}
*removed = it->second;
ArrayIndex oldSize = this->size();
// shift left all items left, into the place of the "removed"
for (ArrayIndex i=index; i<oldSize-1; i++){
CZString key(i);
(*this->value_.map_)[key] = (*this)[i+1];
}
// erase the last one ("leftover")
CZString keyLast(oldSize-1);
ObjectValues::iterator itLast = this->value_.map_->find(keyLast);
this->value_.map_->erase(itLast);
return true; return true;
#endif
} }
#ifdef JSON_USE_CPPTL #ifdef JSON_USE_CPPTL