jsoncpp-cvs Mailing List for json-cpp

Update of /cvsroot/jsoncpp/jsoncpp/src/lib_json
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7828/src/lib_json

Modified Files:
	json_value.cpp 
Log Message:
* added optional support for CppTL library enumerator and ConstString.

Index: json_value.cpp
===================================================================
RCS file: /cvsroot/jsoncpp/jsoncpp/src/lib_json/json_value.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** json_value.cpp	30 Jul 2005 17:40:59 -0000	1.5
--- json_value.cpp	31 Oct 2005 17:30:10 -0000	1.6
***************
*** 1,5 ****
--- 1,10 ----
  #include <json/json_value.h>
+ #include <json/json_writer.h>
  #include <utility>
  #include "assert.h"
+ #ifdef JSON_USE_CPPTL
+ # include <cpptl/conststring.h>
+ # include <cpptl/enumerator.h>
+ #endif
  
  #define JSON_ASSERT_UNREACHABLE assert( false )
***************
*** 178,182 ****
--- 183,196 ----
  {
     value_.string_ = value.empty() ? 0 : strdup( value.c_str() );
+ 
  }
+ # ifdef JSON_USE_CPPTL
+ Value::Value( const CppTL::ConstString &value )
+    : type_( stringValue )
+    , comments_( 0 )
+ {
+    value_.string_ = value.empty() ? 0 : strdup( value.c_str() );
+ }
+ # endif
  
  Value::Value( bool value )
