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

- Array index can be passed as int to operator[], allowing use of literal:

Browse Source 
Json::Value array;
  array.append( 1234 );
  int value = array[0].asInt();  // did not compile previously
This commit is contained in:
Baptiste Lepilleur
2010-12-24 12:47:14 +00:00
parent e6046e589e
commit fa130ef871
6 changed files with 56 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/jsontestrunner/main.cpp
View File

@@ -3,6 +3,10 @@
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
/* This executable is used for testing parser/writer using real JSON files.
*/
#include <json/json.h>
#include <algorithm> // sort
#include <stdio.h>

16
src/lib_json/json_value.cpp
View File

@@ -975,6 +975,14 @@ Value::operator[]( ArrayIndex index )
}
Value &
Value::operator[]( int index )
{
JSON_ASSERT( index >= 0 );
return (*this)[ ArrayIndex(index) ];
}
const Value &
Value::operator[]( ArrayIndex index ) const
{
@@ -994,6 +1002,14 @@ Value::operator[]( ArrayIndex index ) const
}
const Value &
Value::operator[]( int index ) const
{
JSON_ASSERT( index >= 0 );
return (*this)[ ArrayIndex(index) ];
}
Value &
Value::operator[]( const char *key )
{

2
src/test_lib_json/jsontest.h
View File

@@ -199,7 +199,7 @@ namespace JsonTest {
/// JSONTEST_ASSERT( x == y ) << "x=" << x << ", y=" << y;
/// JSONTEST_ASSERT( x == y );
#define JSONTEST_ASSERT( expr ) \
if ( condition ) \
if ( expr ) \
{ \
} \
else \

14
src/test_lib_json/main.cpp
View File

@@ -172,6 +172,18 @@ JSONTEST_FIXTURE( ValueTest, isUInt )
}
JSONTEST_FIXTURE( ValueTest, accessArray )
{
const unsigned int index0 = 0;
JSONTEST_ASSERT( Json::Value(1234) == array1_[index0] ) << "Json::Value::operator[ArrayIndex]";
JSONTEST_ASSERT( Json::Value(1234) == array1_[0] ) << "Json::Value::operator[int]";
const Json::Value &constArray = array1_;
JSONTEST_ASSERT( Json::Value(1234) == constArray[index0] ) << "Json::Value::operator[ArrayIndex] const";
JSONTEST_ASSERT( Json::Value(1234) == constArray[0] ) << "Json::Value::operator[int] const";
}
void
ValueTest::checkConstMemberCount( const Json::Value &value, unsigned int expectedCount )
{
@@ -245,5 +257,7 @@ int main( int argc, const char *argv[] )
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isDouble );
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isString );
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isNull );
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isNull );
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, accessArray );
return runner.runCommandLine( argc, argv );
}