Made json much more helpful. Fixed array iterators.

1 files changed, 16 insertions, 2 deletions

diff --git a/src/unstable/json.h b/src/unstable/json.h
index 86074bc..217a69a 100644
--- a/src/unstable/json.h
+++ b/src/unstable/json.h
@@ -3,6 +3,7 @@
 
 #include "bu/hash.h"
 #include "bu/list.h"
+#include "bu/array.h"
 #include "bu/string.h"
 #include "bu/utfstring.h"
 
@@ -15,7 +16,7 @@ namespace Bu
     private:
         Json( char &c, Bu::Stream &sInput );
         typedef Bu::Hash<Bu::String, Json *> JsonHash;
-        typedef Bu::List<Json *> JsonList;
+        typedef Bu::Array<Json *> JsonList;
 
     public:
         typedef JsonList::iterator iterator;
@@ -47,7 +48,8 @@ namespace Bu
         double getNumber() const;
         bool getBoolean() const;
         bool isNull() const;
-        Json *operator[]( const Bu::String &sKey ) const;
+        Json &operator[]( const Bu::String &sKey ) const;
+        Json &operator[]( int iIndex ) const;
         int getSize() const;
         iterator begin();
         const_iterator begin() const;
@@ -56,7 +58,19 @@ namespace Bu
 
         bool has( const Bu::String &sKey ) const;
         void insert( const Bu::String &sKey, Bu::Json *pObj );
+        void insert( const Bu::String &sKey, const Bu::String &sValue );
+        void insert( const Bu::String &sKey, const char *sValue );
+        void insert( const Bu::String &sKey, double dValue );
+        void insert( const Bu::String &sKey, bool bValue );
+        Json &insertObject( const Bu::String &sKey );
+        Json &insertArray( const Bu::String &sKey );
         void append( Bu::Json *pObj );
+        void append( const Bu::String &sValue );
+        void append( const char *sValue );
+        void append( double dValue );
+        void append( bool bValue );
+        Json &appendObject();
+        Json &appendArray();
 
         void parse( Bu::Stream &sInput );
         void parse( const Bu::String &sInput );