Parse JSON as structure #365

This commit is contained in:
Alex Fabijanic
2014-03-07 20:45:32 -06:00
parent 60e0b3f9d6
commit e3d7fc104e
2 changed files with 20 additions and 16 deletions

View File

@@ -788,7 +788,11 @@ inline bool Var::isEmpty() const
inline bool Var::isArray() const
{
return !isEmpty() && !isString();
if (isEmpty() ||
isString()) return false;
VarHolder* pHolder = content();
return pHolder ? pHolder->isArray() : false;
}

View File

@@ -1863,22 +1863,22 @@ void VarTest::testIsArray()
assert (!d0.isArray());
assert (!d1.isArray());
assert (d2.isArray());
assert (d3.isArray());
assert (d4.isArray());
assert (d5.isArray());
assert (d6.isArray());
assert (d7.isArray());
assert (d8.isArray());
assert (d9.isArray());
assert (d10.isArray());
assert (d11.isArray());
assert (d12.isArray());
assert (d13.isArray());
assert (d14.isArray());
assert (d15.isArray());
assert (!d2.isArray());
assert (!d3.isArray());
assert (!d4.isArray());
assert (!d5.isArray());
assert (!d6.isArray());
assert (!d7.isArray());
assert (!d8.isArray());
assert (!d9.isArray());
assert (!d10.isArray());
assert (!d11.isArray());
assert (!d12.isArray());
assert (!d13.isArray());
assert (!d14.isArray());
assert (!d15.isArray());
assert (d16.isArray());
assert (d17.isArray());
assert (!d17.isArray());
}