few cosmetic changes

This commit is contained in:
aleks-f
2012-12-03 20:35:49 -06:00
parent a02eeb6638
commit 1138f439af
3 changed files with 15 additions and 13 deletions

View File

@@ -134,11 +134,8 @@ public:
return value; return value;
} }
void add(const Dynamic::Var& value) void add(const Dynamic::Var& value);
/// Add the given value to the array /// Add the given value to the array
{
_values.push_back(value);
}
void stringify(std::ostream& out, unsigned int indent) const; void stringify(std::ostream& out, unsigned int indent) const;
/// Prints the array to out. When indent is 0, the array /// Prints the array to out. When indent is 0, the array
@@ -178,14 +175,9 @@ inline bool Array::isArray(unsigned int index) const
} }
inline bool Array::isNull(unsigned int index) const inline void Array::add(const Dynamic::Var& value)
{ {
if ( index < _values.size() ) _values.push_back(value);
{
Dynamic::Var value = _values[index];
return value.isEmpty();
}
return true;
} }

View File

@@ -118,8 +118,7 @@ public:
{ {
T value = def; T value = def;
ValueMap::const_iterator it = _values.find(key); ValueMap::const_iterator it = _values.find(key);
if ( it != _values.end() if (it != _values.end() && ! it->second.isEmpty() )
&& ! it->second.isEmpty() )
{ {
try try
{ {

View File

@@ -102,6 +102,17 @@ Object::Ptr Array::getObject(unsigned int index) const
} }
bool Array::isNull(unsigned int index) const
{
if ( index < _values.size() )
{
Dynamic::Var value = _values[index];
return value.isEmpty();
}
return true;
}
bool Array::isObject(unsigned int index) const bool Array::isObject(unsigned int index) const
{ {
Var value = get(index); Var value = get(index);