UtfString & Json overhaul.

UtfString supports a load of new stuff, and Json uses UtfString
exclusively now.

1 files changed, 23 insertions, 0 deletions

diff --git a/src/unstable/utfstring.h b/src/unstable/utfstring.h
index 5085ec0..285b680 100644
--- a/src/unstable/utfstring.h
+++ b/src/unstable/utfstring.h
@@ -191,6 +191,18 @@ namespace Bu
         void write( Bu::Stream &sOut, Encoding eEnc=Utf8 ) const;
 
         /**
+         * Reads as many bytes from the given stream, starting at the current
+         * position, as required to read a single UtfChar (code point).
+         */
+        static int readPoint( Bu::Stream &sIn, UtfChar &c,
+                Encoding sEnc=Utf8 );
+        static int writePoint( Bu::Stream &sOut, const UtfChar &c,
+                Encoding sEnc=Utf8 ); 
+
+        int32_t toInt32( int iRadix=10 ) const;
+        int64_t toInt64( int iRadix=10 ) const;
+
+        /**
          * This encodes the UtfString in the given encoding and returns it as
          * a binary Bu::String.  Like write, this also includes the proper BOM
          * at the begining.
@@ -216,9 +228,16 @@ namespace Bu
         UtfChar nextChar( int &iIndex ) const;
 
         bool operator==( const Bu::UtfString &rhs ) const;
+        bool operator==( const Bu::String &rhs ) const;
+        bool operator==( const char *rhs ) const;
         UtfString &operator+=( const Bu::UtfString &rhs );
         UtfString &operator+=( const UtfChar &rhs );
 
+        bool operator<( const Bu::UtfString &rhs ) const;
+        bool operator<=( const Bu::UtfString &rhs ) const;
+        bool operator>( const Bu::UtfString &rhs ) const;
+        bool operator>=( const Bu::UtfString &rhs ) const;
+
     private:
         void append16( uint16_t i ) { aData.append( i ); }
 
@@ -237,6 +256,7 @@ namespace Bu
         void writeUtf32le( Bu::Stream &sOut ) const;
 
     private:
+        static uint8_t utf8_lmask[8];
         Bu::Array<uint16_t> aData;
         int iRawLen;
         int iCharLen;
@@ -254,6 +274,9 @@ namespace Bu
     template<> uint32_t __calcHashCode<UtfString>( const UtfString &k );
     template<> bool __cmpHashKeys<UtfString>(
         const UtfString &a, const UtfString &b );
+
+    class Formatter;
+    Bu::Formatter operator<<( Bu::Formatter &f, const Bu::UtfString &s );
 };
 
 #endif