- added Int/UInt typedef in Json namespace. Modified Value::Int and Value::UInt to be typedef on those. Modified code to use Json::Int instead of Value::Int.

blep · blep · commit 3a1b93be1cb4 · 2010-02-21T14:08:17.000Z
- added Value constructor taking begin/end pointer to initialize the Value with a non-zero terminated string.
diff --git a/include/json/forwards.h b/include/json/forwards.h
@@ -5,14 +5,19 @@
 
 namespace Json {
 
+   // writer.h
    class FastWriter;
-   class Reader;
    class StyledWriter;
 
+   // reader.h
+   class Reader;
+
    // features.h
    class Features;
 
    // value.h
+   typedef int Int;
+   typedef unsigned int UInt;
    class StaticString;
    class Path;
    class PathArgument;
diff --git a/include/json/value.h b/include/json/value.h
@@ -117,10 +117,10 @@ namespace Json {
 # endif
    public:
       typedef std::vector<std::string> Members;
-      typedef int Int;
-      typedef unsigned int UInt;
       typedef ValueIterator iterator;
       typedef ValueConstIterator const_iterator;
+      typedef Json::UInt UInt;
+      typedef Json::Int Int;
       typedef UInt ArrayIndex;
 
       static const Value null;
@@ -186,6 +186,7 @@ namespace Json {
       Value( UInt value );
       Value( double value );
       Value( const char *value );
+      Value( const char *beginValue, const char *endValue );
       /** \brief Constructs a value from a static string.
 
        * Like other value string constructor but do not duplicate the string for
@@ -453,7 +454,7 @@ namespace Json {
       friend class Path;
 
       PathArgument();
-      PathArgument( Value::UInt index );
+      PathArgument( UInt index );
       PathArgument( const char *key );
       PathArgument( const std::string &key );
 
@@ -465,7 +466,7 @@ namespace Json {
          kindKey
       };
       std::string key_;
-      Value::UInt index_;
+      UInt index_;
       Kind kind_;
    };
 
@@ -909,7 +910,7 @@ class DefaultValueArrayAllocator : public ValueArrayAllocator
       Value key() const;
 
       /// Return the index of the referenced Value. -1 if it is not an arrayValue.
-      Value::UInt index() const;
+      UInt index() const;
 
       /// Return the member name of the referenced Value. "" if it is not an objectValue.
       const char *memberName() const;
diff --git a/include/json/writer.h b/include/json/writer.h
@@ -157,8 +157,8 @@ namespace Json {
       bool addChildValues_;
    };
 
-   std::string JSON_API valueToString( Value::Int value );
-   std::string JSON_API valueToString( Value::UInt value );
+   std::string JSON_API valueToString( Int value );
+   std::string JSON_API valueToString( UInt value );
    std::string JSON_API valueToString( double value );
    std::string JSON_API valueToString( bool value );
    std::string JSON_API valueToQuotedString( const char *value );
diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
@@ -20,9 +20,9 @@
 namespace Json {
 
 const Value Value::null;
-const Value::Int Value::minInt = Value::Int( ~(Value::UInt(-1)/2) );
-const Value::Int Value::maxInt = Value::Int( Value::UInt(-1)/2 );
-const Value::UInt Value::maxUInt = Value::UInt(-1);
+const Int Value::minInt = Int( ~(UInt(-1)/2) );
+const Int Value::maxInt = Int( UInt(-1)/2 );
+const UInt Value::maxUInt = UInt(-1);
 
 // A "safe" implementation of strdup. Allow null pointer to be passed. 
 // Also avoid warning on msvc80.
@@ -351,6 +351,21 @@ Value::Value( const char *value )
    value_.string_ = valueAllocator()->duplicateStringValue( value );
 }
 
+
+Value::Value( const char *beginValue, 
+              const char *endValue )
+   : type_( stringValue )
+   , allocated_( true )
+   , comments_( 0 )
+# ifdef JSON_VALUE_USE_INTERNAL_MAP
+   , itemIsUsed_( 0 )
+#endif
+{
+   value_.string_ = valueAllocator()->duplicateStringValue( beginValue, 
+                                                            UInt(endValue - beginValue) );
+}
+
+
 Value::Value( const std::string &value )
    : type_( stringValue )
    , allocated_( true )
diff --git a/src/lib_json/json_valueiterator.inl b/src/lib_json/json_valueiterator.inl
@@ -176,7 +176,7 @@ ValueIteratorBase::key() const
 }
 
 
-Value::UInt 
+UInt 
 ValueIteratorBase::index() const
 {
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
@@ -39,22 +39,22 @@ static void uintToString( unsigned int value,
    while ( value != 0 );
 }
 
-std::string valueToString( Value::Int value )
+std::string valueToString( Int value )
 {
    char buffer[32];
    char *current = buffer + sizeof(buffer);
    bool isNegative = value < 0;
    if ( isNegative )
       value = -value;
-   uintToString( Value::UInt(value), current );
+   uintToString( UInt(value), current );
    if ( isNegative )
       *--current = '-';
    assert( current >= buffer );
    return current;
 }
 
 
-std::string valueToString( Value::UInt value )
+std::string valueToString( UInt value )
 {
    char buffer[32];
    char *current = buffer + sizeof(buffer);

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ ValueIteratorBase::key() const`
`176`	`176`	`}`
`177`	`177`
`178`	`178`
`179`		`-Value::UInt`
	`179`	`+UInt`
`180`	`180`	`ValueIteratorBase::index() const`
`181`	`181`	`{`
`182`	`182`	`#ifndef JSON_VALUE_USE_INTERNAL_MAP`
Original file line number	Diff line number	Diff line change
`@@ -39,22 +39,22 @@ static void uintToString( unsigned int value,`
`39`	`39`	`while ( value != 0 );`
`40`	`40`	`}`
`41`	`41`
`42`		`-std::string valueToString( Value::Int value )`
	`42`	`+std::string valueToString( Int value )`
`43`	`43`	`{`
`44`	`44`	`char buffer[32];`
`45`	`45`	`char *current = buffer + sizeof(buffer);`
`46`	`46`	`bool isNegative = value < 0;`
`47`	`47`	`if ( isNegative )`
`48`	`48`	`value = -value;`
`49`		`- uintToString( Value::UInt(value), current );`
	`49`	`+ uintToString( UInt(value), current );`
`50`	`50`	`if ( isNegative )`
`51`	`51`	`*--current = '-';`
`52`	`52`	`assert( current >= buffer );`
`53`	`53`	`return current;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`
`57`		`-std::string valueToString( Value::UInt value )`
	`57`	`+std::string valueToString( UInt value )`
`58`	`58`	`{`
`59`	`59`	`char buffer[32];`
`60`	`60`	`char *current = buffer + sizeof(buffer);`