3party/jsoncpp
0
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-01-15 02:17:55 +08:00
Code Issues Projects Releases Wiki Activity

Centralized assertion macros and made them obey JSON_USE_EXCEPTION.

Browse Source
This commit is contained in:
Aaron Jacobs 2011-05-24 01:03:22 +00:00
parent a77a803c85
commit e3d0eca9f4
4 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/json/assertions.h Normal file
View File

@ -0,0 +1,23 @@
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#ifndef CPPTL_JSON_ASSERTIONS_H_INCLUDED
# define CPPTL_JSON_ASSERTIONS_H_INCLUDED
#if !defined(JSON_IS_AMALGAMATION)
# include <json/config.h>
#endif // if !defined(JSON_IS_AMALGAMATION)
#if defined(JSON_USE_EXCEPTION)
#define JSON_ASSERT( condition ) assert( condition ); // @todo <= change this into an exception throw
#define JSON_FAIL_MESSAGE( message ) throw std::runtime_error( message );
#else // defined(JSON_USE_EXCEPTION)
#define JSON_ASSERT( condition ) assert( condition );
#define JSON_FAIL_MESSAGE( message ) { std::cerr << message; exit(123); }
#endif
#define JSON_ASSERT_MESSAGE( condition, message ) if (!( condition )) { JSON_FAIL_MESSAGE( message ) }
#endif // CPPTL_JSON_ASSERTIONS_H_INCLUDED

6
src/lib_json/json_internalarray.inl
View File

@ -53,8 +53,7 @@ public: // overridden from ValueArrayAllocator
if ( minNewIndexCount > newIndexCount ) if ( minNewIndexCount > newIndexCount )
newIndexCount = minNewIndexCount; newIndexCount = minNewIndexCount;
void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount ); void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount );
if ( !newIndexes ) JSON_ASSERT_MESSAGE(newIndexes, "Couldn't realloc.");
throw std::bad_alloc();
indexCount = newIndexCount; indexCount = newIndexCount;
indexes = static_cast<Value **>( newIndexes ); indexes = static_cast<Value **>( newIndexes );
} }
@ -117,8 +116,7 @@ public: // overridden from ValueArrayAllocator
if ( minNewIndexCount > newIndexCount ) if ( minNewIndexCount > newIndexCount )
newIndexCount = minNewIndexCount; newIndexCount = minNewIndexCount;
void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount ); void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount );
if ( !newIndexes ) JSON_ASSERT_MESSAGE(newIndexes, "Couldn't realloc.");
throw std::bad_alloc();
indexCount = newIndexCount; indexCount = newIndexCount;
indexes = static_cast<Value **>( newIndexes ); indexes = static_cast<Value **>( newIndexes );
} }

4
src/lib_json/json_reader.cpp
View File

@ -4,6 +4,7 @@
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#if !defined(JSON_IS_AMALGAMATION) #if !defined(JSON_IS_AMALGAMATION)
# include <json/assertions.h>
# include <json/reader.h> # include <json/reader.h>
# include <json/value.h> # include <json/value.h>
# include "json_tool.h" # include "json_tool.h"
@ -884,8 +885,7 @@ std::istream& operator>>( std::istream &sin, Value &root )
{ {
Json::Reader reader; Json::Reader reader;
bool ok = reader.parse(sin, root, true); bool ok = reader.parse(sin, root, true);
//JSON_ASSERT( ok ); if (!ok) JSON_FAIL_MESSAGE(reader.getFormattedErrorMessages());
if (!ok) throw std::runtime_error(reader.getFormattedErrorMessages());
return sin; return sin;
} }

4
src/lib_json/json_value.cpp
View File

@ -4,6 +4,7 @@
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#if !defined(JSON_IS_AMALGAMATION) #if !defined(JSON_IS_AMALGAMATION)
# include <json/assertions.h>
# include <json/value.h> # include <json/value.h>
# include <json/writer.h> # include <json/writer.h>
# ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR # ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
@ -21,9 +22,6 @@
#include <cstddef> // size_t #include <cstddef> // size_t
#define JSON_ASSERT_UNREACHABLE assert( false ) #define JSON_ASSERT_UNREACHABLE assert( false )
#define JSON_ASSERT( condition ) assert( condition ); // @todo <= change this into an exception throw
#define JSON_FAIL_MESSAGE( message ) throw std::runtime_error( message );
#define JSON_ASSERT_MESSAGE( condition, message ) if (!( condition )) JSON_FAIL_MESSAGE( message )
namespace Json { namespace Json {