3 files changed, 97 insertions, 8 deletions

diff --git a/src/fbasicstring.h b/src/fbasicstring.h
index 7167f4a..af11bb2 100644
--- a/src/fbasicstring.h
+++ b/src/fbasicstring.h
@@ -39,6 +39,42 @@ namespace Bu
         template< typename chr, int nMinSize, typename chralloc,
                 typename chunkalloc> class FBasicString;
 
+        template<typename chr>
+        size_t strlen( const chr *pData )
+        {
+                for( size_t tLen = 0;; ++tLen )
+                {
+                        if( pData[tLen] == (chr)0 )
+                                return tLen;
+                }
+                return -1;
+        }
+
+        template<char>
+        size_t strlen( const char *pData )
+        {
+                return ::strlen( pData );
+        }
+
+        template<typename chr>
+        int strncmp( const chr *a, const chr *b, size_t iLen )
+        {
+                for( size_t iPos = 0; iPos < iLen; iPos++ )
+                {
+                        if( a[iPos] != b[iPos] )
+                        {
+                                return a[iPos]-b[iPos];
+                        }
+                }
+                return 0;
+        }
+
+        template<char>
+        int strncmp( const char *a, const char *b, size_t iLen )
+        {
+                return ::strncmp( a, b, iLen );
+        }
+
         template<typename chr, int nMinSize, typename chralloc, typename chunkalloc>
         struct FStringCore
         {
@@ -1044,7 +1080,7 @@ namespace Bu
                  */
                 void insert( long nPos, const chr *pData )
                 {
-                        insert( nPos, pData, strlen( pData ) );
+                        insert( nPos, pData, Bu::strlen( pData ) );
                 }
 
                 void remove( long nPos, long nLen )
@@ -1170,13 +1206,13 @@ namespace Bu
                         if( iStart < 0 )
                                 iStart = 0;
                         if( iStart >= core->nLength )
-                                return "";
+                                return (const chr[]){(chr)0};
                         if( iSize < 0 )
                                 iSize = core->nLength;
                         if( iStart+iSize > core->nLength )
                                 iSize = core->nLength-iStart;
                         if( iSize == 0 )
-                                return "";
+                                return (const chr[]){(chr)0};
 
                         flatten();
                         MyType ret( core->pFirst->pData+iStart, iSize );
@@ -1438,11 +1474,11 @@ namespace Bu
                         wordexp_t result;
 
                         /* Expand the string for the program to run.  */
-                        switch (wordexp (core->pFirst->pData, &result, 0))
+                        switch (wordexp ((char *)core->pFirst->pData, &result, 0))
                         {
                                 case 0:                       /* Successful.  */
                                         {
-                                                set( result.we_wordv[0] );
+                                                set( (chr *)result.we_wordv[0] );
                                                 wordfree( &result );
                                                 return;
                                         }
@@ -1954,7 +1990,7 @@ namespace Bu
                         long iLen = vsnprintf( NULL, 0, sFrmt, ap );
                         
                         Chunk *pNew = core->newChunk( iLen );
-                        vsnprintf( pNew->pData, iLen+1, sFrmt, ap );
+                        vsnprintf( (char *)pNew->pData, iLen+1, sFrmt, ap );
                         core->appendChunk( pNew );
 
                         va_end( ap );
@@ -1971,7 +2007,7 @@ namespace Bu
                         long iLen = vsnprintf( NULL, 0, sFrmt, ap );
 
                         Chunk *pNew = core->newChunk( iLen );
-                        vsnprintf( pNew->pData, iLen+1, sFrmt, ap );
+                        vsnprintf( (char *)pNew->pData, iLen+1, sFrmt, ap );
                         core->appendChunk( pNew );
 
                         va_end( ap );
@@ -1988,7 +2024,7 @@ namespace Bu
                         long iLen = vsnprintf( NULL, 0, sFrmt, ap );
                         
                         Chunk *pNew = core->newChunk( iLen );
-                        vsnprintf( pNew->pData, iLen+1, sFrmt, ap );
+                        vsnprintf( (char *)pNew->pData, iLen+1, sFrmt, ap );
                         core->prependChunk( pNew );
 
                         va_end( ap );
diff --git a/src/utfstring.cpp b/src/utfstring.cpp
new file mode 100644
index 0000000..ae5efaf
--- /dev/null
+++ b/src/utfstring.cpp
@@ -0,0 +1,29 @@
+#include "bu/utfstring.h"
+
+template class Bu::FBasicString<short>;
+
+template<> uint32_t Bu::__calcHashCode<Bu::UtfString>( const Bu::UtfString &k )
+{
+        long j, sz = k.getSize()*2;
+        const char *s = (const char *)k.getStr();
+
+        long nPos = 0;
+        for( j = 0; j < sz; j++, s++ )
+        {
+                nPos = *s + (nPos << 6) + (nPos << 16) - nPos;
+        }
+
+        return nPos;    
+}
+
+template<> bool Bu::__cmpHashKeys<Bu::UtfString>(
+                const Bu::UtfString &a, const Bu::UtfString &b )
+{
+        return a == b;
+}
+
+template<> void Bu::__tracer_format<Bu::UtfString>( const Bu::UtfString &v )
+{
+        printf("(%ld)\"%s\"", v.getSize(), (const char *)v.getStr() );
+}
+
diff --git a/src/utfstring.h b/src/utfstring.h
new file mode 100644
index 0000000..bbacb74
--- /dev/null
+++ b/src/utfstring.h
@@ -0,0 +1,24 @@
+#ifndef BU_UTF_STRING_H
+#define BU_UTF_STRING_H
+
+#include "bu/fbasicstring.h"
+
+namespace Bu
+{
+        typedef FBasicString<short> UtfString;
+
+        template<typename T>
+        uint32_t __calcHashCode( const T &k );
+
+        template<typename T>
+        bool __cmpHashKeys( const T &a, const T &b );
+
+        template<> uint32_t __calcHashCode<UtfString>( const UtfString &k );
+        template<> bool __cmpHashKeys<UtfString>(
+                const UtfString &a, const UtfString &b );
+        
+        template<typename t> void __tracer_format( const t &v );
+        template<> void __tracer_format<UtfString>( const UtfString &v );
+}
+
+#endif