1 files changed, 36 insertions, 31 deletions

diff --git a/src/unstable/json.h b/src/unstable/json.h
index 4c85dd9..2ea62a2 100644
--- a/src/unstable/json.h
+++ b/src/unstable/json.h
@@ -10,12 +10,13 @@
 namespace Bu
 {
     class Stream;
+    typedef Bu::List<Bu::UtfString> UtfStringList;
 
     class Json
     {
     private:
-        Json( char &c, Bu::Stream &sInput );
-        typedef Bu::Hash<Bu::String, Json *> JsonHash;
+        Json( Bu::UtfChar &c, Bu::Stream &sInput );
+        typedef Bu::Hash<Bu::UtfString, Json *> JsonHash;
         typedef Bu::Array<Json *> JsonList;
 
     public:
@@ -45,33 +46,33 @@ namespace Bu
         virtual ~Json();
 
         Type getType() const;
-        Bu::String getString() const;
+        Bu::UtfString getString() const;
         double getNumber() const;
         bool getBoolean() const;
         bool isNull() const;
-        Json &operator[]( const Bu::String &sKey ) const;
+        Json &operator[]( const Bu::UtfString &sKey ) const;
         Json &operator[]( int iIndex ) const;
         int getSize() const;
-        Bu::StringList getKeys() const;
+        Bu::UtfStringList getKeys() const;
         iterator begin();
         const_iterator begin() const;
         iterator end();
         const_iterator end() const;
 
         bool has( const Bu::String &sKey ) const;
-        void insert( const Bu::String &sKey, Bu::Json *pObj );
-        void insert( const Bu::String &sKey, const Bu::Json &rObj );
-        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 &insert( const Bu::String &sKey, Bu::Json *pObj );
+        Json &insert( const Bu::String &sKey, const Bu::Json &rObj );
+        Json &insert( const Bu::String &sKey, const Bu::String &sValue );
+        Json &insert( const Bu::String &sKey, const char *sValue );
+        Json &insert( const Bu::String &sKey, double dValue );
+        Json &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 &append( Bu::Json *pObj );
+        Json &append( const Bu::String &sValue );
+        Json &append( const char *sValue );
+        Json &append( double dValue );
+        Json &append( bool bValue );
         Json &appendObject();
         Json &appendArray();
 
@@ -87,18 +88,20 @@ namespace Bu
         Bu::Json &operator=( const Bu::Json &rSrc );
 
     private:
-        void parse( char &c, Bu::Stream &sInput );
-        void parseString( char &c, Bu::Stream &sInput, Bu::String &sOut );
-        void parseString( char &c, Bu::Stream &sInput );
-        void parseObject( char &c, Bu::Stream &sInput );
-        void parseArray( char &c, Bu::Stream &sInput );
-        void parseNumber( char &c, Bu::Stream &sInput );
-        void parseLiteral( char &c, Bu::Stream &sInput );
-        bool readChar( char &c, Bu::Stream &sInput );
-        void readChar( char &c, Bu::Stream &sInput, const char *sSection );
-        bool isWs( char c );
-        void skipWs( char &c, Bu::Stream &sInput );
-        void writeStr( const Bu::String &sStr, Bu::Stream &sOutput ) const;
+        void parse( Bu::UtfChar &c, Bu::Stream &sInput );
+        void parseString( Bu::UtfChar &c, Bu::Stream &sInput,
+                Bu::UtfString &sOut );
+        void parseString( Bu::UtfChar &c, Bu::Stream &sInput );
+        void parseObject( Bu::UtfChar &c, Bu::Stream &sInput );
+        void parseArray( Bu::UtfChar &c, Bu::Stream &sInput );
+        void parseNumber( Bu::UtfChar &c, Bu::Stream &sInput );
+        void parseLiteral( Bu::UtfChar &c, Bu::Stream &sInput );
+        bool readChar( Bu::UtfChar &c, Bu::Stream &sInput );
+        void readChar( Bu::UtfChar &c, Bu::Stream &sInput,
+                const char *sSection );
+        bool isWs( Bu::UtfChar c );
+        void skipWs( Bu::UtfChar &c, Bu::Stream &sInput );
+        void writeStr( const Bu::UtfString &sStr, Bu::Stream &sOutput ) const;
 
     private:
         Type eType;
@@ -106,14 +109,16 @@ namespace Bu
         {
             DatUnion() : pObject( NULL ) { }
             DatUnion( const Bu::String &sValue ) :
-                pString( new Bu::String( sValue ) ) { }
+                pString( new Bu::UtfString( sValue ) ) { }
+            DatUnion( const Bu::UtfString &sValue ) :
+                pString( new Bu::UtfString( sValue ) ) { }
             DatUnion( const char *sValue ) :
-                pString( new Bu::String( sValue ) ) { }
+                pString( new Bu::UtfString( sValue ) ) { }
             DatUnion( double dValue ) : dNumber( dValue ) { }
             DatUnion( bool bValue ) : bBoolean( bValue ) { }
             JsonHash *pObject;
             JsonList *pArray;
-            Bu::String *pString;
+            Bu::UtfString *pString;
             double dNumber;
             bool bBoolean;
         } uDat;