open-source-parsers/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-10-23 10:28:11 +08:00
Code Issues Releases Wiki Activity

Added structured error reporting to Reader.

Browse Source 
This allows applications for interactively viewing or editing JSON to do
a better job of highlighting errors. Also added offset accessors to
Value, offering the same sort of functionality even for non-errors.

Thanks to Zach Clifford (zacharyc@google.com) for the patch.
This commit is contained in:
Aaron Jacobs
2014-04-23 23:41:12 +00:00
parent 642befc836
commit 68db655347
5 changed files with 269 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/lib_json/json_value.cpp
View File

@@ -274,6 +274,8 @@ Value::Value( ValueType type )
, itemIsUsed_( 0 )
#endif
, comments_( 0 )
, start_( 0 )
, limit_( 0 )
{
switch ( type )
{
@@ -318,6 +320,8 @@ Value::Value( UInt value )
, itemIsUsed_( 0 )
#endif
, comments_( 0 )
, start_( 0 )
, limit_( 0 )
{
value_.uint_ = value;
}
@@ -329,6 +333,8 @@ Value::Value( Int value )
, itemIsUsed_( 0 )
#endif
, comments_( 0 )
, start_( 0 )
, limit_( 0 )
{
value_.int_ = value;
}
@@ -342,6 +348,8 @@ Value::Value( Int64 value )
, itemIsUsed_( 0 )
#endif
, comments_( 0 )
, start_( 0 )
, limit_( 0 )
{
value_.int_ = value;
}
@@ -354,6 +362,8 @@ Value::Value( UInt64 value )
, itemIsUsed_( 0 )
#endif
, comments_( 0 )
, start_( 0 )
, limit_( 0 )
{
value_.uint_ = value;
}
@@ -366,6 +376,8 @@ Value::Value( double value )
, itemIsUsed_( 0 )
#endif
, comments_( 0 )
, start_( 0 )
, limit_( 0 )
{
value_.real_ = value;
}
@@ -377,6 +389,8 @@ Value::Value( const char *value )
, itemIsUsed_( 0 )
#endif
, comments_( 0 )
, start_( 0 )
, limit_( 0 )
{
value_.string_ = duplicateStringValue( value );
}
@@ -390,6 +404,8 @@ Value::Value( const char *beginValue,
, itemIsUsed_( 0 )
#endif
, comments_( 0 )
, start_( 0 )
, limit_( 0 )
{
value_.string_ = duplicateStringValue( beginValue,
(unsigned int)(endValue - beginValue) );
@@ -403,6 +419,8 @@ Value::Value( const std::string &value )
, itemIsUsed_( 0 )
#endif
, comments_( 0 )
, start_( 0 )
, limit_( 0 )
{
value_.string_ = duplicateStringValue( value.c_str(),
(unsigned int)value.length() );
@@ -416,6 +434,8 @@ Value::Value( const StaticString &value )
, itemIsUsed_( 0 )
#endif
, comments_( 0 )
, start_( 0 )
, limit_( 0 )
{
value_.string_ = const_cast<char *>( value.c_str() );
}
@@ -429,6 +449,8 @@ Value::Value( const CppTL::ConstString &value )
, itemIsUsed_( 0 )
#endif
, comments_( 0 )
, start_( 0 )
, limit_( 0 )
{
value_.string_ = duplicateStringValue( value, value.length() );
}
@@ -441,6 +463,8 @@ Value::Value( bool value )
, itemIsUsed_( 0 )
#endif
, comments_( 0 )
, start_( 0 )
, limit_( 0 )
{
value_.bool_ = value;
}
@@ -453,6 +477,8 @@ Value::Value( const Value &other )
, itemIsUsed_( 0 )
#endif
, comments_( 0 )
, start_( other.start_ )
, limit_( other.limit_ )
{
switch ( type_ )
{
@@ -557,6 +583,8 @@ Value::swap( Value &other )
int temp2 = allocated_;
allocated_ = other.allocated_;
other.allocated_ = temp2;
std::swap( start_, other.start_ );
std::swap( limit_, other.limit_ );
}
ValueType
@@ -1027,7 +1055,8 @@ void
Value::clear()
{
JSON_ASSERT_MESSAGE( type_ == nullValue || type_ == arrayValue || type_ == objectValue, "in Json::Value::clear(): requires complex value" );
start_ = 0;
limit_ = 0;
switch ( type_ )
{
#ifndef JSON_VALUE_USE_INTERNAL_MAP
@@ -1556,6 +1585,34 @@ Value::getComment( CommentPlacement placement ) const
}
void
Value::setOffsetStart( size_t start )
{
start_ = start;
}
void
Value::setOffsetLimit( size_t limit )
{
limit_ = limit;
}
size_t
Value::getOffsetStart() const
{
return start_;
}
size_t
Value::getOffsetLimit() const
{
return limit_;
}
std::string
Value::toStyledString() const
{