X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3622daa901777a33969d8bc04e2d62dee14d164..f7a11f8c8e665992e2d1956b2b89d2f562c92669:/src/common/string.cpp diff --git a/src/common/string.cpp b/src/common/string.cpp index ac64abaeb6..5782d1374b 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -10,7 +10,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "string.h" + #pragma implementation "string.h" #endif /* @@ -28,75 +28,134 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/defs.h" -#include "wx/string.h" + #include "wx/defs.h" + #include "wx/string.h" + #include "wx/intl.h" +#if wxUSE_THREADS + #include +#endif #endif #include #include #include +#ifdef __SALFORDC__ + #include +#endif + +#if wxUSE_WCSRTOMBS + #include // for wcsrtombs(), see comments where it's used +#endif // GNU + #ifdef WXSTRING_IS_WXOBJECT IMPLEMENT_DYNAMIC_CLASS(wxString, wxObject) #endif //WXSTRING_IS_WXOBJECT +#if wxUSE_UNICODE +#undef wxUSE_EXPERIMENTAL_PRINTF +#define wxUSE_EXPERIMENTAL_PRINTF 1 +#endif + // allocating extra space for each string consumes more memory but speeds up // the concatenation operations (nLen is the current string's length) -#define EXTRA_ALLOC 16 +// NB: EXTRA_ALLOC must be >= 0! +#define EXTRA_ALLOC (19 - nLen % 16) // --------------------------------------------------------------------------- // static class variables definition // --------------------------------------------------------------------------- -#ifdef STD_STRING_COMPATIBILITY - const size_t wxString::npos = STRING_MAXLEN; -#endif +#ifdef wxSTD_STRING_COMPATIBILITY + const size_t wxString::npos = wxSTRING_MAXLEN; +#endif // wxSTD_STRING_COMPATIBILITY // ---------------------------------------------------------------------------- // static data // ---------------------------------------------------------------------------- -// for an empty string, GetStringData() will return this address -static int g_strEmpty[] = { -1, // ref count (locked) - 0, // current length - 0, // allocated memory - 0 }; // string data +// for an empty string, GetStringData() will return this address: this +// structure has the same layout as wxStringData and it's data() method will +// return the empty string (dummy pointer) +static const struct +{ + wxStringData data; + wxChar dummy; +} g_strEmpty = { {-1, 0, 0}, T('\0') }; + // empty C style string: points to 'string data' byte of g_strEmpty -extern const char *g_szNul = (const char *)(&g_strEmpty[3]); +extern const wxChar WXDLLEXPORT *wxEmptyString = &g_strEmpty.dummy; + +// ---------------------------------------------------------------------------- +// conditional compilation +// ---------------------------------------------------------------------------- + +#if !defined(__WXSW__) && wxUSE_UNICODE + #ifdef wxUSE_EXPERIMENTAL_PRINTF + #undef wxUSE_EXPERIMENTAL_PRINTF + #endif + #define wxUSE_EXPERIMENTAL_PRINTF 1 +#endif + +// we want to find out if the current platform supports vsnprintf()-like +// function: for Unix this is done with configure, for Windows we test the +// compiler explicitly. +#ifdef __WXMSW__ + #ifdef __VISUALC__ + #define wxVsnprintf _vsnprintf + #endif +#else // !Windows + #ifdef HAVE_VSNPRINTF + #define wxVsnprintf vsnprintf + #endif +#endif // Windows/!Windows + +#ifndef wxVsnprintf + // in this case we'll use vsprintf() (which is ANSI and thus should be + // always available), but it's unsafe because it doesn't check for buffer + // size - so give a warning + #define wxVsnprintf(buffer,len,format,argptr) vsprintf(buffer,format, argptr) + + #if defined(__VISUALC__) + #pragma message("Using sprintf() because no snprintf()-like function defined") + #elif defined(__GNUG__) && !defined(__UNIX__) + #warning "Using sprintf() because no snprintf()-like function defined" + #elif defined(__MWERKS__) + #warning "Using sprintf() because no snprintf()-like function defined" + #endif //compiler +#endif // no vsnprintf + +#ifdef _AIX + // AIX has vsnprintf, but there's no prototype in the system headers. + extern "C" int vsnprintf(char* str, size_t n, const char* format, va_list ap); +#endif // ---------------------------------------------------------------------------- // global functions // ---------------------------------------------------------------------------- -#ifdef STD_STRING_COMPATIBILITY +#if defined(wxSTD_STRING_COMPATIBILITY) && wxUSE_STD_IOSTREAM // MS Visual C++ version 5.0 provides the new STL headers as well as the old // iostream ones. // // ATTN: you can _not_ use both of these in the same program! -#if 0 // def _MSC_VER - #include - #define NAMESPACE std:: -#else - #include - #define NAMESPACE -#endif //Visual C++ -NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str)) +istream& operator>>(istream& is, wxString& WXUNUSED(str)) { #if 0 int w = is.width(0); if ( is.ipfx(0) ) { - NAMESPACE streambuf *sb = is.rdbuf(); + streambuf *sb = is.rdbuf(); str.erase(); while ( true ) { int ch = sb->sbumpc (); if ( ch == EOF ) { - is.setstate(NAMESPACE ios::eofbit); + is.setstate(ios::eofbit); break; } else if ( isspace(ch) ) { @@ -112,7 +171,7 @@ NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str)) is.isfx(); if ( str.length() == 0 ) - is.setstate(NAMESPACE ios::failbit); + is.setstate(ios::failbit); #endif return is; } @@ -130,13 +189,13 @@ NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str)) { public: Averager(const char *sz) { m_sz = sz; m_nTotal = m_nCount = 0; } - ~Averager() + ~Averager() { printf("wxString: average %s = %f\n", m_sz, ((float)m_nTotal)/m_nCount); } - void Add(uint n) { m_nTotal += n; m_nCount++; } + void Add(size_t n) { m_nTotal += n; m_nCount++; } private: - uint m_nCount, m_nTotal; + size_t m_nCount, m_nTotal; const char *m_sz; } g_averageLength("allocation size"), g_averageSummandLength("summand length"), @@ -157,70 +216,95 @@ NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str)) // --------------------------------------------------------------------------- // constructs string of copies of character -wxString::wxString(char ch, size_t nLength) +wxString::wxString(wxChar ch, size_t nLength) { Init(); if ( nLength > 0 ) { AllocBuffer(nLength); - wxASSERT( sizeof(char) == 1 ); // can't use memset if not - +#if wxUSE_UNICODE + // memset only works on char + for (size_t n=0; n 0 ) { // trailing '\0' is written in AllocBuffer() AllocBuffer(nLength); - memcpy(m_pchData, psz + nPos, nLength*sizeof(char)); + memcpy(m_pchData, psz + nPos, nLength*sizeof(wxChar)); } } -// the same as previous constructor, but for compilers using unsigned char -wxString::wxString(const unsigned char* psz, size_t nLength) -{ - InitWith((const char *)psz, 0, nLength); -} - -#ifdef STD_STRING_COMPATIBILITY +#ifdef wxSTD_STRING_COMPATIBILITY // poor man's iterators are "void *" pointers wxString::wxString(const void *pStart, const void *pEnd) { - InitWith((const char *)pStart, 0, - (const char *)pEnd - (const char *)pStart); + InitWith((const wxChar *)pStart, 0, + (const wxChar *)pEnd - (const wxChar *)pStart); } #endif //std::string compatibility +#if wxUSE_UNICODE + +// from multibyte string +wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength) +{ + // first get necessary size + size_t nLen = psz ? conv.MB2WC((wchar_t *) NULL, psz, 0) : 0; + + // nLength is number of *Unicode* characters here! + if ((nLen != (size_t)-1) && (nLen > nLength)) + nLen = nLength; + + // empty? + if ( (nLen != 0) && (nLen != (size_t)-1) ) { + AllocBuffer(nLen); + conv.MB2WC(m_pchData, psz, nLen); + } + else { + Init(); + } +} + +#else // ANSI + +#if wxUSE_WCHAR_T // from wide string wxString::wxString(const wchar_t *pwz) { // first get necessary size - size_t nLen = wcstombs(NULL, pwz, 0); + size_t nLen = pwz ? wxWC2MB((char *) NULL, pwz, 0) : 0; // empty? - if ( nLen != 0 ) { + if ( (nLen != 0) && (nLen != (size_t)-1) ) { AllocBuffer(nLen); - wcstombs(m_pchData, pwz, nLen); + wxWC2MB(m_pchData, pwz, nLen); } else { Init(); } } +#endif // wxUSE_WCHAR_T + +#endif // Unicode/ANSI // --------------------------------------------------------------------------- // memory allocation @@ -238,12 +322,12 @@ void wxString::AllocBuffer(size_t nLen) // 1) one extra character for '\0' termination // 2) sizeof(wxStringData) for housekeeping info wxStringData* pData = (wxStringData*) - malloc(sizeof(wxStringData) + (nLen + EXTRA_ALLOC + 1)*sizeof(char)); + malloc(sizeof(wxStringData) + (nLen + EXTRA_ALLOC + 1)*sizeof(wxChar)); pData->nRefs = 1; pData->nDataLength = nLen; pData->nAllocLength = nLen + EXTRA_ALLOC; m_pchData = pData->data(); // data starts after wxStringData - m_pchData[nLen] = '\0'; + m_pchData[nLen] = T('\0'); } // must be called before changing this string @@ -253,9 +337,9 @@ void wxString::CopyBeforeWrite() if ( pData->IsShared() ) { pData->Unlock(); // memory not freed because shared - uint nLen = pData->nDataLength; + size_t nLen = pData->nDataLength; AllocBuffer(nLen); - memcpy(m_pchData, pData->data(), nLen*sizeof(char)); + memcpy(m_pchData, pData->data(), nLen*sizeof(wxChar)); } wxASSERT( !GetStringData()->IsShared() ); // we must be the only owner @@ -273,12 +357,16 @@ void wxString::AllocBeforeWrite(size_t nLen) pData->Unlock(); AllocBuffer(nLen); } + else { + // update the string length + pData->nDataLength = nLen; + } wxASSERT( !GetStringData()->IsShared() ); // we must be the only owner } // allocate enough memory for nLen characters -void wxString::Alloc(uint nLen) +void wxString::Alloc(size_t nLen) { wxStringData *pData = GetStringData(); if ( pData->nAllocLength <= nLen ) { @@ -286,24 +374,24 @@ void wxString::Alloc(uint nLen) nLen += EXTRA_ALLOC; wxStringData* pData = (wxStringData*) - malloc(sizeof(wxStringData) + (nLen + 1)*sizeof(char)); + malloc(sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar)); pData->nRefs = 1; pData->nDataLength = 0; pData->nAllocLength = nLen; m_pchData = pData->data(); // data starts after wxStringData - m_pchData[0u] = '\0'; + m_pchData[0u] = T('\0'); } else if ( pData->IsShared() ) { pData->Unlock(); // memory not freed because shared - uint nOldLen = pData->nDataLength; + size_t nOldLen = pData->nDataLength; AllocBuffer(nLen); - memcpy(m_pchData, pData->data(), nOldLen*sizeof(char)); + memcpy(m_pchData, pData->data(), nOldLen*sizeof(wxChar)); } else { nLen += EXTRA_ALLOC; wxStringData *p = (wxStringData *) - realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(char)); + realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar)); if ( p == NULL ) { // @@@ what to do on memory error? @@ -329,14 +417,14 @@ void wxString::Shrink() #ifdef __WXDEBUG__ void *p = #endif - realloc(pData, sizeof(wxStringData) + (pData->nDataLength + 1)*sizeof(char)); + realloc(pData, sizeof(wxStringData) + (pData->nDataLength + 1)*sizeof(wxChar)); wxASSERT( p != NULL ); // can't free memory? wxASSERT( p == pData ); // we're decrementing the size - block shouldn't move! } // get the pointer to writable buffer of (at least) nLen bytes -char *wxString::GetWriteBuf(uint nLen) +wxChar *wxString::GetWriteBuf(size_t nLen) { AllocBeforeWrite(nLen); @@ -349,7 +437,7 @@ char *wxString::GetWriteBuf(uint nLen) // put string back in a reasonable state after GetWriteBuf void wxString::UngetWriteBuf() { - GetStringData()->nDataLength = strlen(m_pchData); + GetStringData()->nDataLength = wxStrlen(m_pchData); GetStringData()->Validate(TRUE); } @@ -364,16 +452,16 @@ void wxString::UngetWriteBuf() // --------------------------------------------------------------------------- // helper function: does real copy -void wxString::AssignCopy(size_t nSrcLen, const char *pszSrcData) +void wxString::AssignCopy(size_t nSrcLen, const wxChar *pszSrcData) { if ( nSrcLen == 0 ) { Reinit(); } else { AllocBeforeWrite(nSrcLen); - memcpy(m_pchData, pszSrcData, nSrcLen*sizeof(char)); + memcpy(m_pchData, pszSrcData, nSrcLen*sizeof(wxChar)); GetStringData()->nDataLength = nSrcLen; - m_pchData[nSrcLen] = '\0'; + m_pchData[nSrcLen] = T('\0'); } } @@ -399,19 +487,21 @@ wxString& wxString::operator=(const wxString& stringSrc) } // assigns a single character -wxString& wxString::operator=(char ch) +wxString& wxString::operator=(wxChar ch) { AssignCopy(1, &ch); return *this; } // assigns C string -wxString& wxString::operator=(const char *psz) +wxString& wxString::operator=(const wxChar *psz) { - AssignCopy(Strlen(psz), psz); + AssignCopy(wxStrlen(psz), psz); return *this; } +#if !wxUSE_UNICODE + // same as 'signed char' variant wxString& wxString::operator=(const unsigned char* psz) { @@ -419,59 +509,64 @@ wxString& wxString::operator=(const unsigned char* psz) return *this; } +#if wxUSE_WCHAR_T wxString& wxString::operator=(const wchar_t *pwz) { wxString str(pwz); *this = str; return *this; } +#endif + +#endif // --------------------------------------------------------------------------- // string concatenation // --------------------------------------------------------------------------- // add something to this string -void wxString::ConcatSelf(int nSrcLen, const char *pszSrcData) +void wxString::ConcatSelf(int nSrcLen, const wxChar *pszSrcData) { STATISTICS_ADD(SummandLength, nSrcLen); - // concatenating an empty string is a NOP, but it happens quite rarely, - // so we don't waste our time checking for it - // if ( nSrcLen > 0 ) - wxStringData *pData = GetStringData(); - uint nLen = pData->nDataLength; - uint nNewLen = nLen + nSrcLen; - - // alloc new buffer if current is too small - if ( pData->IsShared() ) { - STATISTICS_ADD(ConcatHit, 0); - - // we have to allocate another buffer - wxStringData* pOldData = GetStringData(); - AllocBuffer(nNewLen); - memcpy(m_pchData, pOldData->data(), nLen*sizeof(char)); - pOldData->Unlock(); - } - else if ( nNewLen > pData->nAllocLength ) { - STATISTICS_ADD(ConcatHit, 0); + // concatenating an empty string is a NOP + if ( nSrcLen > 0 ) { + wxStringData *pData = GetStringData(); + size_t nLen = pData->nDataLength; + size_t nNewLen = nLen + nSrcLen; + + // alloc new buffer if current is too small + if ( pData->IsShared() ) { + STATISTICS_ADD(ConcatHit, 0); + + // we have to allocate another buffer + wxStringData* pOldData = GetStringData(); + AllocBuffer(nNewLen); + memcpy(m_pchData, pOldData->data(), nLen*sizeof(wxChar)); + pOldData->Unlock(); + } + else if ( nNewLen > pData->nAllocLength ) { + STATISTICS_ADD(ConcatHit, 0); - // we have to grow the buffer - Alloc(nNewLen); - } - else { - STATISTICS_ADD(ConcatHit, 1); + // we have to grow the buffer + Alloc(nNewLen); + } + else { + STATISTICS_ADD(ConcatHit, 1); - // the buffer is already big enough - } + // the buffer is already big enough + } - // should be enough space - wxASSERT( nNewLen <= GetStringData()->nAllocLength ); + // should be enough space + wxASSERT( nNewLen <= GetStringData()->nAllocLength ); - // fast concatenation - all is done in our buffer - memcpy(m_pchData + nLen, pszSrcData, nSrcLen*sizeof(char)); + // fast concatenation - all is done in our buffer + memcpy(m_pchData + nLen, pszSrcData, nSrcLen*sizeof(wxChar)); - m_pchData[nNewLen] = '\0'; // put terminating '\0' - GetStringData()->nDataLength = nNewLen; // and fix the length + m_pchData[nNewLen] = T('\0'); // put terminating '\0' + GetStringData()->nDataLength = nNewLen; // and fix the length + } + //else: the string to append was empty } /* @@ -492,7 +587,7 @@ wxString operator+(const wxString& string1, const wxString& string2) return s; } -wxString operator+(const wxString& string, char ch) +wxString operator+(const wxString& string, wxChar ch) { wxASSERT( string.GetStringData()->IsValid() ); @@ -502,7 +597,7 @@ wxString operator+(const wxString& string, char ch) return s; } -wxString operator+(char ch, const wxString& string) +wxString operator+(wxChar ch, const wxString& string) { wxASSERT( string.GetStringData()->IsValid() ); @@ -512,24 +607,24 @@ wxString operator+(char ch, const wxString& string) return s; } -wxString operator+(const wxString& string, const char *psz) +wxString operator+(const wxString& string, const wxChar *psz) { wxASSERT( string.GetStringData()->IsValid() ); wxString s; - s.Alloc(Strlen(psz) + string.Len()); + s.Alloc(wxStrlen(psz) + string.Len()); s = string; s += psz; return s; } -wxString operator+(const char *psz, const wxString& string) +wxString operator+(const wxChar *psz, const wxString& string) { wxASSERT( string.GetStringData()->IsValid() ); wxString s; - s.Alloc(Strlen(psz) + string.Len()); + s.Alloc(wxStrlen(psz) + string.Len()); s = psz; s += string; @@ -552,25 +647,37 @@ void wxString::AllocCopy(wxString& dest, int nCopyLen, int nCopyIndex) const } else { dest.AllocBuffer(nCopyLen); - memcpy(dest.m_pchData, m_pchData + nCopyIndex, nCopyLen*sizeof(char)); + memcpy(dest.m_pchData, m_pchData + nCopyIndex, nCopyLen*sizeof(wxChar)); } } // extract string of length nCount starting at nFirst -// default value of nCount is 0 and means "till the end" wxString wxString::Mid(size_t nFirst, size_t nCount) const { + wxStringData *pData = GetStringData(); + size_t nLen = pData->nDataLength; + + // default value of nCount is wxSTRING_MAXLEN and means "till the end" + if ( nCount == wxSTRING_MAXLEN ) + { + nCount = nLen - nFirst; + } + // out-of-bounds requests return sensible things - if ( nCount == 0 ) - nCount = GetStringData()->nDataLength - nFirst; + if ( nFirst + nCount > nLen ) + { + nCount = nLen - nFirst; + } - if ( nFirst + nCount > (size_t)GetStringData()->nDataLength ) - nCount = GetStringData()->nDataLength - nFirst; - if ( nFirst > (size_t)GetStringData()->nDataLength ) + if ( nFirst > nLen ) + { + // AllocCopy() will return empty string nCount = 0; + } wxString dest; AllocCopy(dest, nCount, nFirst); + return dest; } @@ -587,11 +694,11 @@ wxString wxString::Right(size_t nCount) const // get all characters after the last occurence of ch // (returns the whole string if ch not found) -wxString wxString::Right(char ch) const +wxString wxString::AfterLast(wxChar ch) const { wxString str; int iPos = Find(ch, TRUE); - if ( iPos == NOT_FOUND ) + if ( iPos == wxNOT_FOUND ) str = *this; else str = c_str() + iPos + 1; @@ -612,10 +719,10 @@ wxString wxString::Left(size_t nCount) const // get all characters before the first occurence of ch // (returns the whole string if ch not found) -wxString wxString::Left(char ch) const +wxString wxString::BeforeFirst(wxChar ch) const { wxString str; - for ( const char *pc = m_pchData; *pc != '\0' && *pc != ch; pc++ ) + for ( const wxChar *pc = m_pchData; *pc != T('\0') && *pc != ch; pc++ ) str += *pc; return str; @@ -623,11 +730,11 @@ wxString wxString::Left(char ch) const /// get all characters before the last occurence of ch /// (returns empty string if ch not found) -wxString wxString::Before(char ch) const +wxString wxString::BeforeLast(wxChar ch) const { wxString str; int iPos = Find(ch, TRUE); - if ( iPos != NOT_FOUND && iPos != 0 ) + if ( iPos != wxNOT_FOUND && iPos != 0 ) str = wxString(c_str(), iPos); return str; @@ -635,28 +742,28 @@ wxString wxString::Before(char ch) const /// get all characters after the first occurence of ch /// (returns empty string if ch not found) -wxString wxString::After(char ch) const +wxString wxString::AfterFirst(wxChar ch) const { wxString str; int iPos = Find(ch); - if ( iPos != NOT_FOUND ) + if ( iPos != wxNOT_FOUND ) str = c_str() + iPos + 1; return str; } // replace first (or all) occurences of some substring with another one -uint wxString::Replace(const char *szOld, const char *szNew, bool bReplaceAll) +size_t wxString::Replace(const wxChar *szOld, const wxChar *szNew, bool bReplaceAll) { - uint uiCount = 0; // count of replacements made + size_t uiCount = 0; // count of replacements made - uint uiOldLen = Strlen(szOld); + size_t uiOldLen = wxStrlen(szOld); wxString strTemp; - const char *pCurrent = m_pchData; - const char *pSubstr; - while ( *pCurrent != '\0' ) { - pSubstr = strstr(pCurrent, szOld); + const wxChar *pCurrent = m_pchData; + const wxChar *pSubstr; + while ( *pCurrent != T('\0') ) { + pSubstr = wxStrstr(pCurrent, szOld); if ( pSubstr == NULL ) { // strTemp is unused if no replacements were made, so avoid the copy if ( uiCount == 0 ) @@ -689,7 +796,7 @@ uint wxString::Replace(const char *szOld, const char *szNew, bool bReplaceAll) bool wxString::IsAscii() const { - const char *s = (const char*) *this; + const wxChar *s = (const wxChar*) *this; while(*s){ if(!isascii(*s)) return(FALSE); s++; @@ -699,9 +806,9 @@ bool wxString::IsAscii() const bool wxString::IsWord() const { - const char *s = (const char*) *this; + const wxChar *s = (const wxChar*) *this; while(*s){ - if(!isalpha(*s)) return(FALSE); + if(!wxIsalpha(*s)) return(FALSE); s++; } return(TRUE); @@ -709,9 +816,9 @@ bool wxString::IsWord() const bool wxString::IsNumber() const { - const char *s = (const char*) *this; + const wxChar *s = (const wxChar*) *this; while(*s){ - if(!isdigit(*s)) return(FALSE); + if(!wxIsdigit(*s)) return(FALSE); s++; } return(TRUE); @@ -733,8 +840,8 @@ wxString& wxString::MakeUpper() { CopyBeforeWrite(); - for ( char *p = m_pchData; *p; p++ ) - *p = (char)toupper(*p); + for ( wxChar *p = m_pchData; *p; p++ ) + *p = (wxChar)wxToupper(*p); return *this; } @@ -743,8 +850,8 @@ wxString& wxString::MakeLower() { CopyBeforeWrite(); - for ( char *p = m_pchData; *p; p++ ) - *p = (char)tolower(*p); + for ( wxChar *p = m_pchData; *p; p++ ) + *p = (wxChar)wxTolower(*p); return *this; } @@ -756,37 +863,47 @@ wxString& wxString::MakeLower() // trims spaces (in the sense of isspace) from left or right side wxString& wxString::Trim(bool bFromRight) { - CopyBeforeWrite(); - - if ( bFromRight ) - { - // find last non-space character - char *psz = m_pchData + GetStringData()->nDataLength - 1; - while ( isspace(*psz) && (psz >= m_pchData) ) - psz--; - - // truncate at trailing space start - *++psz = '\0'; - GetStringData()->nDataLength = psz - m_pchData; - } - else + // first check if we're going to modify the string at all + if ( !IsEmpty() && + ( + (bFromRight && wxIsspace(GetChar(Len() - 1))) || + (!bFromRight && wxIsspace(GetChar(0u))) + ) + ) { - // find first non-space character - const char *psz = m_pchData; - while ( isspace(*psz) ) - psz++; - - // fix up data and length - int nDataLength = GetStringData()->nDataLength - (psz - m_pchData); - memmove(m_pchData, psz, (nDataLength + 1)*sizeof(char)); - GetStringData()->nDataLength = nDataLength; + // ok, there is at least one space to trim + CopyBeforeWrite(); + + if ( bFromRight ) + { + // find last non-space character + wxChar *psz = m_pchData + GetStringData()->nDataLength - 1; + while ( wxIsspace(*psz) && (psz >= m_pchData) ) + psz--; + + // truncate at trailing space start + *++psz = T('\0'); + GetStringData()->nDataLength = psz - m_pchData; + } + else + { + // find first non-space character + const wxChar *psz = m_pchData; + while ( wxIsspace(*psz) ) + psz++; + + // fix up data and length + int nDataLength = GetStringData()->nDataLength - (psz - (const wxChar*) m_pchData); + memmove(m_pchData, psz, (nDataLength + 1)*sizeof(wxChar)); + GetStringData()->nDataLength = nDataLength; + } } return *this; } // adds nCount characters chPad to the string from either side -wxString& wxString::Pad(size_t nCount, char chPad, bool bFromRight) +wxString& wxString::Pad(size_t nCount, wxChar chPad, bool bFromRight) { wxString s(chPad, nCount); @@ -804,36 +921,68 @@ wxString& wxString::Pad(size_t nCount, char chPad, bool bFromRight) // truncate the string wxString& wxString::Truncate(size_t uiLen) { - *(m_pchData + uiLen) = '\0'; - GetStringData()->nDataLength = uiLen; + if ( uiLen < Len() ) { + CopyBeforeWrite(); + + *(m_pchData + uiLen) = T('\0'); + GetStringData()->nDataLength = uiLen; + } + //else: nothing to do, string is already short enough return *this; } // --------------------------------------------------------------------------- -// finding (return NOT_FOUND if not found and index otherwise) +// finding (return wxNOT_FOUND if not found and index otherwise) // --------------------------------------------------------------------------- // find a character -int wxString::Find(char ch, bool bFromEnd) const +int wxString::Find(wxChar ch, bool bFromEnd) const { - const char *psz = bFromEnd ? strrchr(m_pchData, ch) : strchr(m_pchData, ch); + const wxChar *psz = bFromEnd ? wxStrrchr(m_pchData, ch) : wxStrchr(m_pchData, ch); - return (psz == NULL) ? NOT_FOUND : psz - m_pchData; + return (psz == NULL) ? wxNOT_FOUND : psz - (const wxChar*) m_pchData; } // find a sub-string (like strstr) -int wxString::Find(const char *pszSub) const +int wxString::Find(const wxChar *pszSub) const { - const char *psz = strstr(m_pchData, pszSub); + const wxChar *psz = wxStrstr(m_pchData, pszSub); - return (psz == NULL) ? NOT_FOUND : psz - m_pchData; + return (psz == NULL) ? wxNOT_FOUND : psz - (const wxChar*) m_pchData; +} + +// --------------------------------------------------------------------------- +// stream-like operators +// --------------------------------------------------------------------------- +wxString& wxString::operator<<(int i) +{ + wxString res; + res.Printf(T("%d"), i); + + return (*this) << res; +} + +wxString& wxString::operator<<(float f) +{ + wxString res; + res.Printf(T("%f"), f); + + return (*this) << res; +} + +wxString& wxString::operator<<(double d) +{ + wxString res; + res.Printf(T("%g"), d); + + return (*this) << res; } // --------------------------------------------------------------------------- // formatted output // --------------------------------------------------------------------------- -int wxString::Printf(const char *pszFormat, ...) +int wxString::Printf(const wxChar *pszFormat, ...) { va_list argptr; va_start(argptr, pszFormat); @@ -845,47 +994,322 @@ int wxString::Printf(const char *pszFormat, ...) return iLen; } -int wxString::PrintfV(const char* pszFormat, va_list argptr) +int wxString::PrintfV(const wxChar* pszFormat, va_list argptr) { - static char s_szScratch[1024]; + // static buffer to avoid dynamic memory allocation each time + char s_szScratch[1024]; // using static buffer causes internal compiler err +#if 0 +#if wxUSE_THREADS + // protect the static buffer + static wxCriticalSection critsect; + wxCriticalSectionLocker lock(critsect); +#endif +#endif - int iLen = vsprintf(s_szScratch, pszFormat, argptr); - AllocBeforeWrite(iLen); - strcpy(m_pchData, s_szScratch); +#if wxUSE_EXPERIMENTAL_PRINTF +// the new implementation + + Reinit(); + for (size_t n = 0; pszFormat[n]; n++) + if (pszFormat[n] == T('%')) { + static char s_szFlags[256] = "%"; + size_t flagofs = 1; + bool adj_left = FALSE, in_prec = FALSE, + prec_dot = FALSE, done = FALSE; + int ilen = 0; + size_t min_width = 0, max_width = wxSTRING_MAXLEN; + do { +#define CHECK_PREC if (in_prec && !prec_dot) { s_szFlags[flagofs++] = '.'; prec_dot = TRUE; } + switch (pszFormat[++n]) { + case T('\0'): + done = TRUE; + break; + case T('%'): + *this += T('%'); + done = TRUE; + break; + case T('#'): + case T('0'): + case T(' '): + case T('+'): + case T('\''): + CHECK_PREC + s_szFlags[flagofs++] = pszFormat[n]; + break; + case T('-'): + CHECK_PREC + adj_left = TRUE; + s_szFlags[flagofs++] = pszFormat[n]; + break; + case T('.'): + CHECK_PREC + in_prec = TRUE; + prec_dot = FALSE; + max_width = 0; + // dot will be auto-added to s_szFlags if non-negative number follows + break; + case T('h'): + ilen = -1; + CHECK_PREC + s_szFlags[flagofs++] = pszFormat[n]; + break; + case T('l'): + ilen = 1; + CHECK_PREC + s_szFlags[flagofs++] = pszFormat[n]; + break; + case T('q'): + case T('L'): + ilen = 2; + CHECK_PREC + s_szFlags[flagofs++] = pszFormat[n]; + break; + case T('Z'): + ilen = 3; + CHECK_PREC + s_szFlags[flagofs++] = pszFormat[n]; + break; + case T('*'): + { + int len = va_arg(argptr, int); + if (in_prec) { + if (len<0) break; + CHECK_PREC + max_width = len; + } else { + if (len<0) { + adj_left = !adj_left; + s_szFlags[flagofs++] = '-'; + len = -len; + } + min_width = len; + } + flagofs += ::sprintf(s_szFlags+flagofs,"%d",len); + } + break; + case T('1'): case T('2'): case T('3'): + case T('4'): case T('5'): case T('6'): + case T('7'): case T('8'): case T('9'): + { + int len = 0; + CHECK_PREC + while ((pszFormat[n]>=T('0')) && (pszFormat[n]<=T('9'))) { + s_szFlags[flagofs++] = pszFormat[n]; + len = len*10 + (pszFormat[n] - T('0')); + n++; + } + if (in_prec) max_width = len; + else min_width = len; + n--; // the main loop pre-increments n again + } + break; + case T('d'): + case T('i'): + case T('o'): + case T('u'): + case T('x'): + case T('X'): + CHECK_PREC + s_szFlags[flagofs++] = pszFormat[n]; + s_szFlags[flagofs] = '\0'; + if (ilen == 0 ) { + int val = va_arg(argptr, int); + ::sprintf(s_szScratch, s_szFlags, val); + } + else if (ilen == -1) { + short int val = va_arg(argptr, short int); + ::sprintf(s_szScratch, s_szFlags, val); + } + else if (ilen == 1) { + long int val = va_arg(argptr, long int); + ::sprintf(s_szScratch, s_szFlags, val); + } + else if (ilen == 2) { +#if SIZEOF_LONG_LONG + long long int val = va_arg(argptr, long long int); + ::sprintf(s_szScratch, s_szFlags, val); +#else + long int val = va_arg(argptr, long int); + ::sprintf(s_szScratch, s_szFlags, val); +#endif + } + else if (ilen == 3) { + size_t val = va_arg(argptr, size_t); + ::sprintf(s_szScratch, s_szFlags, val); + } + *this += wxString(s_szScratch); + done = TRUE; + break; + case T('e'): + case T('E'): + case T('f'): + case T('g'): + case T('G'): + CHECK_PREC + s_szFlags[flagofs++] = pszFormat[n]; + s_szFlags[flagofs] = '\0'; + if (ilen == 2) { + long double val = va_arg(argptr, long double); + ::sprintf(s_szScratch, s_szFlags, val); + } else { + double val = va_arg(argptr, double); + ::sprintf(s_szScratch, s_szFlags, val); + } + *this += wxString(s_szScratch); + done = TRUE; + break; + case T('p'): + { + void *val = va_arg(argptr, void *); + CHECK_PREC + s_szFlags[flagofs++] = pszFormat[n]; + s_szFlags[flagofs] = '\0'; + ::sprintf(s_szScratch, s_szFlags, val); + *this += wxString(s_szScratch); + done = TRUE; + } + break; + case T('c'): + { + wxChar val = va_arg(argptr, int); + // we don't need to honor padding here, do we? + *this += val; + done = TRUE; + } + break; + case T('s'): + if (ilen == -1) { + // wx extension: we'll let %hs mean non-Unicode strings + char *val = va_arg(argptr, char *); +#if wxUSE_UNICODE + // ASCII->Unicode constructor handles max_width right + wxString s(val, wxConvLibc, max_width); +#else + size_t len = wxSTRING_MAXLEN; + if (val) { + for (len = 0; val[len] && (len= 1) { + long int *val = va_arg(argptr, long int *); + *val = Len(); + } + done = TRUE; + break; + default: + if (wxIsalpha(pszFormat[n])) + // probably some flag not taken care of here yet + s_szFlags[flagofs++] = pszFormat[n]; + else { + // bad format + *this += T('%'); // just to pass the glibc tst-printf.c + n--; + done = TRUE; + } + break; + } +#undef CHECK_PREC + } while (!done); + } else *this += pszFormat[n]; - return iLen; +#else + // NB: wxVsnprintf() may return either less than the buffer size or -1 if there + // is not enough place depending on implementation + int iLen = wxVsnprintf(s_szScratch, WXSIZEOF(s_szScratch), pszFormat, argptr); + char *buffer; + if ( iLen < (int)WXSIZEOF(s_szScratch) ) { + buffer = s_szScratch; + } + else { + int size = WXSIZEOF(s_szScratch) * 2; + buffer = (char *)malloc(size); + while ( buffer != NULL ) { + iLen = wxVsnprintf(buffer, WXSIZEOF(s_szScratch), pszFormat, argptr); + if ( iLen < size ) { + // ok, there was enough space + break; + } + + // still not enough, double it again + buffer = (char *)realloc(buffer, size *= 2); + } + + if ( !buffer ) { + // out of memory + return -1; + } + } + + wxString s(buffer); + *this = s; + + if ( buffer != s_szScratch ) + free(buffer); +#endif + + return Len(); } // ---------------------------------------------------------------------------- // misc other operations // ---------------------------------------------------------------------------- -bool wxString::Matches(const char *pszMask) const + +// returns TRUE if the string matches the pattern which may contain '*' and +// '?' metacharacters (as usual, '?' matches any character and '*' any number +// of them) +bool wxString::Matches(const wxChar *pszMask) const { // check char by char - const char *pszTxt; - for ( pszTxt = c_str(); *pszMask != '\0'; pszMask++, pszTxt++ ) { + const wxChar *pszTxt; + for ( pszTxt = c_str(); *pszMask != T('\0'); pszMask++, pszTxt++ ) { switch ( *pszMask ) { - case '?': - if ( *pszTxt == '\0' ) + case T('?'): + if ( *pszTxt == T('\0') ) return FALSE; - pszTxt++; - pszMask++; + // pszText and pszMask will be incremented in the loop statement + break; - case '*': + case T('*'): { // ignore special chars immediately following this one - while ( *pszMask == '*' || *pszMask == '?' ) + while ( *pszMask == T('*') || *pszMask == T('?') ) pszMask++; // if there is nothing more, match - if ( *pszMask == '\0' ) + if ( *pszMask == T('\0') ) return TRUE; // are there any other metacharacters in the mask? - uint uiLenMask; - const char *pEndMask = strpbrk(pszMask, "*?"); + size_t uiLenMask; + const wxChar *pEndMask = wxStrpbrk(pszMask, T("*?")); if ( pEndMask != NULL ) { // we have to match the string between two metachars @@ -893,11 +1317,11 @@ bool wxString::Matches(const char *pszMask) const } else { // we have to match the remainder of the string - uiLenMask = strlen(pszMask); + uiLenMask = wxStrlen(pszMask); } wxString strToMatch(pszMask, uiLenMask); - const char* pMatch = strstr(pszTxt, strToMatch); + const wxChar* pMatch = wxStrstr(pszTxt, strToMatch); if ( pMatch == NULL ) return FALSE; @@ -915,26 +1339,57 @@ bool wxString::Matches(const char *pszMask) const } // match only if nothing left - return *pszTxt == '\0'; + return *pszTxt == T('\0'); } +// Count the number of chars +int wxString::Freq(wxChar ch) const +{ + int count = 0; + int len = Len(); + for (int i = 0; i < len; i++) + { + if (GetChar(i) == ch) + count ++; + } + return count; +} + +// convert to upper case, return the copy of the string +wxString wxString::Upper() const +{ wxString s(*this); return s.MakeUpper(); } + +// convert to lower case, return the copy of the string +wxString wxString::Lower() const { wxString s(*this); return s.MakeLower(); } + +int wxString::sprintf(const wxChar *pszFormat, ...) + { + va_list argptr; + va_start(argptr, pszFormat); + int iLen = PrintfV(pszFormat, argptr); + va_end(argptr); + return iLen; + } + // --------------------------------------------------------------------------- // standard C++ library string functions // --------------------------------------------------------------------------- -#ifdef STD_STRING_COMPATIBILITY +#ifdef wxSTD_STRING_COMPATIBILITY wxString& wxString::insert(size_t nPos, const wxString& str) { wxASSERT( str.GetStringData()->IsValid() ); wxASSERT( nPos <= Len() ); - wxString strTmp; - char *pc = strTmp.GetWriteBuf(Len() + str.Len()); - strncpy(pc, c_str(), nPos); - strcpy(pc + nPos, str); - strcpy(pc + nPos + str.Len(), c_str() + nPos); - strTmp.UngetWriteBuf(); - *this = strTmp; + if ( !str.IsEmpty() ) { + wxString strTmp; + wxChar *pc = strTmp.GetWriteBuf(Len() + str.Len()); + wxStrncpy(pc, c_str(), nPos); + wxStrcpy(pc + nPos, str); + wxStrcpy(pc + nPos + str.Len(), c_str() + nPos); + strTmp.UngetWriteBuf(); + *this = strTmp; + } return *this; } @@ -944,37 +1399,40 @@ size_t wxString::find(const wxString& str, size_t nStart) const wxASSERT( str.GetStringData()->IsValid() ); wxASSERT( nStart <= Len() ); - const char *p = strstr(c_str() + nStart, str); + const wxChar *p = wxStrstr(c_str() + nStart, str); return p == NULL ? npos : p - c_str(); } // VC++ 1.5 can't cope with the default argument in the header. -#if ! (defined(_MSC_VER) && !defined(__WIN32__)) -size_t wxString::find(const char* sz, size_t nStart, size_t n) const +#if !defined(__VISUALC__) || defined(__WIN32__) +size_t wxString::find(const wxChar* sz, size_t nStart, size_t n) const { return find(wxString(sz, n == npos ? 0 : n), nStart); } -#endif +#endif // VC++ 1.5 -size_t wxString::find(char ch, size_t nStart) const +// Gives a duplicate symbol (presumably a case-insensitivity problem) +#if !defined(__BORLANDC__) +size_t wxString::find(wxChar ch, size_t nStart) const { wxASSERT( nStart <= Len() ); - const char *p = strchr(c_str() + nStart, ch); + const wxChar *p = wxStrchr(c_str() + nStart, ch); return p == NULL ? npos : p - c_str(); } +#endif size_t wxString::rfind(const wxString& str, size_t nStart) const { wxASSERT( str.GetStringData()->IsValid() ); wxASSERT( nStart <= Len() ); - // # could be quicker than that - const char *p = c_str() + (nStart == npos ? Len() : nStart); + // TODO could be made much quicker than that + const wxChar *p = c_str() + (nStart == npos ? Len() : nStart); while ( p >= c_str() + str.Len() ) { - if ( strncmp(p - str.Len(), str, str.Len()) == 0 ) + if ( wxStrncmp(p - str.Len(), str, str.Len()) == 0 ) return p - str.Len() - c_str(); p--; } @@ -983,21 +1441,133 @@ size_t wxString::rfind(const wxString& str, size_t nStart) const } // VC++ 1.5 can't cope with the default argument in the header. -#if ! (defined(_MSC_VER) && !defined(__WIN32__)) -size_t wxString::rfind(const char* sz, size_t nStart, size_t n) const +#if !defined(__VISUALC__) || defined(__WIN32__) +size_t wxString::rfind(const wxChar* sz, size_t nStart, size_t n) const { - return rfind(wxString(sz, n == npos ? 0 : n), nStart); + return rfind(wxString(sz, n == npos ? 0 : n), nStart); } -size_t wxString::rfind(char ch, size_t nStart) const +size_t wxString::rfind(wxChar ch, size_t nStart) const { - wxASSERT( nStart <= Len() ); + if ( nStart == npos ) + { + nStart = Len(); + } + else + { + wxASSERT( nStart <= Len() ); + } - const char *p = strrchr(c_str() + nStart, ch); + const wxChar *p = wxStrrchr(c_str(), ch); - return p == NULL ? npos : p - c_str(); + if ( p == NULL ) + return npos; + + size_t result = p - c_str(); + return ( result > nStart ) ? npos : result; +} +#endif // VC++ 1.5 + +size_t wxString::find_first_of(const wxChar* sz, size_t nStart) const +{ + const wxChar *start = c_str() + nStart; + const wxChar *firstOf = wxStrpbrk(start, sz); + if ( firstOf ) + return firstOf - start; + else + return npos; +} + +size_t wxString::find_last_of(const wxChar* sz, size_t nStart) const +{ + if ( nStart == npos ) + { + nStart = Len(); + } + else + { + wxASSERT( nStart <= Len() ); + } + + for ( const wxChar *p = c_str() + length() - 1; p >= c_str(); p-- ) + { + if ( wxStrchr(sz, *p) ) + return p - c_str(); + } + + return npos; +} + +size_t wxString::find_first_not_of(const wxChar* sz, size_t nStart) const +{ + if ( nStart == npos ) + { + nStart = Len(); + } + else + { + wxASSERT( nStart <= Len() ); + } + + size_t nAccept = wxStrspn(c_str() + nStart, sz); + if ( nAccept >= length() - nStart ) + return npos; + else + return nAccept; +} + +size_t wxString::find_first_not_of(wxChar ch, size_t nStart) const +{ + wxASSERT( nStart <= Len() ); + + for ( const wxChar *p = c_str() + nStart; *p; p++ ) + { + if ( *p != ch ) + return p - c_str(); + } + + return npos; +} + +size_t wxString::find_last_not_of(const wxChar* sz, size_t nStart) const +{ + if ( nStart == npos ) + { + nStart = Len(); + } + else + { + wxASSERT( nStart <= Len() ); + } + + for ( const wxChar *p = c_str() + nStart - 1; p >= c_str(); p-- ) + { + if ( !wxStrchr(sz, *p) ) + return p - c_str(); + } + + return npos; +} + +size_t wxString::find_last_not_of(wxChar ch, size_t nStart) const +{ + if ( nStart == npos ) + { + nStart = Len(); + } + else + { + wxASSERT( nStart <= Len() ); + } + + for ( const wxChar *p = c_str() + nStart - 1; p >= c_str(); p-- ) + { + if ( *p != ch ) + return p - c_str(); + } + + return npos; } -#endif wxString wxString::substr(size_t nStart, size_t nLen) const { @@ -1023,9 +1593,9 @@ wxString& wxString::erase(size_t nStart, size_t nLen) return *this; } -wxString& wxString::replace(size_t nStart, size_t nLen, const char *sz) +wxString& wxString::replace(size_t nStart, size_t nLen, const wxChar *sz) { - wxASSERT( nStart + nLen <= Strlen(sz) ); + wxASSERT( nStart + nLen <= wxStrlen(sz) ); wxString strTmp; if ( nStart != 0 ) @@ -1037,7 +1607,7 @@ wxString& wxString::replace(size_t nStart, size_t nLen, const char *sz) return *this; } -wxString& wxString::replace(size_t nStart, size_t nLen, size_t nCount, char ch) +wxString& wxString::replace(size_t nStart, size_t nLen, size_t nCount, wxChar ch) { return replace(nStart, nLen, wxString(ch, nCount)); } @@ -1049,7 +1619,7 @@ wxString& wxString::replace(size_t nStart, size_t nLen, } wxString& wxString::replace(size_t nStart, size_t nLen, - const char* sz, size_t nCount) + const wxChar* sz, size_t nCount) { return replace(nStart, nLen, wxString(sz, nCount)); } @@ -1073,7 +1643,7 @@ wxArrayString::wxArrayString() { m_nSize = m_nCount = 0; - m_pItems = NULL; + m_pItems = (wxChar **) NULL; } // copy ctor @@ -1081,7 +1651,7 @@ wxArrayString::wxArrayString(const wxArrayString& src) { m_nSize = m_nCount = 0; - m_pItems = NULL; + m_pItems = (wxChar **) NULL; *this = src; } @@ -1089,19 +1659,19 @@ wxArrayString::wxArrayString(const wxArrayString& src) // assignment operator wxArrayString& wxArrayString::operator=(const wxArrayString& src) { - Clear(); + if ( m_nSize > 0 ) + Clear(); - m_nSize = 0; if ( src.m_nCount > ARRAY_DEFAULT_INITIAL_SIZE ) Alloc(src.m_nCount); // we can't just copy the pointers here because otherwise we would share // the strings with another array - for ( uint n = 0; n < src.m_nCount; n++ ) + for ( size_t n = 0; n < src.m_nCount; n++ ) Add(src[n]); if ( m_nCount != 0 ) - memcpy(m_pItems, src.m_pItems, m_nCount*sizeof(char *)); + memcpy(m_pItems, src.m_pItems, m_nCount*sizeof(wxChar *)); return *this; } @@ -1114,12 +1684,17 @@ void wxArrayString::Grow() if( m_nSize == 0 ) { // was empty, alloc some memory m_nSize = ARRAY_DEFAULT_INITIAL_SIZE; - m_pItems = new char *[m_nSize]; + m_pItems = new wxChar *[m_nSize]; } else { // otherwise when it's called for the first time, nIncrement would be 0 // and the array would never be expanded +#if defined(__VISAGECPP__) + int array_size = ARRAY_DEFAULT_INITIAL_SIZE; + wxASSERT( array_size != 0 ); +#else wxASSERT( ARRAY_DEFAULT_INITIAL_SIZE != 0 ); +#endif // add 50% but not too much size_t nIncrement = m_nSize < ARRAY_DEFAULT_INITIAL_SIZE @@ -1127,10 +1702,10 @@ void wxArrayString::Grow() if ( nIncrement > ARRAY_MAXSIZE_INCREMENT ) nIncrement = ARRAY_MAXSIZE_INCREMENT; m_nSize += nIncrement; - char **pNew = new char *[m_nSize]; + wxChar **pNew = new wxChar *[m_nSize]; // copy data to new location - memcpy(pNew, m_pItems, m_nCount*sizeof(char *)); + memcpy(pNew, m_pItems, m_nCount*sizeof(wxChar *)); // delete old memory (but do not release the strings!) wxDELETEA(m_pItems); @@ -1183,19 +1758,34 @@ void wxArrayString::Alloc(size_t nSize) if ( nSize > m_nSize ) { Free(); wxDELETEA(m_pItems); - m_pItems = new char *[nSize]; + m_pItems = new wxChar *[nSize]; m_nSize = nSize; } m_nCount = 0; } +// minimizes the memory usage by freeing unused memory +void wxArrayString::Shrink() +{ + // only do it if we have some memory to free + if( m_nCount < m_nSize ) { + // allocates exactly as much memory as we need + wxChar **pNew = new wxChar *[m_nCount]; + + // copy data to new location + memcpy(pNew, m_pItems, m_nCount*sizeof(wxChar *)); + delete [] m_pItems; + m_pItems = pNew; + } +} + // searches the array for an item (forward or backwards) -int wxArrayString::Index(const char *sz, bool bCase, bool bFromEnd) const +int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const { if ( bFromEnd ) { if ( m_nCount > 0 ) { - uint ui = m_nCount; + size_t ui = m_nCount; do { if ( STRING(m_pItems[--ui])->IsSameAs(sz, bCase) ) return ui; @@ -1204,13 +1794,13 @@ int wxArrayString::Index(const char *sz, bool bCase, bool bFromEnd) const } } else { - for( uint ui = 0; ui < m_nCount; ui++ ) { + for( size_t ui = 0; ui < m_nCount; ui++ ) { if( STRING(m_pItems[ui])->IsSameAs(sz, bCase) ) return ui; } } - return NOT_FOUND; + return wxNOT_FOUND; } // add item at the end @@ -1222,7 +1812,7 @@ void wxArrayString::Add(const wxString& str) // the string data must not be deleted! str.GetStringData()->Lock(); - m_pItems[m_nCount++] = (char *)str.c_str(); + m_pItems[m_nCount++] = (wxChar *)str.c_str(); } // add item at the given position @@ -1230,15 +1820,15 @@ void wxArrayString::Insert(const wxString& str, size_t nIndex) { wxASSERT( str.GetStringData()->IsValid() ); - wxCHECK_RET( nIndex <= m_nCount, "bad index in wxArrayString::Insert" ); + wxCHECK_RET( nIndex <= m_nCount, _("bad index in wxArrayString::Insert") ); Grow(); memmove(&m_pItems[nIndex + 1], &m_pItems[nIndex], - (m_nCount - nIndex)*sizeof(char *)); + (m_nCount - nIndex)*sizeof(wxChar *)); str.GetStringData()->Lock(); - m_pItems[nIndex] = (char *)str.c_str(); + m_pItems[nIndex] = (wxChar *)str.c_str(); m_nCount++; } @@ -1246,31 +1836,104 @@ void wxArrayString::Insert(const wxString& str, size_t nIndex) // removes item from array (by index) void wxArrayString::Remove(size_t nIndex) { - wxCHECK_RET( nIndex <= m_nCount, "bad index in wxArrayString::Remove" ); + wxCHECK_RET( nIndex <= m_nCount, _("bad index in wxArrayString::Remove") ); // release our lock Item(nIndex).GetStringData()->Unlock(); memmove(&m_pItems[nIndex], &m_pItems[nIndex + 1], - (m_nCount - nIndex - 1)*sizeof(char *)); + (m_nCount - nIndex - 1)*sizeof(wxChar *)); m_nCount--; } // removes item from array (by value) -void wxArrayString::Remove(const char *sz) +void wxArrayString::Remove(const wxChar *sz) { int iIndex = Index(sz); - wxCHECK_RET( iIndex != NOT_FOUND, - "removing inexistent element in wxArrayString::Remove" ); + wxCHECK_RET( iIndex != wxNOT_FOUND, + _("removing inexistent element in wxArrayString::Remove") ); - Remove((size_t)iIndex); + Remove(iIndex); +} + +// ---------------------------------------------------------------------------- +// sorting +// ---------------------------------------------------------------------------- + +// we can only sort one array at a time with the quick-sort based +// implementation +#if wxUSE_THREADS + // need a critical section to protect access to gs_compareFunction and + // gs_sortAscending variables + static wxCriticalSection *gs_critsectStringSort = NULL; + + // call this before the value of the global sort vars is changed/after + // you're finished with them + #define START_SORT() wxASSERT( !gs_critsectStringSort ); \ + gs_critsectStringSort = new wxCriticalSection; \ + gs_critsectStringSort->Enter() + #define END_SORT() gs_critsectStringSort->Leave(); \ + delete gs_critsectStringSort; \ + gs_critsectStringSort = NULL +#else // !threads + #define START_SORT() + #define END_SORT() +#endif // wxUSE_THREADS + +// function to use for string comparaison +static wxArrayString::CompareFunction gs_compareFunction = NULL; + +// if we don't use the compare function, this flag tells us if we sort the +// array in ascending or descending order +static bool gs_sortAscending = TRUE; + +// function which is called by quick sort +static int LINKAGEMODE wxStringCompareFunction(const void *first, const void *second) +{ + wxString *strFirst = (wxString *)first; + wxString *strSecond = (wxString *)second; + + if ( gs_compareFunction ) { + return gs_compareFunction(*strFirst, *strSecond); + } + else { + // maybe we should use wxStrcoll + int result = wxStrcmp(strFirst->c_str(), strSecond->c_str()); + + return gs_sortAscending ? result : -result; + } } // sort array elements using passed comparaison function +void wxArrayString::Sort(CompareFunction compareFunction) +{ + START_SORT(); + + wxASSERT( !gs_compareFunction ); // must have been reset to NULL + gs_compareFunction = compareFunction; + + DoSort(); -void wxArrayString::Sort(bool WXUNUSED(bCase), bool WXUNUSED(bReverse) ) + END_SORT(); +} + +void wxArrayString::Sort(bool reverseOrder) { - //@@@@ TO DO - //qsort(m_pItems, m_nCount, sizeof(char *), fCmp); + START_SORT(); + + wxASSERT( !gs_compareFunction ); // must have been reset to NULL + gs_sortAscending = !reverseOrder; + + DoSort(); + + END_SORT(); +} + +void wxArrayString::DoSort() +{ + // just sort the pointers using qsort() - of course it only works because + // wxString() *is* a pointer to its data + qsort(m_pItems, m_nCount, sizeof(wxChar *), wxStringCompareFunction); } +