Untabified some sources

This commit is contained in:
Baptiste Lepilleur 2011-05-02 18:41:01 +00:00
parent fb17080142
commit e3cc0f004b
5 changed files with 35 additions and 35 deletions

View File

@ -197,11 +197,11 @@ namespace Json {
Result: Result:
\verbatim \verbatim
{ {
"dir": { "dir": {
"file": { "file": {
// The input stream JSON would be nested here. // The input stream JSON would be nested here.
} }
} }
} }
\endverbatim \endverbatim
\throw std::exception on parse error. \throw std::exception on parse error.

View File

@ -132,30 +132,30 @@ namespace Json {
typedef Json::UInt64 UInt64; typedef Json::UInt64 UInt64;
typedef Json::Int64 Int64; typedef Json::Int64 Int64;
#endif // defined(JSON_HAS_INT64) #endif // defined(JSON_HAS_INT64)
typedef Json::LargestInt LargestInt; typedef Json::LargestInt LargestInt;
typedef Json::LargestUInt LargestUInt; typedef Json::LargestUInt LargestUInt;
typedef Json::ArrayIndex ArrayIndex; typedef Json::ArrayIndex ArrayIndex;
static const Value null; static const Value null;
/// Minimum signed integer value that can be stored in a Json::Value. /// Minimum signed integer value that can be stored in a Json::Value.
static const LargestInt minLargestInt; static const LargestInt minLargestInt;
/// Maximum signed integer value that can be stored in a Json::Value. /// Maximum signed integer value that can be stored in a Json::Value.
static const LargestInt maxLargestInt; static const LargestInt maxLargestInt;
/// Maximum unsigned integer value that can be stored in a Json::Value. /// Maximum unsigned integer value that can be stored in a Json::Value.
static const LargestUInt maxLargestUInt; static const LargestUInt maxLargestUInt;
/// Minimum signed int value that can be stored in a Json::Value. /// Minimum signed int value that can be stored in a Json::Value.
static const Int minInt; static const Int minInt;
/// Maximum signed int value that can be stored in a Json::Value. /// Maximum signed int value that can be stored in a Json::Value.
static const Int maxInt; static const Int maxInt;
/// Maximum unsigned int value that can be stored in a Json::Value. /// Maximum unsigned int value that can be stored in a Json::Value.
static const UInt maxUInt; static const UInt maxUInt;
/// Minimum signed 64 bits int value that can be stored in a Json::Value. /// Minimum signed 64 bits int value that can be stored in a Json::Value.
static const Int64 minInt64; static const Int64 minInt64;
/// Maximum signed 64 bits int value that can be stored in a Json::Value. /// Maximum signed 64 bits int value that can be stored in a Json::Value.
static const Int64 maxInt64; static const Int64 maxInt64;
/// Maximum unsigned 64 bits int value that can be stored in a Json::Value. /// Maximum unsigned 64 bits int value that can be stored in a Json::Value.
static const UInt64 maxUInt64; static const UInt64 maxUInt64;
private: private:
@ -202,14 +202,14 @@ namespace Json {
To create an empty array, pass arrayValue. To create an empty array, pass arrayValue.
To create an empty object, pass objectValue. To create an empty object, pass objectValue.
Another Value can then be set to this one by assignment. Another Value can then be set to this one by assignment.
This is useful since clear() and resize() will not alter types. This is useful since clear() and resize() will not alter types.
Examples: Examples:
\code \code
Json::Value null_value; // null Json::Value null_value; // null
Json::Value arr_value(Json::arrayValue); // [] Json::Value arr_value(Json::arrayValue); // []
Json::Value obj_value(Json::objectValue); // {} Json::Value obj_value(Json::objectValue); // {}
\endcode \endcode
*/ */
Value( ValueType type = nullValue ); Value( ValueType type = nullValue );
Value( Int value ); Value( Int value );
@ -315,24 +315,24 @@ namespace Json {
/// this from the operator[] which takes a string.) /// this from the operator[] which takes a string.)
Value &operator[]( ArrayIndex index ); Value &operator[]( ArrayIndex index );
/// Access an array element (zero based index ). /// Access an array element (zero based index ).
/// If the array contains less than index element, then null value are inserted /// If the array contains less than index element, then null value are inserted
/// in the array so that its size is index+1. /// in the array so that its size is index+1.
/// (You may need to say 'value[0u]' to get your compiler to distinguish /// (You may need to say 'value[0u]' to get your compiler to distinguish
/// this from the operator[] which takes a string.) /// this from the operator[] which takes a string.)
Value &operator[]( int index ); Value &operator[]( int index );
/// Access an array element (zero based index ) /// Access an array element (zero based index )
/// (You may need to say 'value[0u]' to get your compiler to distinguish /// (You may need to say 'value[0u]' to get your compiler to distinguish
/// this from the operator[] which takes a string.) /// this from the operator[] which takes a string.)
const Value &operator[]( ArrayIndex index ) const; const Value &operator[]( ArrayIndex index ) const;
/// Access an array element (zero based index ) /// Access an array element (zero based index )
/// (You may need to say 'value[0u]' to get your compiler to distinguish /// (You may need to say 'value[0u]' to get your compiler to distinguish
/// this from the operator[] which takes a string.) /// this from the operator[] which takes a string.)
const Value &operator[]( int index ) const; const Value &operator[]( int index ) const;
/// If the array contains at least index+1 elements, returns the element value, /// If the array contains at least index+1 elements, returns the element value,
/// otherwise returns defaultValue. /// otherwise returns defaultValue.
Value get( ArrayIndex index, Value get( ArrayIndex index,
const Value &defaultValue ) const; const Value &defaultValue ) const;

View File

@ -488,7 +488,7 @@ Reader::readObject( Token &/*tokenStart*/ )
if ( !readToken( comma ) if ( !readToken( comma )
|| ( comma.type_ != tokenObjectEnd && || ( comma.type_ != tokenObjectEnd &&
comma.type_ != tokenArraySeparator && comma.type_ != tokenArraySeparator &&
comma.type_ != tokenComment ) ) comma.type_ != tokenComment ) )
{ {
return addErrorAndRecover( "Missing ',' or '}' in object declaration", return addErrorAndRecover( "Missing ',' or '}' in object declaration",
comma, comma,

View File

@ -827,9 +827,9 @@ LargestInt
Value::asLargestInt() const Value::asLargestInt() const
{ {
#if defined(JSON_NO_INT64) #if defined(JSON_NO_INT64)
return asInt(); return asInt();
#else #else
return asInt64(); return asInt64();
#endif #endif
} }
@ -838,9 +838,9 @@ LargestUInt
Value::asLargestUInt() const Value::asLargestUInt() const
{ {
#if defined(JSON_NO_INT64) #if defined(JSON_NO_INT64)
return asUInt(); return asUInt();
#else #else
return asUInt64(); return asUInt64();
#endif #endif
} }

View File

@ -656,7 +656,7 @@ StyledStreamWriter::writeArrayValue( const Value &value )
writeWithIndent( childValues_[index] ); writeWithIndent( childValues_[index] );
else else
{ {
writeIndent(); writeIndent();
writeValue( childValue ); writeValue( childValue );
} }
if ( ++index == size ) if ( ++index == size )