bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-16 03:52:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed inner object bug

Browse Source
This commit is contained in:
Benoit Blanchon
2014-09-28 21:04:59 +02:00
parent bc44c36385
commit e190b20ae1
5 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
srcs/JsonValue.cpp
View File

@ -36,40 +36,62 @@ void JsonValue::operator=(int value)
void JsonValue::operator=(const JsonObject& object)
{
if (!_node) return;
if (_node)
{
_node->type = JSON_PROXY;
_node->content.asProxy.target = object._node;
}
_node = object._node;
}
JsonValue::operator bool() const
{
if (!_node || _node->type != JSON_BOOLEAN) return 0;
const JsonNode* node = getActualNode();
return _node->content.asBoolean;
if (!node || node->type != JSON_BOOLEAN) return 0;
return node->content.asBoolean;
}
JsonValue::operator char const*() const
{
if (!_node || _node->type != JSON_STRING) return 0;
const JsonNode* node = getActualNode();
return _node->content.asString;
if (!node || node->type != JSON_STRING) return 0;
return node->content.asString;
}
JsonValue::operator double() const
{
if (!_node || _node->type < JSON_DOUBLE_0_DECIMALS) return 0;
const JsonNode* node = getActualNode();
return _node->content.asDouble;
if (!node || node->type < JSON_DOUBLE_0_DECIMALS) return 0;
return node->content.asDouble;
}
JsonValue::operator int() const
{
if (!_node || _node->type != JSON_INTEGER) return 0;
const JsonNode* node = getActualNode();
return _node->content.asInteger;
if (!node || node->type != JSON_INTEGER) return 0;
return node->content.asInteger;
}
JsonValue::operator JsonObject() const
{
return JsonObject(_node);
return JsonObject(getActualNode());
}
JsonNode* JsonValue::getActualNode() const
{
JsonNode* target = _node;
while (target && target->type == JSON_PROXY)
target = target->content.asProxy.target;
return target;
}