X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38caaa61b154f60871cb6ec82040362762dd2dba..3ffb81a42350ef0fe9161185480ed41d3f0e76dd:/src/common/string.cpp?ds=sidebyside diff --git a/src/common/string.cpp b/src/common/string.cpp index a53c4378f9..2bd4e6178f 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -6,10 +6,10 @@ // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "string.h" #endif @@ -46,19 +46,6 @@ #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) // NB: EXTRA_ALLOC must be >= 0! @@ -68,14 +55,26 @@ // static class variables definition // --------------------------------------------------------------------------- -#ifdef wxSTD_STRING_COMPATIBILITY - const size_t wxString::npos = wxSTRING_MAXLEN; -#endif // wxSTD_STRING_COMPATIBILITY +#if defined(__VISAGECPP__) && __IBMCPP__ >= 400 +// must define this static for VA or else you get multiply defined symbols +// everywhere +const unsigned int wxSTRING_MAXLEN = UINT_MAX - 100; +#endif // Visual Age + +#if !wxUSE_STL + const size_t wxStringBase::npos = wxSTRING_MAXLEN; +#endif // ---------------------------------------------------------------------------- // static data // ---------------------------------------------------------------------------- +#if wxUSE_STL + +extern const wxChar WXDLLIMPEXP_BASE *wxEmptyString = _T(""); + +#else + // 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) @@ -85,68 +84,16 @@ static const struct wxChar dummy; } g_strEmpty = { {-1, 0, 0}, wxT('\0') }; -#if defined(__VISAGECPP__) && __IBMCPP__ >= 400 -// must define this static for VA or else you get multiply defined symbols everywhere -const unsigned int wxSTRING_MAXLEN = UINT_MAX - 100; - -#endif - // empty C style string: points to 'string data' byte of g_strEmpty -extern const wxChar WXDLLEXPORT *wxEmptyString = &g_strEmpty.dummy; - -// ---------------------------------------------------------------------------- -// conditional compilation -// ---------------------------------------------------------------------------- +extern const wxChar WXDLLIMPEXP_BASE *wxEmptyString = &g_strEmpty.dummy; -#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. -// -// FIXME currently, this is only for ANSI (!Unicode) strings, so we call this -// function wxVsnprintfA (A for ANSI), should also find one for Unicode -// strings in Unicode build -#ifdef __WXMSW__ - #if defined(__VISUALC__) || (defined(__MINGW32__) && wxUSE_NORLANDER_HEADERS) - #define wxVsnprintfA _vsnprintf - #endif -#elif defined(__WXMAC__) - #define wxVsnprintfA vsnprintf -#else // !Windows - #ifdef HAVE_VSNPRINTF - #define wxVsnprintfA vsnprintf - #endif -#endif // Windows/!Windows - -#ifndef wxVsnprintfA - // 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 wxVsnprintfA(buf, len, format, arg) vsprintf(buf, format, arg) - - #if defined(__VISUALC__) - #pragma message("Using sprintf() because no snprintf()-like function defined") - #elif defined(__GNUG__) - #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 // ---------------------------------------------------------------------------- -#if defined(wxSTD_STRING_COMPATIBILITY) && wxUSE_STD_IOSTREAM +#if wxUSE_STD_IOSTREAM // MS Visual C++ version 5.0 provides the new STL headers as well as the old // iostream ones. @@ -190,47 +137,7 @@ wxSTD ostream& operator<<(wxSTD ostream& os, const wxString& str) return os; } -#endif //std::string compatibility - -extern int WXDLLEXPORT wxVsnprintf(wxChar *buf, size_t len, - const wxChar *format, va_list argptr) -{ -#if wxUSE_UNICODE - // FIXME should use wvsnprintf() or whatever if it's available - wxString s; - int iLen = s.PrintfV(format, argptr); - if ( iLen != -1 ) - { - wxStrncpy(buf, s.c_str(), len); - buf[len-1] = wxT('\0'); - } - - return iLen; -#else // ANSI - // vsnprintf() will not terminate the string with '\0' if there is not - // enough place, but we want the string to always be NUL terminated - int rc = wxVsnprintfA(buf, len - 1, format, argptr); - if ( rc == -1 ) - { - buf[len] = 0; - } - - return rc; -#endif // Unicode/ANSI -} - -extern int WXDLLEXPORT wxSnprintf(wxChar *buf, size_t len, - const wxChar *format, ...) -{ - va_list argptr; - va_start(argptr, format); - - int iLen = wxVsnprintf(buf, len, format, argptr); - - va_end(argptr); - - return iLen; -} +#endif // wxUSE_STD_IOSTREAM // ---------------------------------------------------------------------------- // private classes @@ -242,15 +149,15 @@ extern int WXDLLEXPORT wxSnprintf(wxChar *buf, size_t len, class Averager { public: - Averager(const char *sz) { m_sz = sz; m_nTotal = m_nCount = 0; } + Averager(const wxChar *sz) { m_sz = sz; m_nTotal = m_nCount = 0; } ~Averager() - { printf("wxString: average %s = %f\n", m_sz, ((float)m_nTotal)/m_nCount); } + { wxPrintf("wxString: average %s = %f\n", m_sz, ((float)m_nTotal)/m_nCount); } void Add(size_t n) { m_nTotal += n; m_nCount++; } private: size_t m_nCount, m_nTotal; - const char *m_sz; + const wxChar *m_sz; } g_averageLength("allocation size"), g_averageSummandLength("summand length"), g_averageConcatHit("hit probability in concat"), @@ -262,37 +169,30 @@ extern int WXDLLEXPORT wxSnprintf(wxChar *buf, size_t len, #endif // WXSTRING_STATISTICS // =========================================================================== -// wxString class core +// wxStringData class deallocation // =========================================================================== -// --------------------------------------------------------------------------- -// construction -// --------------------------------------------------------------------------- - -// constructs string of copies of character -wxString::wxString(wxChar ch, size_t nLength) +#if defined(__VISUALC__) && defined(_MT) && !defined(_DLL) +# pragma message (__FILE__ ": building with Multithreaded non DLL runtime has a performance impact on wxString!") +void wxStringData::Free() { - Init(); + free(this); +} +#endif - if ( nLength > 0 ) { - AllocBuffer(nLength); +#if !wxUSE_STL -#if wxUSE_UNICODE - // memset only works on char - for (size_t n=0; n 0 ) { // trailing '\0' is written in AllocBuffer() - AllocBuffer(nLength); + if ( !AllocBuffer(nLength) ) { + wxFAIL_MSG( _T("out of memory in wxStringBase::InitWith") ); + return; + } memcpy(m_pchData, psz + nPos, nLength*sizeof(wxChar)); } } -#ifdef wxSTD_STRING_COMPATIBILITY - // poor man's iterators are "void *" pointers -wxString::wxString(const void *pStart, const void *pEnd) +wxStringBase::wxStringBase(const void *pStart, const void *pEnd) { 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) +wxStringBase::wxStringBase(size_type n, wxChar ch) { - // 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, wxMBConv& conv) -{ - // first get necessary size - size_t nLen = pwz ? conv.WC2MB((char *) NULL, pwz, 0) : 0; - - // empty? - if ( (nLen != 0) && (nLen != (size_t)-1) ) { - AllocBuffer(nLen); - conv.WC2MB(m_pchData, pwz, nLen); - } - else { - Init(); - } + Init(); + append(n, ch); } -#endif // wxUSE_WCHAR_T - -#endif // Unicode/ANSI // --------------------------------------------------------------------------- // memory allocation // --------------------------------------------------------------------------- // allocates memory needed to store a C string of length nLen -void wxString::AllocBuffer(size_t nLen) +bool wxStringBase::AllocBuffer(size_t nLen) { // allocating 0 sized buffer doesn't make sense, all empty strings should // reuse g_strEmpty @@ -384,30 +245,42 @@ void wxString::AllocBuffer(size_t nLen) // 2) sizeof(wxStringData) for housekeeping info wxStringData* pData = (wxStringData*) malloc(sizeof(wxStringData) + (nLen + EXTRA_ALLOC + 1)*sizeof(wxChar)); + + if ( pData == NULL ) { + // allocation failures are handled by the caller + return FALSE; + } + pData->nRefs = 1; pData->nDataLength = nLen; pData->nAllocLength = nLen + EXTRA_ALLOC; m_pchData = pData->data(); // data starts after wxStringData m_pchData[nLen] = wxT('\0'); + return TRUE; } // must be called before changing this string -void wxString::CopyBeforeWrite() +bool wxStringBase::CopyBeforeWrite() { wxStringData* pData = GetStringData(); if ( pData->IsShared() ) { pData->Unlock(); // memory not freed because shared size_t nLen = pData->nDataLength; - AllocBuffer(nLen); + if ( !AllocBuffer(nLen) ) { + // allocation failures are handled by the caller + return FALSE; + } memcpy(m_pchData, pData->data(), nLen*sizeof(wxChar)); } wxASSERT( !GetStringData()->IsShared() ); // we must be the only owner + + return TRUE; } // must be called before replacing contents of this string -void wxString::AllocBeforeWrite(size_t nLen) +bool wxStringBase::AllocBeforeWrite(size_t nLen) { wxASSERT( nLen != 0 ); // doesn't make any sense @@ -416,7 +289,10 @@ void wxString::AllocBeforeWrite(size_t nLen) if ( pData->IsShared() || pData->IsEmpty() ) { // can't work with old buffer, get new one pData->Unlock(); - AllocBuffer(nLen); + if ( !AllocBuffer(nLen) ) { + // allocation failures are handled by the caller + return FALSE; + } } else { if ( nLen > pData->nAllocLength ) { @@ -426,97 +302,707 @@ void wxString::AllocBeforeWrite(size_t nLen) nLen += EXTRA_ALLOC; - wxStringData *pDataOld = pData; pData = (wxStringData*) realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar)); - if ( !pData ) { - // out of memory - free(pDataOld); - // FIXME we're going to crash... - return; + if ( pData == NULL ) { + // allocation failures are handled by the caller + // keep previous data since reallocation failed + return FALSE; } pData->nAllocLength = nLen; m_pchData = pData->data(); } - // now we have enough space, just update the string length - pData->nDataLength = nLen; - } + // now we have enough space, just update the string length + pData->nDataLength = nLen; + } + + wxASSERT( !GetStringData()->IsShared() ); // we must be the only owner + + return TRUE; +} + +wxStringBase& wxStringBase::append(size_t n, wxChar ch) +{ + size_type len = length(); + + if ( !CopyBeforeWrite() || !Alloc(len + n) ) { + wxFAIL_MSG( _T("out of memory in wxStringBase::append") ); + } + GetStringData()->nDataLength = len + n; + m_pchData[len + n] = '\0'; + for ( size_t i = 0; i < n; ++i ) + m_pchData[len + i] = ch; + return *this; +} + +void wxStringBase::resize(size_t nSize, wxChar ch) +{ + size_t len = length(); + + if ( nSize < len ) + { + erase(begin() + nSize, end()); + } + else if ( nSize > len ) + { + append(nSize - len, ch); + } + //else: we have exactly the specified length, nothing to do +} + +// allocate enough memory for nLen characters +bool wxStringBase::Alloc(size_t nLen) +{ + wxStringData *pData = GetStringData(); + if ( pData->nAllocLength <= nLen ) { + if ( pData->IsEmpty() ) { + nLen += EXTRA_ALLOC; + + wxStringData* pData = (wxStringData*) + malloc(sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar)); + + if ( pData == NULL ) { + // allocation failure handled by caller + return FALSE; + } + + pData->nRefs = 1; + pData->nDataLength = 0; + pData->nAllocLength = nLen; + m_pchData = pData->data(); // data starts after wxStringData + m_pchData[0u] = wxT('\0'); + } + else if ( pData->IsShared() ) { + pData->Unlock(); // memory not freed because shared + size_t nOldLen = pData->nDataLength; + if ( !AllocBuffer(nLen) ) { + // allocation failure handled by caller + return FALSE; + } + memcpy(m_pchData, pData->data(), nOldLen*sizeof(wxChar)); + } + else { + nLen += EXTRA_ALLOC; + + pData = (wxStringData *) + realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar)); + + if ( pData == NULL ) { + // allocation failure handled by caller + // keep previous data since reallocation failed + return FALSE; + } + + // it's not important if the pointer changed or not (the check for this + // is not faster than assigning to m_pchData in all cases) + pData->nAllocLength = nLen; + m_pchData = pData->data(); + } + } + //else: we've already got enough + return TRUE; +} + +wxStringBase::iterator wxStringBase::erase(iterator it) +{ + size_type idx = it - begin(); + erase(idx, 1); + return begin() + idx; +} + +wxStringBase& wxStringBase::erase(size_t nStart, size_t nLen) +{ + wxASSERT(nStart <= length()); + size_t strLen = length() - nStart; + // delete nLen or up to the end of the string characters + nLen = strLen < nLen ? strLen : nLen; + wxString strTmp(c_str(), nStart); + strTmp.append(c_str() + nStart + nLen, length() - nStart - nLen); + + swap(strTmp); + return *this; +} + +wxStringBase& wxStringBase::insert(size_t nPos, const wxChar *sz, size_t n) +{ + wxASSERT( nPos <= length() ); + + if ( n == npos ) n = wxStrlen(sz); + if ( n == 0 ) return *this; + + if ( !CopyBeforeWrite() || !Alloc(length() + n) ) { + wxFAIL_MSG( _T("out of memory in wxStringBase::insert") ); + } + + memmove(m_pchData + nPos + n, m_pchData + nPos, + (length() - nPos) * sizeof(wxChar)); + memcpy(m_pchData + nPos, sz, n * sizeof(wxChar)); + GetStringData()->nDataLength = length() + n; + m_pchData[length()] = '\0'; + + return *this; +} + +void wxStringBase::swap(wxStringBase& str) +{ + wxChar* tmp = str.m_pchData; + str.m_pchData = m_pchData; + m_pchData = tmp; +} + +size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const +{ + wxASSERT( str.GetStringData()->IsValid() ); + wxASSERT( nStart <= length() ); + + const wxChar *p = wxStrstr(c_str() + nStart, str.c_str()); + + return p == NULL ? npos : p - c_str(); +} + +size_t wxStringBase::find(const wxChar* sz, size_t nStart, size_t n) const +{ + return find(wxStringBase(sz, n), nStart); +} + +size_t wxStringBase::find(wxChar ch, size_t nStart) const +{ + wxASSERT( nStart <= length() ); + + const wxChar *p = wxStrchr(c_str() + nStart, ch); + + return p == NULL ? npos : p - c_str(); +} + +size_t wxStringBase::rfind(const wxStringBase& str, size_t nStart) const +{ + wxASSERT( str.GetStringData()->IsValid() ); + wxASSERT( nStart == npos || nStart <= length() ); + + // TODO could be made much quicker than that + const wxChar *p = c_str() + (nStart == npos ? length() : nStart); + while ( p >= c_str() + str.length() ) { + if ( wxStrncmp(p - str.length(), str.c_str(), str.length()) == 0 ) + return p - str.length() - c_str(); + p--; + } + + return npos; +} + +size_t wxStringBase::rfind(const wxChar* sz, size_t nStart, size_t n) const +{ + return rfind(wxStringBase(sz, n), nStart); +} + +size_t wxStringBase::rfind(wxChar ch, size_t nStart) const +{ + if ( nStart == npos ) + { + nStart = length(); + } + else + { + wxASSERT( nStart <= length() ); + } + + const wxChar *p = wxStrrchr(c_str(), ch); + + if ( p == NULL ) + return npos; + + size_t result = p - c_str(); + return ( result > nStart ) ? npos : result; +} + +size_t wxStringBase::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 - c_str(); + else + return npos; +} + +size_t wxStringBase::find_last_of(const wxChar* sz, size_t nStart) const +{ + if ( nStart == npos ) + { + nStart = length(); + } + else + { + wxASSERT_MSG( nStart <= length(), + _T("invalid index in find_last_of()") ); + } + + for ( const wxChar *p = c_str() + nStart - 1; p >= c_str(); p-- ) + { + if ( wxStrchr(sz, *p) ) + return p - c_str(); + } + + return npos; +} + +size_t wxStringBase::find_first_not_of(const wxChar* sz, size_t nStart) const +{ + if ( nStart == npos ) + { + nStart = length(); + } + else + { + wxASSERT( nStart <= length() ); + } + + size_t nAccept = wxStrspn(c_str() + nStart, sz); + if ( nAccept >= length() - nStart ) + return npos; + else + return nAccept; +} + +size_t wxStringBase::find_first_not_of(wxChar ch, size_t nStart) const +{ + wxASSERT( nStart <= length() ); + + for ( const wxChar *p = c_str() + nStart; *p; p++ ) + { + if ( *p != ch ) + return p - c_str(); + } + + return npos; +} + +size_t wxStringBase::find_last_not_of(const wxChar* sz, size_t nStart) const +{ + if ( nStart == npos ) + { + nStart = length(); + } + else + { + wxASSERT( nStart <= length() ); + } + + for ( const wxChar *p = c_str() + nStart - 1; p >= c_str(); p-- ) + { + if ( !wxStrchr(sz, *p) ) + return p - c_str(); + } + + return npos; +} + +size_t wxStringBase::find_last_not_of(wxChar ch, size_t nStart) const +{ + if ( nStart == npos ) + { + nStart = length(); + } + else + { + wxASSERT( nStart <= length() ); + } + + for ( const wxChar *p = c_str() + nStart - 1; p >= c_str(); p-- ) + { + if ( *p != ch ) + return p - c_str(); + } + + return npos; +} + +wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen, + const wxChar *sz) +{ + wxASSERT_MSG( nStart <= length(), + _T("index out of bounds in wxStringBase::replace") ); + size_t strLen = length() - nStart; + nLen = strLen < nLen ? strLen : nLen; + + wxStringBase strTmp; + strTmp.reserve(length()); // micro optimisation to avoid multiple mem allocs + + if ( nStart != 0 ) + strTmp.append(c_str(), nStart); + strTmp.append(sz); + strTmp.append(c_str() + nStart + nLen); + + swap(strTmp); + return *this; +} + +wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen, + size_t nCount, wxChar ch) +{ + return replace(nStart, nLen, wxStringBase(ch, nCount).c_str()); +} + +wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen, + const wxStringBase& str, + size_t nStart2, size_t nLen2) +{ + return replace(nStart, nLen, str.substr(nStart2, nLen2)); +} + +wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen, + const wxChar* sz, size_t nCount) +{ + return replace(nStart, nLen, wxStringBase(sz, nCount).c_str()); +} + +wxStringBase wxStringBase::substr(size_t nStart, size_t nLen) const +{ + if ( nLen == npos ) + nLen = length() - nStart; + return wxStringBase(*this, nStart, nLen); +} + +// assigns one string to another +wxStringBase& wxStringBase::operator=(const wxStringBase& stringSrc) +{ + wxASSERT( stringSrc.GetStringData()->IsValid() ); + + // don't copy string over itself + if ( m_pchData != stringSrc.m_pchData ) { + if ( stringSrc.GetStringData()->IsEmpty() ) { + Reinit(); + } + else { + // adjust references + GetStringData()->Unlock(); + m_pchData = stringSrc.m_pchData; + GetStringData()->Lock(); + } + } + + return *this; +} + +// assigns a single character +wxStringBase& wxStringBase::operator=(wxChar ch) +{ + if ( !AssignCopy(1, &ch) ) { + wxFAIL_MSG( _T("out of memory in wxStringBase::operator=(wxChar)") ); + } + return *this; +} + +// assigns C string +wxStringBase& wxStringBase::operator=(const wxChar *psz) +{ + if ( !AssignCopy(wxStrlen(psz), psz) ) { + wxFAIL_MSG( _T("out of memory in wxStringBase::operator=(const wxChar *)") ); + } + return *this; +} + +// helper function: does real copy +bool wxStringBase::AssignCopy(size_t nSrcLen, const wxChar *pszSrcData) +{ + if ( nSrcLen == 0 ) { + Reinit(); + } + else { + if ( !AllocBeforeWrite(nSrcLen) ) { + // allocation failure handled by caller + return FALSE; + } + memcpy(m_pchData, pszSrcData, nSrcLen*sizeof(wxChar)); + GetStringData()->nDataLength = nSrcLen; + m_pchData[nSrcLen] = wxT('\0'); + } + return TRUE; +} + +// --------------------------------------------------------------------------- +// string concatenation +// --------------------------------------------------------------------------- + +// add something to this string +bool wxStringBase::ConcatSelf(size_t nSrcLen, const wxChar *pszSrcData, + size_t nMaxLen) +{ + STATISTICS_ADD(SummandLength, nSrcLen); + + nSrcLen = nSrcLen < nMaxLen ? nSrcLen : nMaxLen; + + // 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(); + if ( !AllocBuffer(nNewLen) ) { + // allocation failure handled by caller + return FALSE; + } + memcpy(m_pchData, pOldData->data(), nLen*sizeof(wxChar)); + pOldData->Unlock(); + } + else if ( nNewLen > pData->nAllocLength ) { + STATISTICS_ADD(ConcatHit, 0); + + reserve(nNewLen); + // we have to grow the buffer + if ( capacity() < nNewLen ) { + // allocation failure handled by caller + return FALSE; + } + } + else { + STATISTICS_ADD(ConcatHit, 1); + + // the buffer is already big enough + } + + // should be enough space + wxASSERT( nNewLen <= GetStringData()->nAllocLength ); + + // fast concatenation - all is done in our buffer + memcpy(m_pchData + nLen, pszSrcData, nSrcLen*sizeof(wxChar)); + + m_pchData[nNewLen] = wxT('\0'); // put terminating '\0' + GetStringData()->nDataLength = nNewLen; // and fix the length + } + //else: the string to append was empty + return TRUE; +} + +// --------------------------------------------------------------------------- +// simple sub-string extraction +// --------------------------------------------------------------------------- + +// helper function: clone the data attached to this string +bool wxStringBase::AllocCopy(wxString& dest, int nCopyLen, int nCopyIndex) const +{ + if ( nCopyLen == 0 ) { + dest.Init(); + } + else { + if ( !dest.AllocBuffer(nCopyLen) ) { + // allocation failure handled by caller + return FALSE; + } + memcpy(dest.m_pchData, m_pchData + nCopyIndex, nCopyLen*sizeof(wxChar)); + } + return TRUE; +} + +#endif // !wxUSE_STL + +#if !wxUSE_STL || !defined(HAVE_STD_STRING_COMPARE) + +#if !wxUSE_STL + #define STRINGCLASS wxStringBase +#else + #define STRINGCLASS wxString +#endif + +static inline int wxDoCmp(const wxChar* s1, size_t l1, + const wxChar* s2, size_t l2) +{ + if( l1 == l2 ) + return wxStrncmp(s1, s2, l1); + else if( l1 < l2 ) + { + int ret = wxStrncmp(s1, s2, l1); + return ret == 0 ? -1 : ret; + } + else if( l1 > l2 ) + { + int ret = wxStrncmp(s1, s2, l2); + return ret == 0 ? +1 : ret; + } + + wxFAIL; // must never get there + return 0; // quiet compilers +} + +#if wxUSE_STL + +int STRINGCLASS::compare(const wxStringBase& str) const +{ + return ::wxDoCmp(data(), length(), str.data(), str.length()); +} + +#endif + +int STRINGCLASS::compare(size_t nStart, size_t nLen, + const wxStringBase& str) const +{ + wxASSERT(nStart <= length()); + size_type strLen = length() - nStart; + nLen = strLen < nLen ? strLen : nLen; + return ::wxDoCmp(data() + nStart, nLen, str.data(), str.length()); +} + +int STRINGCLASS::compare(size_t nStart, size_t nLen, + const wxStringBase& str, + size_t nStart2, size_t nLen2) const +{ + wxASSERT(nStart <= length()); + wxASSERT(nStart2 <= str.length()); + size_type strLen = length() - nStart, + strLen2 = str.length() - nStart2; + nLen = strLen < nLen ? strLen : nLen; + nLen2 = strLen2 < nLen2 ? strLen2 : nLen2; + return ::wxDoCmp(data() + nStart, nLen, str.data() + nStart2, nLen2); +} + +#if wxUSE_STL + +int STRINGCLASS::compare(const wxChar* sz) const +{ + size_t nLen = wxStrlen(sz); + return ::wxDoCmp(data(), length(), sz, nLen); +} + +#endif + +int STRINGCLASS::compare(size_t nStart, size_t nLen, + const wxChar* sz, size_t nCount) const +{ + wxASSERT(nStart <= length()); + size_type strLen = length() - nStart; + nLen = strLen < nLen ? strLen : nLen; + if( nCount == npos ) + nCount = wxStrlen(sz); + + return ::wxDoCmp(data() + nStart, nLen, sz, nCount); +} + +#undef STRINGCLASS + +#endif // !wxUSE_STL || !defined(HAVE_STD_STRING_COMPARE) + +// =========================================================================== +// wxString class core +// =========================================================================== + +// --------------------------------------------------------------------------- +// construction +// --------------------------------------------------------------------------- - wxASSERT( !GetStringData()->IsShared() ); // we must be the only owner -} +#if wxUSE_UNICODE -// allocate enough memory for nLen characters -void wxString::Alloc(size_t nLen) +// from multibyte string +wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength) { - wxStringData *pData = GetStringData(); - if ( pData->nAllocLength <= nLen ) { - if ( pData->IsEmpty() ) { - nLen += EXTRA_ALLOC; - - wxStringData* pData = (wxStringData*) - 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] = wxT('\0'); + // first get the size of the buffer we need + size_t nLen; + if ( psz ) + { + // calculate the needed size ourselves or use the provided one + nLen = nLength == npos ? conv.MB2WC(NULL, psz, 0) : nLength; } - else if ( pData->IsShared() ) { - pData->Unlock(); // memory not freed because shared - size_t nOldLen = pData->nDataLength; - AllocBuffer(nLen); - memcpy(m_pchData, pData->data(), nOldLen*sizeof(wxChar)); + else + { + // nothing to convert + nLen = 0; } - else { - nLen += EXTRA_ALLOC; - wxStringData *pDataOld = pData; - wxStringData *p = (wxStringData *) - realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar)); + // anything to do? + if ( (nLen != 0) && (nLen != (size_t)-1) ) + { + if ( !Alloc(nLen) ) + { + wxFAIL_MSG( _T("out of memory in wxString::wxString") ); + } + else + { + wxWCharBuffer buf(nLen + 1); + // MB2WC wants the buffer size, not the string length hence +1 + nLen = conv.MB2WC(buf.data(), psz, nLen + 1); + + if ( nLen != (size_t)-1 ) + { + // initialized ok, set the real length as nLength specified by + // the caller could be greater than the real string length + assign(buf.data(), nLen); + return; + } + //else: the conversion failed -- leave the string empty (what else?) + } + } +} - if ( p == NULL ) { - // don't leak memory - free(pDataOld); +#else // ANSI - // FIXME what to do on memory error? - return; - } +#if wxUSE_WCHAR_T +// from wide string +wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength) +{ + // first get the size of the buffer we need + size_t nLen; + if ( pwz ) + { + // calculate the needed size ourselves or use the provided one + nLen = nLength == npos ? conv.WC2MB(NULL, pwz, 0) : nLength; + } + else + { + // nothing to convert + nLen = 0; + } - // it's not important if the pointer changed or not (the check for this - // is not faster than assigning to m_pchData in all cases) - p->nAllocLength = nLen; - m_pchData = p->data(); + // anything to do? + if ( (nLen != 0) && (nLen != (size_t)-1) ) + { + if ( !Alloc(nLen) ) + { + wxFAIL_MSG( _T("out of memory in wxString::wxString") ); + } + else + { + wxCharBuffer buf(nLen); + // WC2MB wants the buffer size, not the string length + if ( conv.WC2MB(buf.data(), pwz, nLen + 1) != (size_t)-1 ) + { + // initialized ok + assign(buf.data(), nLen); + return; + } + //else: the conversion failed -- leave the string empty (what else?) + } } - } - //else: we've already got enough + + // leave empty } +#endif // wxUSE_WCHAR_T + +#endif // Unicode/ANSI // shrink to minimal size (releasing extra memory) -void wxString::Shrink() +bool wxString::Shrink() { - wxStringData *pData = GetStringData(); - - // this variable is unused in release build, so avoid the compiler warning - // by just not declaring it -#ifdef __WXDEBUG__ - void *p = -#endif - realloc(pData, sizeof(wxStringData) + (pData->nDataLength + 1)*sizeof(wxChar)); - - // we rely on a reasonable realloc() implementation here - so far I haven't - // seen any which wouldn't behave like this - - wxASSERT( p != NULL ); // can't free memory? - wxASSERT( p == pData ); // we're decrementing the size - block shouldn't move! + wxString tmp(begin(), end()); + swap(tmp); + return tmp.length() == length(); } +#if !wxUSE_STL // get the pointer to writable buffer of (at least) nLen bytes wxChar *wxString::GetWriteBuf(size_t nLen) { - AllocBeforeWrite(nLen); + if ( !AllocBeforeWrite(nLen) ) { + // allocation failure handled by caller + return NULL; + } wxASSERT( GetStringData()->nRefs == 1 ); GetStringData()->Validate(FALSE); @@ -536,6 +1022,7 @@ void wxString::UngetWriteBuf(size_t nLen) GetStringData()->nDataLength = nLen; GetStringData()->Validate(TRUE); } +#endif // --------------------------------------------------------------------------- // data access @@ -547,55 +1034,6 @@ void wxString::UngetWriteBuf(size_t nLen) // assignment operators // --------------------------------------------------------------------------- -// helper function: does real copy -void wxString::AssignCopy(size_t nSrcLen, const wxChar *pszSrcData) -{ - if ( nSrcLen == 0 ) { - Reinit(); - } - else { - AllocBeforeWrite(nSrcLen); - memcpy(m_pchData, pszSrcData, nSrcLen*sizeof(wxChar)); - GetStringData()->nDataLength = nSrcLen; - m_pchData[nSrcLen] = wxT('\0'); - } -} - -// assigns one string to another -wxString& wxString::operator=(const wxString& stringSrc) -{ - wxASSERT( stringSrc.GetStringData()->IsValid() ); - - // don't copy string over itself - if ( m_pchData != stringSrc.m_pchData ) { - if ( stringSrc.GetStringData()->IsEmpty() ) { - Reinit(); - } - else { - // adjust references - GetStringData()->Unlock(); - m_pchData = stringSrc.m_pchData; - GetStringData()->Lock(); - } - } - - return *this; -} - -// assigns a single character -wxString& wxString::operator=(wxChar ch) -{ - AssignCopy(1, &ch); - return *this; -} - -// assigns C string -wxString& wxString::operator=(const wxChar *psz) -{ - AssignCopy(wxStrlen(psz), psz); - return *this; -} - #if !wxUSE_UNICODE // same as 'signed char' variant @@ -609,62 +1047,13 @@ wxString& wxString::operator=(const unsigned char* psz) wxString& wxString::operator=(const wchar_t *pwz) { wxString str(pwz); - *this = str; + swap(str); return *this; } #endif #endif -// --------------------------------------------------------------------------- -// string concatenation -// --------------------------------------------------------------------------- - -// add something to this string -void wxString::ConcatSelf(int nSrcLen, const wxChar *pszSrcData) -{ - STATISTICS_ADD(SummandLength, nSrcLen); - - // 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); - - // the buffer is already big enough - } - - // should be enough space - wxASSERT( nNewLen <= GetStringData()->nAllocLength ); - - // fast concatenation - all is done in our buffer - memcpy(m_pchData + nLen, pszSrcData, nSrcLen*sizeof(wxChar)); - - m_pchData[nNewLen] = wxT('\0'); // put terminating '\0' - GetStringData()->nDataLength = nNewLen; // and fix the length - } - //else: the string to append was empty -} - /* * concatenation functions come in 5 flavours: * string + string @@ -672,57 +1061,71 @@ void wxString::ConcatSelf(int nSrcLen, const wxChar *pszSrcData) * C str + string and string + C str */ -wxString operator+(const wxString& string1, const wxString& string2) +wxString operator+(const wxString& str1, const wxString& str2) { - wxASSERT( string1.GetStringData()->IsValid() ); - wxASSERT( string2.GetStringData()->IsValid() ); +#if !wxUSE_STL + wxASSERT( str1.GetStringData()->IsValid() ); + wxASSERT( str2.GetStringData()->IsValid() ); +#endif - wxString s = string1; - s += string2; + wxString s = str1; + s += str2; return s; } -wxString operator+(const wxString& string, wxChar ch) +wxString operator+(const wxString& str, wxChar ch) { - wxASSERT( string.GetStringData()->IsValid() ); +#if !wxUSE_STL + wxASSERT( str.GetStringData()->IsValid() ); +#endif - wxString s = string; + wxString s = str; s += ch; return s; } -wxString operator+(wxChar ch, const wxString& string) +wxString operator+(wxChar ch, const wxString& str) { - wxASSERT( string.GetStringData()->IsValid() ); +#if !wxUSE_STL + wxASSERT( str.GetStringData()->IsValid() ); +#endif wxString s = ch; - s += string; + s += str; return s; } -wxString operator+(const wxString& string, const wxChar *psz) +wxString operator+(const wxString& str, const wxChar *psz) { - wxASSERT( string.GetStringData()->IsValid() ); +#if !wxUSE_STL + wxASSERT( str.GetStringData()->IsValid() ); +#endif wxString s; - s.Alloc(wxStrlen(psz) + string.Len()); - s = string; + if ( !s.Alloc(wxStrlen(psz) + str.Len()) ) { + wxFAIL_MSG( _T("out of memory in wxString::operator+") ); + } + s = str; s += psz; return s; } -wxString operator+(const wxChar *psz, const wxString& string) +wxString operator+(const wxChar *psz, const wxString& str) { - wxASSERT( string.GetStringData()->IsValid() ); +#if !wxUSE_STL + wxASSERT( str.GetStringData()->IsValid() ); +#endif wxString s; - s.Alloc(wxStrlen(psz) + string.Len()); + if ( !s.Alloc(wxStrlen(psz) + str.Len()) ) { + wxFAIL_MSG( _T("out of memory in wxString::operator+") ); + } s = psz; - s += string; + s += str; return s; } @@ -731,30 +1134,72 @@ wxString operator+(const wxChar *psz, const wxString& string) // other common string functions // =========================================================================== -// --------------------------------------------------------------------------- -// simple sub-string extraction -// --------------------------------------------------------------------------- +#if wxUSE_UNICODE -// helper function: clone the data attached to this string -void wxString::AllocCopy(wxString& dest, int nCopyLen, int nCopyIndex) const +wxString wxString::FromAscii(const char *ascii) { - if ( nCopyLen == 0 ) { - dest.Init(); - } - else { - dest.AllocBuffer(nCopyLen); - memcpy(dest.m_pchData, m_pchData + nCopyIndex, nCopyLen*sizeof(wxChar)); - } + if (!ascii) + return wxEmptyString; + + size_t len = strlen( ascii ); + wxString res; + + if ( len ) + { + wxStringBuffer buf(res, len); + + wchar_t *dest = buf; + + for ( ;; ) + { + if ( (*dest++ = (wchar_t)(unsigned char)*ascii++) == L'\0' ) + break; + } + } + + return res; } +wxString wxString::FromAscii(const char ascii) +{ + // What do we do with '\0' ? + + wxString res; + res += (wchar_t)(unsigned char) ascii; + + return res; +} + +const wxCharBuffer wxString::ToAscii() const +{ + // this will allocate enough space for the terminating NUL too + wxCharBuffer buffer(length()); + + signed char *dest = (signed char *)buffer.data(); + + const wchar_t *pwc = c_str(); + for ( ;; ) + { + *dest++ = *pwc > SCHAR_MAX ? '_' : *pwc; + + // the output string can't have embedded NULs anyhow, so we can safely + // stop at first of them even if we do have any + if ( !*pwc++ ) + break; + } + + return buffer; +} + +#endif // Unicode + // extract string of length nCount starting at nFirst wxString wxString::Mid(size_t nFirst, size_t nCount) const { - wxStringData *pData = GetStringData(); - size_t nLen = pData->nDataLength; + size_t nLen = length(); - // default value of nCount is wxSTRING_MAXLEN and means "till the end" - if ( nCount == wxSTRING_MAXLEN ) + // default value of nCount is npos and means "till the end" + if ( nCount == npos ) { nCount = nLen - nFirst; } @@ -771,13 +1216,15 @@ wxString wxString::Mid(size_t nFirst, size_t nCount) const nCount = 0; } - wxString dest; - AllocCopy(dest, nCount, nFirst); + wxString dest(*this, nFirst, nCount); + if ( dest.length() != nCount ) { + wxFAIL_MSG( _T("out of memory in wxString::Mid") ); + } return dest; } -// check that the tring starts with prefix and return the rest of the string +// check that the string starts with prefix and return the rest of the string // in the provided pointer if it is not NULL, otherwise return FALSE bool wxString::StartsWith(const wxChar *prefix, wxString *rest) const { @@ -809,11 +1256,13 @@ bool wxString::StartsWith(const wxChar *prefix, wxString *rest) const // extract nCount last (rightmost) characters wxString wxString::Right(size_t nCount) const { - if ( nCount > (size_t)GetStringData()->nDataLength ) - nCount = GetStringData()->nDataLength; + if ( nCount > length() ) + nCount = length(); - wxString dest; - AllocCopy(dest, nCount, GetStringData()->nDataLength - nCount); + wxString dest(*this, length() - nCount, nCount); + if ( dest.length() != nCount ) { + wxFAIL_MSG( _T("out of memory in wxString::Right") ); + } return dest; } @@ -834,11 +1283,13 @@ wxString wxString::AfterLast(wxChar ch) const // extract nCount first (leftmost) characters wxString wxString::Left(size_t nCount) const { - if ( nCount > (size_t)GetStringData()->nDataLength ) - nCount = GetStringData()->nDataLength; + if ( nCount > length() ) + nCount = length(); - wxString dest; - AllocCopy(dest, nCount, 0); + wxString dest(*this, 0, nCount); + if ( dest.length() != nCount ) { + wxFAIL_MSG( _T("out of memory in wxString::Left") ); + } return dest; } @@ -846,11 +1297,9 @@ wxString wxString::Left(size_t nCount) const // (returns the whole string if ch not found) wxString wxString::BeforeFirst(wxChar ch) const { - wxString str; - for ( const wxChar *pc = m_pchData; *pc != wxT('\0') && *pc != ch; pc++ ) - str += *pc; - - return str; + int iPos = Find(ch); + if ( iPos == wxNOT_FOUND ) iPos = length(); + return wxString(*this, 0, iPos); } /// get all characters before the last occurence of ch @@ -878,14 +1327,19 @@ wxString wxString::AfterFirst(wxChar ch) const } // replace first (or all) occurences of some substring with another one -size_t wxString::Replace(const wxChar *szOld, const wxChar *szNew, bool bReplaceAll) +size_t +wxString::Replace(const wxChar *szOld, const wxChar *szNew, bool bReplaceAll) { + // if we tried to replace an empty string we'd enter an infinite loop below + wxCHECK_MSG( szOld && *szOld && szNew, 0, + _T("wxString::Replace(): invalid parameter") ); + size_t uiCount = 0; // count of replacements made size_t uiOldLen = wxStrlen(szOld); wxString strTemp; - const wxChar *pCurrent = m_pchData; + const wxChar *pCurrent = c_str(); const wxChar *pSubstr; while ( *pCurrent != wxT('\0') ) { pSubstr = wxStrstr(pCurrent, szOld); @@ -899,7 +1353,12 @@ size_t wxString::Replace(const wxChar *szOld, const wxChar *szNew, bool bReplace } else { // take chars before match - strTemp.ConcatSelf(pSubstr - pCurrent, pCurrent); + size_type len = strTemp.length(); + strTemp.append(pCurrent, pSubstr - pCurrent); + if ( strTemp.length() != (size_t)(len + pSubstr - pCurrent) ) { + wxFAIL_MSG( _T("out of memory in wxString::Replace") ); + return 0; + } strTemp += szNew; pCurrent = pSubstr + uiOldLen; // restart after match @@ -914,7 +1373,7 @@ size_t wxString::Replace(const wxChar *szOld, const wxChar *szNew, bool bReplace } // only done if there were replacements, otherwise would have returned above - *this = strTemp; + swap(strTemp); return uiCount; } @@ -965,20 +1424,16 @@ wxString wxString::Strip(stripType w) const wxString& wxString::MakeUpper() { - CopyBeforeWrite(); - - for ( wxChar *p = m_pchData; *p; p++ ) - *p = (wxChar)wxToupper(*p); + for ( iterator it = begin(), en = end(); it != en; ++it ) + *it = (wxChar)wxToupper(*it); return *this; } wxString& wxString::MakeLower() { - CopyBeforeWrite(); - - for ( wxChar *p = m_pchData; *p; p++ ) - *p = (wxChar)wxTolower(*p); + for ( iterator it = begin(), en = end(); it != en; ++it ) + *it = (wxChar)wxTolower(*it); return *this; } @@ -1006,31 +1461,26 @@ wxString& wxString::Trim(bool bFromRight) ) ) { - // 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 ( wxSafeIsspace(*psz) && (psz >= m_pchData) ) + iterator psz = begin() + length() - 1; + while ( wxSafeIsspace(*psz) && (psz >= begin()) ) psz--; // truncate at trailing space start *++psz = wxT('\0'); - GetStringData()->nDataLength = psz - m_pchData; + erase(psz, end()); } else { // find first non-space character - const wxChar *psz = m_pchData; + iterator psz = begin(); while ( wxSafeIsspace(*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; + erase(begin(), psz); } } @@ -1047,7 +1497,7 @@ wxString& wxString::Pad(size_t nCount, wxChar chPad, bool bFromRight) else { s += *this; - *this = s; + swap(s); } return *this; @@ -1057,10 +1507,7 @@ wxString& wxString::Pad(size_t nCount, wxChar chPad, bool bFromRight) wxString& wxString::Truncate(size_t uiLen) { if ( uiLen < Len() ) { - CopyBeforeWrite(); - - *(m_pchData + uiLen) = wxT('\0'); - GetStringData()->nDataLength = uiLen; + erase(begin() + uiLen, end()); } //else: nothing to do, string is already short enough @@ -1074,43 +1521,45 @@ wxString& wxString::Truncate(size_t uiLen) // find a character int wxString::Find(wxChar ch, bool bFromEnd) const { - const wxChar *psz = bFromEnd ? wxStrrchr(m_pchData, ch) : wxStrchr(m_pchData, ch); + size_type idx = bFromEnd ? find_last_of(ch) : find_first_of(ch); - return (psz == NULL) ? wxNOT_FOUND : psz - (const wxChar*) m_pchData; + return (idx == npos) ? wxNOT_FOUND : (int)idx; } // find a sub-string (like strstr) int wxString::Find(const wxChar *pszSub) const { - const wxChar *psz = wxStrstr(m_pchData, pszSub); + size_type idx = find(pszSub); - return (psz == NULL) ? wxNOT_FOUND : psz - (const wxChar*) m_pchData; + return (idx == npos) ? wxNOT_FOUND : (int)idx; } // ---------------------------------------------------------------------------- // conversion to numbers // ---------------------------------------------------------------------------- -bool wxString::ToLong(long *val) const +bool wxString::ToLong(long *val, int base) const { wxCHECK_MSG( val, FALSE, _T("NULL pointer in wxString::ToLong") ); + wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") ); const wxChar *start = c_str(); wxChar *end; - *val = wxStrtol(start, &end, 10); + *val = wxStrtol(start, &end, base); // return TRUE only if scan was stopped by the terminating NUL and if the // string was not empty to start with return !*end && (end != start); } -bool wxString::ToULong(unsigned long *val) const +bool wxString::ToULong(unsigned long *val, int base) const { wxCHECK_MSG( val, FALSE, _T("NULL pointer in wxString::ToULong") ); + wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") ); const wxChar *start = c_str(); wxChar *end; - *val = wxStrtoul(start, &end, 10); + *val = wxStrtoul(start, &end, base); // return TRUE only if scan was stopped by the terminating NUL and if the // string was not empty to start with @@ -1170,281 +1619,43 @@ int wxString::Printf(const wxChar *pszFormat, ...) int wxString::PrintfV(const wxChar* pszFormat, va_list argptr) { -#if wxUSE_EXPERIMENTAL_PRINTF - // the new implementation - - // buffer to avoid dynamic memory allocation each time for small strings - char szScratch[1024]; - - Reinit(); - for (size_t n = 0; pszFormat[n]; n++) - if (pszFormat[n] == wxT('%')) { - 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 wxT('\0'): - done = TRUE; - break; - case wxT('%'): - *this += wxT('%'); - done = TRUE; - break; - case wxT('#'): - case wxT('0'): - case wxT(' '): - case wxT('+'): - case wxT('\''): - CHECK_PREC - s_szFlags[flagofs++] = pszFormat[n]; - break; - case wxT('-'): - CHECK_PREC - adj_left = TRUE; - s_szFlags[flagofs++] = pszFormat[n]; - break; - case wxT('.'): - 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 wxT('h'): - ilen = -1; - CHECK_PREC - s_szFlags[flagofs++] = pszFormat[n]; - break; - case wxT('l'): - ilen = 1; - CHECK_PREC - s_szFlags[flagofs++] = pszFormat[n]; - break; - case wxT('q'): - case wxT('L'): - ilen = 2; - CHECK_PREC - s_szFlags[flagofs++] = pszFormat[n]; - break; - case wxT('Z'): - ilen = 3; - CHECK_PREC - s_szFlags[flagofs++] = pszFormat[n]; - break; - case wxT('*'): - { - 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 wxT('1'): case wxT('2'): case wxT('3'): - case wxT('4'): case wxT('5'): case wxT('6'): - case wxT('7'): case wxT('8'): case wxT('9'): - { - int len = 0; - CHECK_PREC - while ((pszFormat[n]>=wxT('0')) && (pszFormat[n]<=wxT('9'))) { - s_szFlags[flagofs++] = pszFormat[n]; - len = len*10 + (pszFormat[n] - wxT('0')); - n++; + int size = 1024; + int len; + + for ( ;; ) + { + { + wxStringBuffer tmp(*this, size + 1); + wxChar* buf = tmp; + + if ( !buf ) + { + // out of memory + return -1; } - if (in_prec) max_width = len; - else min_width = len; - n--; // the main loop pre-increments n again - } - break; - case wxT('d'): - case wxT('i'): - case wxT('o'): - case wxT('u'): - case wxT('x'): - case wxT('X'): - CHECK_PREC - s_szFlags[flagofs++] = pszFormat[n]; - s_szFlags[flagofs] = '\0'; - if (ilen == 0 ) { - int val = va_arg(argptr, int); - ::sprintf(szScratch, s_szFlags, val); - } - else if (ilen == -1) { - short int val = va_arg(argptr, short int); - ::sprintf(szScratch, s_szFlags, val); - } - else if (ilen == 1) { - long int val = va_arg(argptr, long int); - ::sprintf(szScratch, s_szFlags, val); - } - else if (ilen == 2) { -#if SIZEOF_LONG_LONG - long long int val = va_arg(argptr, long long int); - ::sprintf(szScratch, s_szFlags, val); -#else - long int val = va_arg(argptr, long int); - ::sprintf(szScratch, s_szFlags, val); -#endif - } - else if (ilen == 3) { - size_t val = va_arg(argptr, size_t); - ::sprintf(szScratch, s_szFlags, val); - } - *this += wxString(szScratch); - done = TRUE; - break; - case wxT('e'): - case wxT('E'): - case wxT('f'): - case wxT('g'): - case wxT('G'): - CHECK_PREC - s_szFlags[flagofs++] = pszFormat[n]; - s_szFlags[flagofs] = '\0'; - if (ilen == 2) { - long double val = va_arg(argptr, long double); - ::sprintf(szScratch, s_szFlags, val); - } else { - double val = va_arg(argptr, double); - ::sprintf(szScratch, s_szFlags, val); - } - *this += wxString(szScratch); - done = TRUE; - break; - case wxT('p'): - { - void *val = va_arg(argptr, void *); - CHECK_PREC - s_szFlags[flagofs++] = pszFormat[n]; - s_szFlags[flagofs] = '\0'; - ::sprintf(szScratch, s_szFlags, val); - *this += wxString(szScratch); - done = TRUE; - } - break; - case wxT('c'): - { - wxChar val = va_arg(argptr, int); - // we don't need to honor padding here, do we? - *this += val; - done = TRUE; - } - break; - case wxT('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 += wxT('%'); // just to pass the glibc tst-printf.c - n--; - done = TRUE; - } - break; + + len = wxVsnprintf(buf, size, pszFormat, argptr); + + // some implementations of vsnprintf() don't NUL terminate + // the string if there is not enough space for it so + // always do it manually + buf[size] = _T('\0'); } -#undef CHECK_PREC - } while (!done); - } else *this += pszFormat[n]; -#else - // buffer to avoid dynamic memory allocation each time for small strings - char szScratch[1024]; - - // NB: wxVsnprintf() may return either less than the buffer size or -1 if - // there is not enough place depending on implementation - int iLen = wxVsnprintfA(szScratch, WXSIZEOF(szScratch), (char *)pszFormat, argptr); - if ( iLen != -1 ) { - // the whole string is in szScratch - *this = szScratch; - } - else { - bool outOfMemory = FALSE; - int size = 2*WXSIZEOF(szScratch); - while ( !outOfMemory ) { - char *buf = GetWriteBuf(size); - if ( buf ) - iLen = wxVsnprintfA(buf, size, pszFormat, argptr); - else - outOfMemory = TRUE; - - UngetWriteBuf(); - - if ( iLen != -1 ) { - // ok, there was enough space - break; - } + if ( len >= 0 ) + { + // ok, there was enough space + break; + } - // still not enough, double it again - size *= 2; - } + // still not enough, double it again + size *= 2; + } - if ( outOfMemory ) { - // out of memory - return -1; - } - } -#endif // wxUSE_EXPERIMENTAL_PRINTF/!wxUSE_EXPERIMENTAL_PRINTF + // we could have overshot + Shrink(); - return Len(); + return Len(); } // ---------------------------------------------------------------------------- @@ -1456,21 +1667,81 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr) // of them) bool wxString::Matches(const wxChar *pszMask) const { - // check char by char - const wxChar *pszTxt; - for ( pszTxt = c_str(); *pszMask != wxT('\0'); pszMask++, pszTxt++ ) { + // I disable this code as it doesn't seem to be faster (in fact, it seems + // to be much slower) than the old, hand-written code below and using it + // here requires always linking with libregex even if the user code doesn't + // use it +#if 0 // wxUSE_REGEX + // first translate the shell-like mask into a regex + wxString pattern; + pattern.reserve(wxStrlen(pszMask)); + + pattern += _T('^'); + while ( *pszMask ) + { + switch ( *pszMask ) + { + case _T('?'): + pattern += _T('.'); + break; + + case _T('*'): + pattern += _T(".*"); + break; + + case _T('^'): + case _T('.'): + case _T('$'): + case _T('('): + case _T(')'): + case _T('|'): + case _T('+'): + case _T('\\'): + // these characters are special in a RE, quote them + // (however note that we don't quote '[' and ']' to allow + // using them for Unix shell like matching) + pattern += _T('\\'); + // fall through + + default: + pattern += *pszMask; + } + + pszMask++; + } + pattern += _T('$'); + + // and now use it + return wxRegEx(pattern, wxRE_NOSUB | wxRE_EXTENDED).Matches(c_str()); +#else // !wxUSE_REGEX + // TODO: this is, of course, awfully inefficient... + + // the char currently being checked + const wxChar *pszTxt = c_str(); + + // the last location where '*' matched + const wxChar *pszLastStarInText = NULL; + const wxChar *pszLastStarInMask = NULL; + +match: + for ( ; *pszMask != wxT('\0'); pszMask++, pszTxt++ ) { switch ( *pszMask ) { case wxT('?'): if ( *pszTxt == wxT('\0') ) return FALSE; - // pszText and pszMask will be incremented in the loop statement + // pszTxt and pszMask will be incremented in the loop statement break; case wxT('*'): { + // remember where we started to be able to backtrack later + pszLastStarInText = pszTxt; + pszLastStarInMask = pszMask; + // ignore special chars immediately following this one + // (should this be an error?) while ( *pszMask == wxT('*') || *pszMask == wxT('?') ) pszMask++; @@ -1510,7 +1781,23 @@ bool wxString::Matches(const wxChar *pszMask) const } // match only if nothing left - return *pszTxt == wxT('\0'); + if ( *pszTxt == wxT('\0') ) + return TRUE; + + // if we failed to match, backtrack if we can + if ( pszLastStarInText ) { + pszTxt = pszLastStarInText + 1; + pszMask = pszLastStarInMask; + + pszLastStarInText = NULL; + + // don't bother resetting pszLastStarInMask, it's unnecessary + + goto match; + } + + return FALSE; +#endif // wxUSE_REGEX/!wxUSE_REGEX } // Count the number of chars @@ -1542,292 +1829,25 @@ int wxString::sprintf(const wxChar *pszFormat, ...) return iLen; } -// --------------------------------------------------------------------------- -// standard C++ library string functions -// --------------------------------------------------------------------------- - -#ifdef wxSTD_STRING_COMPATIBILITY - -void wxString::resize(size_t nSize, wxChar ch) -{ - size_t len = length(); - - if ( nSize < len ) - { - Truncate(nSize); - } - else if ( nSize > len ) - { - *this += wxString(ch, len - nSize); - } - //else: we have exactly the specified length, nothing to do -} - -void wxString::swap(wxString& str) -{ - // this is slightly less efficient than fiddling with m_pchData directly, - // but it is still quite efficient as we don't copy the string here because - // ref count always stays positive - wxString tmp = str; - str = *this; - *this = str; -} - -wxString& wxString::insert(size_t nPos, const wxString& str) -{ - wxASSERT( str.GetStringData()->IsValid() ); - wxASSERT( nPos <= Len() ); - - 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; -} - -size_t wxString::find(const wxString& str, size_t nStart) const -{ - wxASSERT( str.GetStringData()->IsValid() ); - wxASSERT( nStart <= Len() ); - - 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(__VISUALC__) || defined(__WIN32__) -size_t wxString::find(const wxChar* sz, size_t nStart, size_t n) const -{ - return find(wxString(sz, n), nStart); -} -#endif // VC++ 1.5 - -// 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 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() ); - - // TODO could be made much quicker than that - const wxChar *p = c_str() + (nStart == npos ? Len() : nStart); - while ( p >= c_str() + str.Len() ) { - if ( wxStrncmp(p - str.Len(), str, str.Len()) == 0 ) - return p - str.Len() - c_str(); - p--; - } - - return npos; -} - -// VC++ 1.5 can't cope with the default argument in the header. -#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); -} - -size_t wxString::rfind(wxChar ch, size_t nStart) const -{ - if ( nStart == npos ) - { - nStart = Len(); - } - else - { - wxASSERT( nStart <= Len() ); - } - - const wxChar *p = wxStrrchr(c_str(), ch); - - 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 - c_str(); - 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; -} - -wxString& wxString::erase(size_t nStart, size_t nLen) -{ - wxString strTmp(c_str(), nStart); - if ( nLen != npos ) { - wxASSERT( nStart + nLen <= Len() ); - - strTmp.append(c_str() + nStart + nLen); - } - - *this = strTmp; - return *this; -} - -wxString& wxString::replace(size_t nStart, size_t nLen, const wxChar *sz) -{ - wxASSERT_MSG( nStart + nLen <= Len(), - _T("index out of bounds in wxString::replace") ); - - wxString strTmp; - strTmp.Alloc(Len()); // micro optimisation to avoid multiple mem allocs - - if ( nStart != 0 ) - strTmp.append(c_str(), nStart); - strTmp << sz << c_str() + nStart + nLen; - - *this = strTmp; - return *this; -} - -wxString& wxString::replace(size_t nStart, size_t nLen, size_t nCount, wxChar ch) -{ - return replace(nStart, nLen, wxString(ch, nCount)); -} - -wxString& wxString::replace(size_t nStart, size_t nLen, - const wxString& str, size_t nStart2, size_t nLen2) -{ - return replace(nStart, nLen, str.substr(nStart2, nLen2)); -} - -wxString& wxString::replace(size_t nStart, size_t nLen, - const wxChar* sz, size_t nCount) -{ - return replace(nStart, nLen, wxString(sz, nCount)); -} - -#endif //std::string compatibility - // ============================================================================ // ArrayString // ============================================================================ -// size increment = max(50% of current size, ARRAY_MAXSIZE_INCREMENT) +#include "wx/arrstr.h" + +#if !wxUSE_STL + +// size increment = min(50% of current size, ARRAY_MAXSIZE_INCREMENT) #define ARRAY_MAXSIZE_INCREMENT 4096 + #ifndef ARRAY_DEFAULT_INITIAL_SIZE // also defined in dynarray.h - #define ARRAY_DEFAULT_INITIAL_SIZE (16) +#define ARRAY_DEFAULT_INITIAL_SIZE (16) #endif #define STRING(p) ((wxString *)(&(p))) // ctor -wxArrayString::wxArrayString(bool autoSort) +void wxArrayString::Init(bool autoSort) { m_nSize = m_nCount = 0; @@ -1838,10 +1858,7 @@ wxArrayString::wxArrayString(bool autoSort) // copy ctor wxArrayString::wxArrayString(const wxArrayString& src) { - m_nSize = - m_nCount = 0; - m_pItems = (wxChar **) NULL; - m_autoSort = src.m_autoSort; + Init(src.m_autoSort); *this = src; } @@ -1854,6 +1871,8 @@ wxArrayString& wxArrayString::operator=(const wxArrayString& src) Copy(src); + m_autoSort = src.m_autoSort; + return *this; } @@ -1867,23 +1886,33 @@ void wxArrayString::Copy(const wxArrayString& src) } // grow the array -void wxArrayString::Grow() +void wxArrayString::Grow(size_t nIncrement) { // only do it if no more place - if( m_nCount == m_nSize ) { - if( m_nSize == 0 ) { + if ( (m_nSize - m_nCount) < nIncrement ) { + // if ARRAY_DEFAULT_INITIAL_SIZE were set to 0, the initially empty would + // be never resized! + #if ARRAY_DEFAULT_INITIAL_SIZE == 0 + #error "ARRAY_DEFAULT_INITIAL_SIZE must be > 0!" + #endif + + if ( m_nSize == 0 ) { // was empty, alloc some memory m_nSize = ARRAY_DEFAULT_INITIAL_SIZE; + if (m_nSize < nIncrement) + m_nSize = nIncrement; 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 // add 50% but not too much - size_t nIncrement = m_nSize < ARRAY_DEFAULT_INITIAL_SIZE + size_t ndefIncrement = m_nSize < ARRAY_DEFAULT_INITIAL_SIZE ? ARRAY_DEFAULT_INITIAL_SIZE : m_nSize >> 1; - if ( nIncrement > ARRAY_MAXSIZE_INCREMENT ) - nIncrement = ARRAY_MAXSIZE_INCREMENT; + if ( ndefIncrement > ARRAY_MAXSIZE_INCREMENT ) + ndefIncrement = ARRAY_MAXSIZE_INCREMENT; + if ( nIncrement < ndefIncrement ) + nIncrement = ndefIncrement; m_nSize += nIncrement; wxChar **pNew = new wxChar *[m_nSize]; @@ -1935,8 +1964,6 @@ wxArrayString::~wxArrayString() // pre-allocates memory (frees the previous data!) void wxArrayString::Alloc(size_t nSize) { - wxASSERT( nSize > 0 ); - // only if old buffer was not big enough if ( nSize > m_nSize ) { Free(); @@ -1963,6 +1990,25 @@ void wxArrayString::Shrink() } } +#if WXWIN_COMPATIBILITY_2_4 + +// return a wxString[] as required for some control ctors. +wxString* wxArrayString::GetStringArray() const +{ + wxString *array = 0; + + if( m_nCount > 0 ) + { + array = new wxString[m_nCount]; + for( size_t i = 0; i < m_nCount; i++ ) + array[i] = m_pItems[i]; + } + + return array; +} + +#endif // WXWIN_COMPATIBILITY_2_4 + // searches the array for an item (forward or backwards) int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const { @@ -2013,7 +2059,7 @@ int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const } // add item at the end -size_t wxArrayString::Add(const wxString& str) +size_t wxArrayString::Add(const wxString& str, size_t nInsert) { if ( m_autoSort ) { // insert the string at the correct position to keep the array sorted @@ -2037,54 +2083,75 @@ size_t wxArrayString::Add(const wxString& str) wxASSERT_MSG( lo == hi, wxT("binary search broken") ); - Insert(str, lo); + Insert(str, lo, nInsert); return (size_t)lo; } else { wxASSERT( str.GetStringData()->IsValid() ); - Grow(); + Grow(nInsert); - // the string data must not be deleted! - str.GetStringData()->Lock(); - - // just append - m_pItems[m_nCount] = (wxChar *)str.c_str(); // const_cast + for (size_t i = 0; i < nInsert; i++) + { + // the string data must not be deleted! + str.GetStringData()->Lock(); - return m_nCount++; + // just append + m_pItems[m_nCount + i] = (wxChar *)str.c_str(); // const_cast + } + size_t ret = m_nCount; + m_nCount += nInsert; + return ret; } } // add item at the given position -void wxArrayString::Insert(const wxString& str, size_t nIndex) +void wxArrayString::Insert(const wxString& str, size_t nIndex, size_t nInsert) { wxASSERT( str.GetStringData()->IsValid() ); wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArrayString::Insert") ); + wxCHECK_RET( m_nCount <= m_nCount + nInsert, + wxT("array size overflow in wxArrayString::Insert") ); - Grow(); + Grow(nInsert); - memmove(&m_pItems[nIndex + 1], &m_pItems[nIndex], + memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex], (m_nCount - nIndex)*sizeof(wxChar *)); - str.GetStringData()->Lock(); - m_pItems[nIndex] = (wxChar *)str.c_str(); + for (size_t i = 0; i < nInsert; i++) + { + str.GetStringData()->Lock(); + m_pItems[nIndex + i] = (wxChar *)str.c_str(); + } + m_nCount += nInsert; +} + +// expand the array +void wxArrayString::SetCount(size_t count) +{ + Alloc(count); - m_nCount++; + wxString s; + while ( m_nCount < count ) + m_pItems[m_nCount++] = (wxChar *)s.c_str(); } // removes item from array (by index) -void wxArrayString::Remove(size_t nIndex) +void wxArrayString::RemoveAt(size_t nIndex, size_t nRemove) { - wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArrayString::Remove") ); + wxCHECK_RET( nIndex < m_nCount, wxT("bad index in wxArrayString::Remove") ); + wxCHECK_RET( nIndex + nRemove <= m_nCount, + wxT("removing too many elements in wxArrayString::Remove") ); // release our lock - Item(nIndex).GetStringData()->Unlock(); + for (size_t i = 0; i < nRemove; i++) + Item(nIndex + i).GetStringData()->Unlock(); - memmove(&m_pItems[nIndex], &m_pItems[nIndex + 1], - (m_nCount - nIndex - 1)*sizeof(wxChar *)); - m_nCount--; + memmove(&m_pItems[nIndex], &m_pItems[nIndex + nRemove], + (m_nCount - nIndex - nRemove)*sizeof(wxChar *)); + m_nCount -= nRemove; } // removes item from array (by value) @@ -2095,7 +2162,7 @@ void wxArrayString::Remove(const wxChar *sz) wxCHECK_RET( iIndex != wxNOT_FOUND, wxT("removing inexistent element in wxArrayString::Remove") ); - Remove(iIndex); + RemoveAt(iIndex); } // ---------------------------------------------------------------------------- @@ -2130,7 +2197,8 @@ static wxArrayString::CompareFunction gs_compareFunction = NULL; static bool gs_sortAscending = TRUE; // function which is called by quick sort -static int LINKAGEMODE wxStringCompareFunction(const void *first, const void *second) +extern "C" int wxC_CALLING_CONV // LINKAGEMODE +wxStringCompareFunction(const void *first, const void *second) { wxString *strFirst = (wxString *)first; wxString *strSecond = (wxString *)second; @@ -2162,16 +2230,16 @@ void wxArrayString::Sort(CompareFunction compareFunction) END_SORT(); } -void wxArrayString::Sort(bool reverseOrder) -{ - START_SORT(); - - wxASSERT( !gs_compareFunction ); // must have been reset to NULL - gs_sortAscending = !reverseOrder; +typedef int (wxC_CALLING_CONV * wxStringCompareFn)(const void *first, const void *second); - DoSort(); +void wxArrayString::Sort(CompareFunction2 compareFunction) +{ + qsort(m_pItems, m_nCount, sizeof(wxChar *), (wxStringCompareFn)compareFunction); +} - END_SORT(); +void wxArrayString::Sort(bool reverseOrder) +{ + Sort(reverseOrder ? wxStringSortDescending : wxStringSortAscending); } void wxArrayString::DoSort() @@ -2197,3 +2265,14 @@ bool wxArrayString::operator==(const wxArrayString& a) const return TRUE; } +#endif // !wxUSE_STL + +int wxStringSortAscending(wxString* s1, wxString* s2) +{ + return wxStrcmp(s1->c_str(), s2->c_str()); +} + +int wxStringSortDescending(wxString* s1, wxString* s2) +{ + return -wxStrcmp(s1->c_str(), s2->c_str()); +}