***************
*** 366,370 ****
     {
     case nullValue:
!       return false;
     case intValue:
        return value_.int_ == other.value_.int_;
--- 380,384 ----
     {
     case nullValue:
!       return true;
     case intValue:
        return value_.int_ == other.value_.int_;
***************
*** 427,430 ****
--- 441,452 ----
  }
  
+ # ifdef JSON_USE_CPPTL
+ CppTL::ConstString 
+ Value::asConstString() const
+ {
+    return CppTL::ConstString( asString().c_str() );
+ }
+ # endif
+ 
  Value::Int 
  Value::asInt() const
***************
*** 532,535 ****
--- 554,608 ----
  
  
+ bool 
+ Value::isConvertibleTo( ValueType other ) const
+ {
+    switch ( type_ )
+    {
+    case nullValue:
+       return true;
+    case intValue:
+       return ( other == nullValue  &&  value_.int_ == 0 )
+              || other == intValue
+              || ( other == uintValue  && value_.int_ >= 0 )
+              || other == realValue
+              || other == stringValue
+              || other == booleanValue;
+    case uintValue:
+       return ( other == nullValue  &&  value_.uint_ == 0 )
+              || ( other == intValue  && value_.uint_ <= maxInt )
+              || other == uintValue
+              || other == realValue
+              || other == stringValue
+              || other == booleanValue;
+    case realValue:
+       return ( other == nullValue  &&  value_.real_ == 0.0 )
+              || ( other == intValue  &&  value_.real_ >= minInt  &&  value_.real_ <= maxInt )
+              || ( other == uintValue  &&  value_.real_ >= 0  &&  value_.real_ <= maxUInt )
+              || other == realValue
+              || other == stringValue
+              || other == booleanValue;
+    case booleanValue:
+       return ( other == nullValue  &&  value_.bool_ == false )
+              || other == intValue
+              || other == uintValue
+              || other == realValue
+              || other == stringValue
+              || other == booleanValue;
+    case stringValue:
+       return other == stringValue
+              || ( other == nullValue  &&  (!value_.string_  ||  value_.string_[0] == 0) );
+    case arrayValue:
+       return other == arrayValue
+              ||  ( other == nullValue  &&  value_.map_->size() == 0 );
+    case objectValue:
+       return other == objectValue
+              ||  ( other == nullValue  &&  value_.map_->size() == 0 );
+    default:
+       JSON_ASSERT_UNREACHABLE;
+    }
+    return false; // unreachable;
+ }
+ 
+ 
  /// Number of values in array or object
  Value::UInt 
***************
*** 691,694 ****
--- 764,790 ----
  
  
+ # ifdef JSON_USE_CPPTL
+ Value &
+ Value::operator[]( const CppTL::ConstString &key )
+ {
+    return (*this)[ key.c_str() ];
+ }
+ 
+ 
+ const Value &
+ Value::operator[]( const CppTL::ConstString &key ) const
+ {
+    return (*this)[ key.c_str() ];
+ }
+ # endif
+ 
+ 
+ Value &
+ Value::append( const Value &value )
+ {
+    return (*this)[size()] = value;
+ }
+ 
+ 
  Value 
  Value::get( const char *key, 
***************
*** 708,711 ****
--- 804,816 ----
  
  
+ # ifdef JSON_USE_CPPTL
+ Value 
+ Value::get( const CppTL::ConstString &key,
+             const Value &defaultValue ) const
+ {
+    return get( key.c_str(), defaultValue );
+ }
+ # endif
+ 
  bool 
  Value::isMember( const char *key ) const
***************
*** 723,726 ****
--- 828,839 ----
  
  
+ # ifdef JSON_USE_CPPTL
+ bool 
+ Value::isMember( const CppTL::ConstString &key ) const
+ {
+    return isMember( key.c_str() );
+ }
+ #endif
+ 
  Value::Members 
  Value::getMemberNames() const
***************
*** 736,739 ****
--- 849,877 ----
  }
  
+ # ifdef JSON_USE_CPPTL
+ EnumMemberNames
+ Value::enumMemberNames() const
+ {
+    if ( type_ == objectValue )
+    {
+       return CppTL::Enum::any(  CppTL::Enum::transform(
+          CppTL::Enum::keys( *(value_.map_), CppTL::Type<const CZString &>() ),
+          MemberNamesTransform() ) );
+    }
+    return EnumMemberNames();
+ }
+ 
+ 
+ EnumValues 
+ Value::enumValues() const
+ {
+    if ( type_ == objectValue  ||  type_ == arrayValue )
+       return CppTL::Enum::anyValues( *(value_.map_), 
+                                      CppTL::Type<const Value &>() );
+    return EnumValues();
+ }
+ 
+ # endif
+ 
  
  bool 
***************
*** 835,838 ****
--- 973,984 ----
  
  
+ std::string 
+ Value::toStyledString() const
+ {
+    StyledWriter writer;
+    return writer.write( *this );
+ }
+ 
+ 
  // class PathArgument
  // //////////////////////////////////////////////////////////////////

Update of /cvsroot/jsoncpp/jsoncpp/include/json
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7828/include/json

Modified Files:
	json_config.h json_value.h json_writer.h 
Log Message:
* added optional support for CppTL library enumerator and ConstString.

Index: json_value.h
===================================================================
RCS file: /cvsroot/jsoncpp/jsoncpp/include/json/json_value.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** json_value.h	29 Sep 2005 21:11:49 -0000	1.5
--- json_value.h	31 Oct 2005 17:30:09 -0000	1.6
***************
*** 7,10 ****
--- 7,14 ----
  # include <vector>
  
+ # ifdef JSON_USE_CPPTL
+ #  include <cpptl/forwards.h>
+ # endif
+ 
  namespace Json {
  
***************
*** 33,36 ****
--- 37,44 ----
     };
  
+ # ifdef JSON_USE_CPPTL
+    typedef CppTL::AnyEnumerator<const char *> EnumMemberNames;
+    typedef CppTL::AnyEnumerator<const Value &> EnumValues;
+ # endif
  
     /** \brief Represents a <a HREF="http://www.json.org">JSON</a> value.
***************
*** 79,82 ****
--- 87,93 ----
        Value( const char *value );
        Value( const std::string &value );
+ # ifdef JSON_USE_CPPTL
+       Value( const CppTL::ConstString &value );
+ # endif
        Value( bool value );
        Value( const Value &other );
***************
*** 100,103 ****
--- 111,117 ----
        const char *asCString() const;
        std::string asString() const;
+ # ifdef JSON_USE_CPPTL
+       CppTL::ConstString asConstString() const;
+ # endif
        Int asInt() const;
        UInt asUInt() const;
***************
*** 115,118 ****
--- 129,134 ----
        bool isObject() const;
  
+       bool isConvertibleTo( ValueType other ) const;
+ 
        /// Number of values in array or object
        UInt size() const;
***************
*** 138,141 ****
--- 154,160 ----
        /// Returns true if index < size().
        bool isValidIndex( UInt index ) const;
+       /// Append value to array at the end.
+       /// Equivalent to jsonvalue[jsonvalue.size()] = value;
+       Value &append( const Value &value );
  
        // Access an object value by name, create a null member if it does not exist.
***************
*** 147,150 ****
--- 166,175 ----
        // Access an object value by name, returns null if there is no member with that name.
        const Value &operator[]( const std::string &key ) const;
+ # ifdef JSON_USE_CPPTL
+       // Access an object value by name, create a null member if it does not exist.
+       Value &operator[]( const CppTL::ConstString &key );
+       // Access an object value by name, returns null if there is no member with that name.
+       const Value &operator[]( const CppTL::ConstString &key ) const;
+ # endif
        /// Returns the member named key if it exist, defaultValue otherwise.
        Value get( const char *key, 
***************
*** 153,164 ****
--- 178,203 ----
        Value get( const std::string &key,
                   const Value &defaultValue ) const;
+ # ifdef JSON_USE_CPPTL
+       /// Returns the member named key if it exist, defaultValue otherwise.
+       Value get( const CppTL::ConstString &key,
+                  const Value &defaultValue ) const;
+ # endif
        /// Returns true if the object has a member named key.
        bool isMember( const char *key ) const;
        /// Returns true if the object has a member named key.
        bool isMember( const std::string &key ) const;
+ # ifdef JSON_USE_CPPTL
+       /// Returns true if the object has a member named key.
+       bool isMember( const CppTL::ConstString &key ) const;
+ # endif
  
        // Returns a list of the member names.
        Members getMemberNames() const;
  
+ # ifdef JSON_USE_CPPTL
+       EnumMemberNames enumMemberNames() const;
+       EnumValues enumValues() const;
+ # endif
+ 
        void setComment( const char *comment,
                         CommentPlacement placement );
***************
*** 168,171 ****
--- 207,212 ----
        std::string getComment( CommentPlacement placement ) const;
  
+       std::string toStyledString() const;
+ 
     private:
        struct CommentInfo
***************
*** 204,207 ****
--- 245,257 ----
        typedef std::map<CZString, Value> ObjectValues;
  
+       struct MemberNamesTransform
+       {
+          typedef const char *result_type;
+          const char *operator()( const CZString &name ) const
+          {
+             return name.c_str();
+          }
+       };
+ 
        union ValueHolder
        {

Index: json_config.h
===================================================================
RCS file: /cvsroot/jsoncpp/jsoncpp/include/json/json_config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** json_config.h	29 Sep 2005 21:11:49 -0000	1.2
--- json_config.h	31 Oct 2005 17:30:09 -0000	1.3
***************
*** 5,10 ****
--- 5,17 ----
  //# define JSON_IN_CPPTL 1
  
+ /// If defined, indicates that json may leverage CppTL library
+ #  define JSON_USE_CPPTL 1
+ 
+ 
  # ifdef JSON_IN_CPPTL
  #  include <cpptl/config.h>
+ #  ifndef JSON_USE_CPPTL
+ #   define JSON_USE_CPPTL 1
+ #  endif
  # endif
  
***************
*** 19,26 ****
  # endif
  
- # ifdef JSON_IN_CPPTL
- /// If defined, indicates that json may leverage CppTL library
- #  define JSON_USE_CPPTL 1
- # endif
- 
  #endif // JSON_CONFIG_H_INCLUDED
--- 26,28 ----

Index: json_writer.h
===================================================================
RCS file: /cvsroot/jsoncpp/jsoncpp/include/json/json_writer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** json_writer.h	30 Jul 2005 17:40:58 -0000	1.4
--- json_writer.h	31 Oct 2005 17:30:09 -0000	1.5
***************
*** 3,7 ****
  
  # include "json_value.h"
! # include "json_reader.h"
  # include <deque>
  # include <string>
--- 3,7 ----
  
  # include "json_value.h"
! //# include "json_reader.h"
  # include <deque>
  # include <string>
***************
*** 81,85 ****
     };
  
- 
     std::string JSON_API valueToString( Value::Int value );
     std::string JSON_API valueToString( Value::UInt value );
--- 81,84 ----
***************
*** 88,92 ****
     std::string JSON_API valueToQuotedString( const char *value );
  
- 
  } // namespace Json
  
--- 87,90 ----

Update of /cvsroot/jsoncpp/jsoncpp/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7619/doc

Modified Files:
	doxyfile 
Log Message:
* made it possible to use the file on both unix and windows

Index: doxyfile
===================================================================
RCS file: /cvsroot/jsoncpp/jsoncpp/doc/doxyfile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** doxyfile	30 Jul 2005 17:40:58 -0000	1.2
--- doxyfile	31 Oct 2005 17:29:07 -0000	1.3
***************
*** 82,86 ****
  # configuration options related to the input files
  #---------------------------------------------------------------------------
! INPUT                  = ..\include\json ..\src\lib_json .
  FILE_PATTERNS          = *.h *.cpp *.dox
  RECURSIVE              = NO
--- 82,86 ----
  # configuration options related to the input files
  #---------------------------------------------------------------------------
! INPUT                  = ../include/json ../src/lib_json .
  FILE_PATTERNS          = *.h *.cpp *.dox
  RECURSIVE              = NO
***************
*** 188,192 ****
  EXPAND_ONLY_PREDEF     = NO
  SEARCH_INCLUDES        = YES
! INCLUDE_PATH           = ..\include
  INCLUDE_FILE_PATTERNS  = *.h
  PREDEFINED             = 
--- 188,192 ----
  EXPAND_ONLY_PREDEF     = NO
  SEARCH_INCLUDES        = YES
! INCLUDE_PATH           = ../include
  INCLUDE_FILE_PATTERNS  = *.h
  PREDEFINED             =