X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1ac3b56e6b5b7342d69aa3b33744c345edb3d1e..3b01b1fe4cb656f39290bf7f3891667855abe601:/src/common/string.cpp diff --git a/src/common/string.cpp b/src/common/string.cpp index e85bcf2b6b..f6b388e45b 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,13 +46,6 @@ #include #endif -#if wxUSE_UNICODE - #undef wxUSE_EXPERIMENTAL_PRINTF - #ifndef wvsnprintf - #define wxUSE_EXPERIMENTAL_PRINTF 1 - #endif -#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 +61,20 @@ const unsigned int wxSTRING_MAXLEN = UINT_MAX - 100; #endif // Visual Age -#ifdef wxSTD_STRING_COMPATIBILITY - const size_t wxString::npos = wxSTRING_MAXLEN; -#endif // wxSTD_STRING_COMPATIBILITY +#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) @@ -86,67 +85,23 @@ static const struct } g_strEmpty = { {-1, 0, 0}, wxT('\0') }; // 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 - -#if defined(_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. // // ATTN: you can _not_ use both of these in the same program! +#include + wxSTD istream& operator>>(wxSTD istream& is, wxString& WXUNUSED(str)) { #if 0 @@ -184,75 +139,7 @@ wxSTD ostream& operator<<(wxSTD ostream& os, const wxString& str) return os; } -#endif //std::string compatibility - -#ifndef wxVsnprintf -int WXDLLEXPORT wxVsnprintf(wxChar *buf, size_t len, - const wxChar *format, va_list argptr) -{ -#if wxUSE_UNICODE - 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 -} -#else -// GNU libc 2.2 only has for wxVsnprintf for Unicode called vswprintf -// so we imitate wxVsprintf using it. -int WXDLLEXPORT wxVsprintf(wxChar *buf, - const wxChar *format, - va_list argptr) -{ - return vswprintf( buf, 10000, format, argptr ); -} -#endif - -#ifndef wxSnprintf -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; -} -#else -// GNU libc 2.2 only has for wxSnprintf for Unicode called swprintf -// so we imitate wxSprintf using it. -int WXDLLEXPORT wxSprintf(wxChar *buf, - const wxChar *format, - ...) ATTRIBUTE_PRINTF_2 -{ - va_list argptr; - va_start(argptr, format); - - int iLen = swprintf(buf, 10000, format, argptr); - - va_end(argptr); - - return iLen; -} -#endif +#endif // wxUSE_STD_IOSTREAM // ---------------------------------------------------------------------------- // private classes @@ -264,15 +151,15 @@ int WXDLLEXPORT wxSprintf(wxChar *buf, 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"), @@ -283,41 +170,31 @@ int WXDLLEXPORT wxSprintf(wxChar *buf, #define STATISTICS_ADD(av, val) #endif // WXSTRING_STATISTICS +#if !wxUSE_STL + // =========================================================================== -// 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(); - - if ( nLength > 0 ) { - if ( !AllocBuffer(nLength) ) { - wxFAIL_MSG( _T("out of memory in wxString::wxString") ); - return; - } - -#if wxUSE_UNICODE - // memset only works on char - for (size_t n=0; n 0 ) { // trailing '\0' is written in AllocBuffer() if ( !AllocBuffer(nLength) ) { - wxFAIL_MSG( _T("out of memory in wxString::InitWith") ); + wxFAIL_MSG( _T("out of memory in wxStringBase::InitWith") ); return; } - memcpy(m_pchData, psz + nPos, nLength*sizeof(wxChar)); + wxMemcpy(m_pchData, psz + nPos, nLength); } } -#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) -{ - // 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) ) { - if ( !AllocBuffer(nLen) ) { - wxFAIL_MSG( _T("out of memory in wxString::wxString") ); - return; - } - 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, size_t nLength) +wxStringBase::wxStringBase(size_type n, wxChar ch) { - // first get necessary size - size_t nLen = 0; - if (pwz) - { - if (nLength == wxSTRING_MAXLEN) - nLen = conv.WC2MB((char *) NULL, pwz, 0); - else - nLen = nLength; - } - - // empty? - if ( (nLen != 0) && (nLen != (size_t)-1) ) { - if ( !AllocBuffer(nLen) ) { - wxFAIL_MSG( _T("out of memory in wxString::wxString") ); - return; - } - 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 -bool 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 @@ -425,22 +247,22 @@ bool 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; + 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; + return true; } // must be called before changing this string -bool wxString::CopyBeforeWrite() +bool wxStringBase::CopyBeforeWrite() { wxStringData* pData = GetStringData(); @@ -449,18 +271,18 @@ bool wxString::CopyBeforeWrite() size_t nLen = pData->nDataLength; if ( !AllocBuffer(nLen) ) { // allocation failures are handled by the caller - return FALSE; + return false; } - memcpy(m_pchData, pData->data(), nLen*sizeof(wxChar)); + wxMemcpy(m_pchData, pData->data(), nLen); } wxASSERT( !GetStringData()->IsShared() ); // we must be the only owner - return TRUE; + return true; } // must be called before replacing contents of this string -bool wxString::AllocBeforeWrite(size_t nLen) +bool wxStringBase::AllocBeforeWrite(size_t nLen) { wxASSERT( nLen != 0 ); // doesn't make any sense @@ -471,7 +293,7 @@ bool wxString::AllocBeforeWrite(size_t nLen) pData->Unlock(); if ( !AllocBuffer(nLen) ) { // allocation failures are handled by the caller - return FALSE; + return false; } } else { @@ -484,11 +306,11 @@ bool wxString::AllocBeforeWrite(size_t nLen) pData = (wxStringData*) realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar)); - + if ( pData == NULL ) { // allocation failures are handled by the caller // keep previous data since reallocation failed - return FALSE; + return false; } pData->nAllocLength = nLen; @@ -501,11 +323,40 @@ bool wxString::AllocBeforeWrite(size_t nLen) wxASSERT( !GetStringData()->IsShared() ); // we must be the only owner - return TRUE; + 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 wxString::Alloc(size_t nLen) +bool wxStringBase::Alloc(size_t nLen) { wxStringData *pData = GetStringData(); if ( pData->nAllocLength <= nLen ) { @@ -517,9 +368,9 @@ bool wxString::Alloc(size_t nLen) if ( pData == NULL ) { // allocation failure handled by caller - return FALSE; + return false; } - + pData->nRefs = 1; pData->nDataLength = 0; pData->nAllocLength = nLen; @@ -531,7 +382,7 @@ bool wxString::Alloc(size_t nLen) size_t nOldLen = pData->nDataLength; if ( !AllocBuffer(nLen) ) { // allocation failure handled by caller - return FALSE; + return false; } memcpy(m_pchData, pData->data(), nOldLen*sizeof(wxChar)); } @@ -544,7 +395,7 @@ bool wxString::Alloc(size_t nLen) if ( pData == NULL ) { // allocation failure handled by caller // keep previous data since reallocation failed - return FALSE; + return false; } // it's not important if the pointer changed or not (the check for this @@ -554,163 +405,436 @@ bool wxString::Alloc(size_t nLen) } } //else: we've already got enough - return TRUE; + return true; } -// shrink to minimal size (releasing extra memory) -bool wxString::Shrink() +wxStringBase::iterator wxStringBase::begin() { - wxStringData *pData = GetStringData(); - - size_t nLen = pData->nDataLength; - void *p = realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar)); - - if ( p == NULL) { - wxFAIL_MSG( _T("out of memory reallocating wxString data") ); - // keep previous data since reallocation failed - return FALSE; - } + if (length() > 0) + CopyBeforeWrite(); + return m_pchData; +} - if ( p != pData ) - { - // contrary to what one might believe, some realloc() implementation do - // move the memory block even when its size is reduced - pData = (wxStringData *)p; +wxStringBase::iterator wxStringBase::end() +{ + if (length() > 0) + CopyBeforeWrite(); + return m_pchData + length(); +} - m_pchData = pData->data(); - } +wxStringBase::iterator wxStringBase::erase(iterator it) +{ + size_type idx = it - begin(); + erase(idx, 1); + return begin() + idx; +} - pData->nAllocLength = nLen; +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); - return TRUE; + swap(strTmp); + return *this; } -// get the pointer to writable buffer of (at least) nLen bytes -wxChar *wxString::GetWriteBuf(size_t nLen) +wxStringBase& wxStringBase::insert(size_t nPos, const wxChar *sz, size_t n) { - if ( !AllocBeforeWrite(nLen) ) { - // allocation failure handled by caller - return NULL; + 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") ); } - wxASSERT( GetStringData()->nRefs == 1 ); - GetStringData()->Validate(FALSE); + 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 m_pchData; + return *this; } -// put string back in a reasonable state after GetWriteBuf -void wxString::UngetWriteBuf() +void wxStringBase::swap(wxStringBase& str) { - GetStringData()->nDataLength = wxStrlen(m_pchData); - GetStringData()->Validate(TRUE); + wxChar* tmp = str.m_pchData; + str.m_pchData = m_pchData; + m_pchData = tmp; } -void wxString::UngetWriteBuf(size_t nLen) +size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const { - GetStringData()->nDataLength = nLen; - GetStringData()->Validate(TRUE); -} + wxASSERT( str.GetStringData()->IsValid() ); + wxASSERT( nStart <= length() ); -// --------------------------------------------------------------------------- -// data access -// --------------------------------------------------------------------------- + //anchor + const wxChar* p = (const wxChar*)wxMemchr(c_str() + nStart, + str.c_str()[0], + length() - nStart); -// all functions are inline in string.h + if(!p) + return npos; -// --------------------------------------------------------------------------- -// assignment operators -// --------------------------------------------------------------------------- + while(p - c_str() + str.length() <= length() && + wxMemcmp(p, str.c_str(), str.length()) ) + { + //anchor again + p = (const wxChar*)wxMemchr(++p, + str.c_str()[0], + length() - (p - c_str())); -// helper function: does real copy -bool wxString::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'); + if(!p) + return npos; } - return TRUE; + + return (p - c_str() + str.length() <= length()) ? p - c_str() : npos; } -// assigns one string to another -wxString& wxString::operator=(const wxString& stringSrc) +size_t wxStringBase::find(const wxChar* sz, size_t nStart, size_t n) const { - wxASSERT( stringSrc.GetStringData()->IsValid() ); + return find(wxStringBase(sz, n), nStart); +} - // 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(); - } - } +size_t wxStringBase::find(wxChar ch, size_t nStart) const +{ + wxASSERT( nStart <= length() ); - return *this; + const wxChar *p = (const wxChar*)wxMemchr(c_str() + nStart, ch, length() - nStart); + + return p == NULL ? npos : p - c_str(); } -// assigns a single character -wxString& wxString::operator=(wxChar ch) +size_t wxStringBase::rfind(const wxStringBase& str, size_t nStart) const { - if ( !AssignCopy(1, &ch) ) { - wxFAIL_MSG( _T("out of memory in wxString::operator=(wxChar)") ); - } - return *this; -} + wxASSERT( str.GetStringData()->IsValid() ); + wxASSERT( nStart == npos || nStart <= length() ); + if ( length() >= str.length() ) + { + // avoids a corner case later + if ( length() == 0 && str.length() == 0 ) + return 0; -// assigns C string -wxString& wxString::operator=(const wxChar *psz) -{ - if ( !AssignCopy(wxStrlen(psz), psz) ) { - wxFAIL_MSG( _T("out of memory in wxString::operator=(const wxChar *)") ); - } - return *this; -} + // "top" is the point where search starts from + size_t top = length() - str.length(); -#if !wxUSE_UNICODE + if ( nStart == npos ) + nStart = length() - 1; + if ( nStart < top ) + top = nStart; -// same as 'signed char' variant -wxString& wxString::operator=(const unsigned char* psz) -{ - *this = (const char *)psz; - return *this; + const wxChar *cursor = c_str() + top; + do + { + if ( wxMemcmp(cursor, str.c_str(), + str.length()) == 0 ) + { + return cursor - c_str(); + } + } while ( cursor-- > c_str() ); + } + + return npos; } -#if wxUSE_WCHAR_T -wxString& wxString::operator=(const wchar_t *pwz) +size_t wxStringBase::rfind(const wxChar* sz, size_t nStart, size_t n) const { - wxString str(pwz); - *this = str; - return *this; + return rfind(wxStringBase(sz, n), nStart); } -#endif -#endif +size_t wxStringBase::rfind(wxChar ch, size_t nStart) const +{ + if ( nStart == npos ) + { + nStart = length(); + } + else + { + wxASSERT( nStart <= length() ); + } -// --------------------------------------------------------------------------- -// string concatenation -// --------------------------------------------------------------------------- + const wxChar *actual; + for ( actual = c_str() + ( nStart == npos ? length() : nStart + 1 ); + actual > c_str(); --actual ) + { + if ( *(actual - 1) == ch ) + return (actual - 1) - c_str(); + } -// add something to this string -bool wxString::ConcatSelf(int nSrcLen, const wxChar *pszSrcData) + return npos; +} + +size_t wxStringBase::find_first_of(const wxChar* sz, size_t nStart) const { - STATISTICS_ADD(SummandLength, nSrcLen); + wxASSERT(nStart <= length()); - // concatenating an empty string is a NOP - if ( nSrcLen > 0 ) { + size_t len = wxStrlen(sz); + + size_t i; + for(i = nStart; i < this->length(); ++i) + { + if (wxMemchr(sz, *(c_str() + i), len)) + break; + } + + if(i == this->length()) + return npos; + else + return i; +} + +size_t wxStringBase::find_first_of(const wxChar* sz, size_t nStart, + size_t n) const +{ + return find_first_of(wxStringBase(sz, n), nStart); +} + +size_t wxStringBase::find_last_of(const wxChar* sz, size_t nStart) const +{ + if ( nStart == npos ) + { + nStart = length() - 1; + } + else + { + wxASSERT_MSG( nStart <= length(), + _T("invalid index in find_last_of()") ); + } + + size_t len = wxStrlen(sz); + + for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p ) + { + if ( wxMemchr(sz, *p, len) ) + return p - c_str(); + } + + return npos; +} + +size_t wxStringBase::find_last_of(const wxChar* sz, size_t nStart, + size_t n) const +{ + return find_last_of(wxStringBase(sz, n), nStart); +} + +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 len = wxStrlen(sz); + + size_t i; + for(i = nStart; i < this->length(); ++i) + { + if (!wxMemchr(sz, *(c_str() + i), len)) + break; + } + + if(i == this->length()) + return npos; + else + return i; +} + +size_t wxStringBase::find_first_not_of(const wxChar* sz, size_t nStart, + size_t n) const +{ + return find_first_not_of(wxStringBase(sz, n), nStart); +} + +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() - 1; + } + else + { + wxASSERT( nStart <= length() ); + } + + size_t len = wxStrlen(sz); + + for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p ) + { + if ( !wxMemchr(sz, *p,len) ) + return p - c_str(); + } + + return npos; +} + +size_t wxStringBase::find_last_not_of(const wxChar* sz, size_t nStart, + size_t n) const +{ + return find_last_not_of(wxStringBase(sz, n), nStart); +} + +size_t wxStringBase::find_last_not_of(wxChar ch, size_t nStart) const +{ + if ( nStart == npos ) + { + nStart = length() - 1; + } + else + { + wxASSERT( nStart <= length() ); + } + + for ( const wxChar *p = c_str() + nStart; 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(nCount, ch).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; @@ -723,7 +847,7 @@ bool wxString::ConcatSelf(int nSrcLen, const wxChar *pszSrcData) wxStringData* pOldData = GetStringData(); if ( !AllocBuffer(nNewLen) ) { // allocation failure handled by caller - return FALSE; + return false; } memcpy(m_pchData, pOldData->data(), nLen*sizeof(wxChar)); pOldData->Unlock(); @@ -731,10 +855,11 @@ bool wxString::ConcatSelf(int nSrcLen, const wxChar *pszSrcData) else if ( nNewLen > pData->nAllocLength ) { STATISTICS_ADD(ConcatHit, 0); + reserve(nNewLen); // we have to grow the buffer - if ( !Alloc(nNewLen) ) { + if ( capacity() < nNewLen ) { // allocation failure handled by caller - return FALSE; + return false; } } else { @@ -753,9 +878,430 @@ bool wxString::ConcatSelf(int nSrcLen, const wxChar *pszSrcData) GetStringData()->nDataLength = nNewLen; // and fix the length } //else: the string to append was empty - return TRUE; + 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 wxMemcmp(s1, s2, l1); + else if( l1 < l2 ) + { + int ret = wxMemcmp(s1, s2, l1); + return ret == 0 ? -1 : ret; + } + else if( l1 > l2 ) + { + int ret = wxMemcmp(s1, s2, l2); + return ret == 0 ? +1 : ret; + } + + wxFAIL; // must never get there + return 0; // quiet compilers +} + +int STRINGCLASS::compare(const wxStringBase& str) const +{ + return ::wxDoCmp(data(), length(), str.data(), str.length()); +} + +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); +} + +int STRINGCLASS::compare(const wxChar* sz) const +{ + size_t nLen = wxStrlen(sz); + return ::wxDoCmp(data(), length(), sz, nLen); +} + +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 +// =========================================================================== + +// --------------------------------------------------------------------------- +// common conversion routines +// --------------------------------------------------------------------------- + +size_t wxString::WorstEncodingCase(size_t len, const wxMBConv& WXUNUSED(conv)) +{ + //Worst case for UTF7 + return len * 5; +} + +#if wxUSE_WCHAR_T + +//Convert a wide character string of a specified length +//to a multi-byte character string, ignoring intermittent null characters +//returns the actual length of the string +inline size_t wxMbstr(char* szBuffer, const wchar_t* szString, + size_t nStringLen, wxMBConv& conv) +{ + const wchar_t* szEnd = szString + nStringLen + 1; + const wchar_t* szPos = szString; + const wchar_t* szStart = szPos; + + size_t nActualLength = 0; + + //Convert the string until the length() is reached, continuing the + //loop every time a null character is reached + while(szPos != szEnd) + { + wxASSERT(szPos < szEnd); //something is _really_ screwed up if this rings true + + //Get the length of the current (sub)string + size_t nLen = conv.WC2MB(NULL, szPos, 0); + + //Invalid conversion? + if( nLen == (size_t)-1 ) + { + szBuffer[0] = '\0'; + return 0; + } + + //Increase the actual length (+1 for current null character) + nActualLength += nLen + 1; + + //If this is true it means buffer overflow + wxASSERT( nActualLength <= wxString::WorstEncodingCase(nStringLen, conv) + 1 ); + + //Convert the current (sub)string + if(conv.WC2MB(&szBuffer[szPos - szStart], szPos, nLen + 1) == (size_t)-1 ) + { + //error - return empty buffer + wxFAIL_MSG(wxT("Error converting wide-character string to a multi-byte string")); + szBuffer[0] = '\0'; + return 0; + } + + //Increment to next (sub)string + //Note that we have to use wxWcslen here instead of nLen + //here because XX2XX gives us the size of the output buffer, + //not neccessarly the length of the string + szPos += wxWcslen(szPos) + 1; + } + + return nActualLength - 1; //success - return actual length +} + +//Convert a multi-byte character string of a specified length +//to a wide character string, ignoring intermittent null characters +//returns the actual length +inline size_t wxWcstr( wchar_t* szBuffer, const char* szString, + size_t nStringLen, wxMBConv& conv) +{ + const char* szEnd = szString + nStringLen + 1; + const char* szPos = szString; + const char* szStart = szPos; + + size_t nActualLength = 0; + + //Convert the string until the length() is reached, continuing the + //loop every time a null character is reached + while(szPos != szEnd) + { + wxASSERT(szPos < szEnd); //something is _really_ screwed up if this rings true + + //Get the length of the current (sub)string + size_t nLen = conv.MB2WC(NULL, szPos, 0); + + //Invalid conversion? + if( nLen == (size_t)-1 ) + { + szBuffer[0] = '\0'; + return 0; + } + + //Increase the actual length (+1 for current null character) + nActualLength += nLen + 1; + + //If this is true it means buffer overflow + wxASSERT(nActualLength <= nStringLen + 1); + + //Convert the current (sub)string + if ( conv.MB2WC(&szBuffer[szPos - szStart], szPos, nLen + 1) == (size_t)-1 ) + { + //error - return empty buffer + wxFAIL_MSG(wxT("Error converting multi-byte string to a wide-character string")); + szBuffer[0] = '\0'; + return 0; + } + + //Increment to next (sub)string + //Note that we have to use strlen here instead of nLen + //here because XX2XX gives us the size of the output buffer, + //not neccessarly the length of the string + szPos += strlen(szPos) + 1; + } + + return nActualLength - 1; //success - return actual length +} + +#endif //wxUSE_WCHAR_T + +// --------------------------------------------------------------------------- +// construction and conversion +// --------------------------------------------------------------------------- + +#if wxUSE_UNICODE + +// from multibyte string +wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength) +{ + // if nLength != npos, then we have to make a NULL-terminated copy + // of first nLength bytes of psz first because the input buffer to MB2WC + // must always be NULL-terminated: + wxCharBuffer inBuf((const char *)NULL); + if (nLength != npos) + { + wxASSERT( psz != NULL ); + wxCharBuffer tmp(nLength); + memcpy(tmp.data(), psz, nLength); + tmp.data()[nLength] = '\0'; + inBuf = tmp; + psz = inBuf.data(); + } + + // first get the size of the buffer we need + size_t nLen; + if ( psz ) + { + // calculate the needed size ourselves or use the provided one + if (nLength == npos) + nLen = strlen(psz); + else + nLen = nLength; + } + else + { + // nothing to convert + nLen = 0; + } + + // anything to do? + if ( (nLen != 0) && (nLen != (size_t)-1) ) + { + //When converting mb->wc it never inflates to more characters than the length + wxStringBufferLength internalBuffer(*this, nLen + 1); + + //Do the actual conversion & Set the length of the buffer + internalBuffer.SetLength( + wxWcstr(internalBuffer, psz, nLen, conv) + ); + } +} + +//Convert wxString in Unicode mode to a multi-byte string +const wxCharBuffer wxString::mb_str(wxMBConv& conv) const +{ + //Create the buffer + wxCharBuffer buffer( wxString::WorstEncodingCase(length(), conv) + 1); + + //Do the actual conversion (will return a blank string on error) + wxMbstr(buffer.data(), (*this).c_str(), length(), conv); + + return buffer; +} + +#else // ANSI + +#if wxUSE_WCHAR_T +// from wide string +wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength) +{ + // if nLength != npos, then we have to make a NULL-terminated copy + // of first nLength chars of psz first because the input buffer to WC2MB + // must always be NULL-terminated: + wxWCharBuffer inBuf((const wchar_t *)NULL); + if (nLength != npos) + { + wxASSERT( pwz != NULL ); + wxWCharBuffer tmp(nLength); + memcpy(tmp.data(), pwz, nLength * sizeof(wchar_t)); + tmp.data()[nLength] = '\0'; + inBuf = tmp; + pwz = inBuf.data(); + } + + // first get the size of the buffer we need + size_t nLen; + if ( pwz ) + { + // calculate the needed size ourselves or use the provided one + if (nLength == npos) + nLen = wxWcslen(pwz); + else + nLen = nLength; + } + else + { + // nothing to convert + nLen = 0; + } + + // anything to do? + if ( (nLen != 0) && (nLen != (size_t)-1) ) + { + //Create a wxStringBufferLength which will access the internal + //C char pointer in non-stl mode + wxStringBufferLength internalBuffer(*this, wxString::WorstEncodingCase(nLen, conv) + 1); + + //Do the actual conversion & Set the length of the buffer + internalBuffer.SetLength( + wxMbstr(internalBuffer, pwz, nLen, conv) + ); + } +} + +//Converts this string to a wide character string if unicode +//mode is not enabled and wxUSE_WCHAR_T is enabled +const wxWCharBuffer wxString::wc_str(wxMBConv& conv) const +{ + //mb->wc never inflates to more than the length + wxWCharBuffer buffer(length() + 1); + + //Do the actual conversion (will return a blank string on error) + wxWcstr(buffer.data(), (*this).c_str(), length(), conv); + + return buffer; +} + +#endif // wxUSE_WCHAR_T + +#endif // Unicode/ANSI + +// shrink to minimal size (releasing extra memory) +bool wxString::Shrink() +{ + 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) +{ + if ( !AllocBeforeWrite(nLen) ) { + // allocation failure handled by caller + return NULL; + } + + wxASSERT( GetStringData()->nRefs == 1 ); + GetStringData()->Validate(false); + + return m_pchData; +} + +// put string back in a reasonable state after GetWriteBuf +void wxString::UngetWriteBuf() +{ + GetStringData()->nDataLength = wxStrlen(m_pchData); + GetStringData()->Validate(true); +} + +void wxString::UngetWriteBuf(size_t nLen) +{ + GetStringData()->nDataLength = nLen; + GetStringData()->Validate(true); +} +#endif + +// --------------------------------------------------------------------------- +// data access +// --------------------------------------------------------------------------- + +// all functions are inline in string.h + +// --------------------------------------------------------------------------- +// assignment operators +// --------------------------------------------------------------------------- + +#if !wxUSE_UNICODE + +// same as 'signed char' variant +wxString& wxString::operator=(const unsigned char* psz) +{ + *this = (const char *)psz; + return *this; +} + +#if wxUSE_WCHAR_T +wxString& wxString::operator=(const wchar_t *pwz) +{ + wxString str(pwz); + swap(str); + return *this; +} +#endif + +#endif + /* * concatenation functions come in 5 flavours: * string + string @@ -765,8 +1311,10 @@ bool wxString::ConcatSelf(int nSrcLen, const wxChar *pszSrcData) wxString operator+(const wxString& str1, const wxString& str2) { +#if !wxUSE_STL wxASSERT( str1.GetStringData()->IsValid() ); wxASSERT( str2.GetStringData()->IsValid() ); +#endif wxString s = str1; s += str2; @@ -776,7 +1324,9 @@ wxString operator+(const wxString& str1, const wxString& str2) wxString operator+(const wxString& str, wxChar ch) { +#if !wxUSE_STL wxASSERT( str.GetStringData()->IsValid() ); +#endif wxString s = str; s += ch; @@ -786,7 +1336,9 @@ wxString operator+(const wxString& str, wxChar ch) wxString operator+(wxChar ch, const wxString& str) { +#if !wxUSE_STL wxASSERT( str.GetStringData()->IsValid() ); +#endif wxString s = ch; s += str; @@ -796,7 +1348,9 @@ wxString operator+(wxChar ch, const wxString& str) wxString operator+(const wxString& str, const wxChar *psz) { +#if !wxUSE_STL wxASSERT( str.GetStringData()->IsValid() ); +#endif wxString s; if ( !s.Alloc(wxStrlen(psz) + str.Len()) ) { @@ -810,7 +1364,9 @@ wxString operator+(const wxString& str, const wxChar *psz) wxString operator+(const wxChar *psz, const wxString& str) { +#if !wxUSE_STL wxASSERT( str.GetStringData()->IsValid() ); +#endif wxString s; if ( !s.Alloc(wxStrlen(psz) + str.Len()) ) { @@ -826,73 +1382,138 @@ wxString operator+(const wxChar *psz, const wxString& str) // other common string functions // =========================================================================== +int wxString::Cmp(const wxString& s) const +{ + return compare(s); +} + +int wxString::Cmp(const wxChar* psz) const +{ + return compare(psz); +} + +static inline int wxDoCmpNoCase(const wxChar* s1, size_t l1, + const wxChar* s2, size_t l2) +{ + size_t i; + + if( l1 == l2 ) + { + for(i = 0; i < l1; ++i) + { + if(wxTolower(s1[i]) != wxTolower(s2[i])) + break; + } + return i == l1 ? 0 : s1[i] < s2[i] ? -1 : 1; + } + else if( l1 < l2 ) + { + for(i = 0; i < l1; ++i) + { + if(wxTolower(s1[i]) != wxTolower(s2[i])) + break; + } + return i == l1 ? -1 : s1[i] < s2[i] ? -1 : 1; + } + else if( l1 > l2 ) + { + for(i = 0; i < l2; ++i) + { + if(wxTolower(s1[i]) != wxTolower(s2[i])) + break; + } + return i == l2 ? 1 : s1[i] < s2[i] ? -1 : 1; + } + + wxFAIL; // must never get there + return 0; // quiet compilers +} + +int wxString::CmpNoCase(const wxString& s) const +{ + return wxDoCmpNoCase(data(), length(), s.data(), s.length()); +} + +int wxString::CmpNoCase(const wxChar* psz) const +{ + int nLen = wxStrlen(psz); + + return wxDoCmpNoCase(data(), length(), psz, nLen); +} + + #if wxUSE_UNICODE -wxString wxString::FromAscii( char *ascii ) + +#ifdef __MWERKS__ +#ifndef __SCHAR_MAX__ +#define __SCHAR_MAX__ 127 +#endif +#endif + +wxString wxString::FromAscii(const char *ascii) { if (!ascii) return wxEmptyString; - + size_t len = strlen( ascii ); wxString res; - res.AllocBuffer( len ); - wchar_t *dest = (wchar_t*)(const wchar_t*) res.c_str(); - - for (size_t i = 0; i < len+1; i++) - dest[i] = (wchar_t) ascii[i]; - + + 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 { - if (IsNull()) - return wxCharBuffer( (const char*)NULL ); + // this will allocate enough space for the terminating NUL too + wxCharBuffer buffer(length()); - size_t len = Len(); - wxCharBuffer buffer( len ); // allocates len+1 - - char *dest = (char*)(const char*) buffer; - - for (size_t i = 0; i < len+1; i++) + signed char *dest = (signed char *)buffer.data(); + + const wchar_t *pwc = c_str(); + for ( ;; ) { - if (m_pchData[i] > 127) - dest[i] = '_'; - else - dest[i] = (char) m_pchData[i]; + *dest++ = *pwc > SCHAR_MAX ? wxT('_') : *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 -// --------------------------------------------------------------------------- -// simple sub-string extraction -// --------------------------------------------------------------------------- - -// helper function: clone the data attached to this string -bool wxString::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 // 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; } @@ -909,16 +1530,16 @@ wxString wxString::Mid(size_t nFirst, size_t nCount) const nCount = 0; } - wxString dest; - if ( !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 -// in the provided pointer if it is not NULL, otherwise return FALSE +// 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 { wxASSERT_MSG( prefix, _T("invalid parameter in wxString::StartsWith") ); @@ -933,7 +1554,7 @@ bool wxString::StartsWith(const wxChar *prefix, wxString *rest) const if ( *prefix++ != *p++ ) { // no match - return FALSE; + return false; } } @@ -943,17 +1564,17 @@ bool wxString::StartsWith(const wxChar *prefix, wxString *rest) const *rest = p; } - return TRUE; + return true; } // 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; - if ( !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; @@ -964,7 +1585,7 @@ wxString wxString::Right(size_t nCount) const wxString wxString::AfterLast(wxChar ch) const { wxString str; - int iPos = Find(ch, TRUE); + int iPos = Find(ch, true); if ( iPos == wxNOT_FOUND ) str = *this; else @@ -976,11 +1597,11 @@ 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; - if ( !AllocCopy(dest, nCount, 0) ) { + wxString dest(*this, 0, nCount); + if ( dest.length() != nCount ) { wxFAIL_MSG( _T("out of memory in wxString::Left") ); } return dest; @@ -988,13 +1609,11 @@ 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::BeforeFirst(wxChar ch) const -{ - wxString str; - for ( const wxChar *pc = m_pchData; *pc != wxT('\0') && *pc != ch; pc++ ) - str += *pc; - - return str; +wxString wxString::BeforeFirst(wxChar ch) const +{ + int iPos = Find(ch); + if ( iPos == wxNOT_FOUND ) iPos = length(); + return wxString(*this, 0, iPos); } /// get all characters before the last occurence of ch @@ -1002,7 +1621,7 @@ wxString wxString::BeforeFirst(wxChar ch) const wxString wxString::BeforeLast(wxChar ch) const { wxString str; - int iPos = Find(ch, TRUE); + int iPos = Find(ch, true); if ( iPos != wxNOT_FOUND && iPos != 0 ) str = wxString(c_str(), iPos); @@ -1022,14 +1641,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); @@ -1043,7 +1667,9 @@ size_t wxString::Replace(const wxChar *szOld, const wxChar *szNew, bool bReplace } else { // take chars before match - if ( !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; } @@ -1061,7 +1687,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; } @@ -1070,39 +1696,39 @@ bool wxString::IsAscii() const { const wxChar *s = (const wxChar*) *this; while(*s){ - if(!isascii(*s)) return(FALSE); + if(!isascii(*s)) return(false); s++; } - return(TRUE); + return(true); } bool wxString::IsWord() const { const wxChar *s = (const wxChar*) *this; while(*s){ - if(!wxIsalpha(*s)) return(FALSE); + if(!wxIsalpha(*s)) return(false); s++; } - return(TRUE); + return(true); } bool wxString::IsNumber() const { const wxChar *s = (const wxChar*) *this; if (wxStrlen(s)) - if ((s[0] == '-') || (s[0] == '+')) s++; + if ((s[0] == wxT('-')) || (s[0] == wxT('+'))) s++; while(*s){ - if(!wxIsdigit(*s)) return(FALSE); + if(!wxIsdigit(*s)) return(false); s++; } - return(TRUE); + return(true); } wxString wxString::Strip(stripType w) const { wxString s = *this; - if ( w & leading ) s.Trim(FALSE); - if ( w & trailing ) s.Trim(TRUE); + if ( w & leading ) s.Trim(false); + if ( w & trailing ) s.Trim(true); return s; } @@ -1112,26 +1738,16 @@ wxString wxString::Strip(stripType w) const wxString& wxString::MakeUpper() { - if ( !CopyBeforeWrite() ) { - wxFAIL_MSG( _T("out of memory in wxString::MakeUpper") ); - return *this; - } - - 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() { - if ( !CopyBeforeWrite() ) { - wxFAIL_MSG( _T("out of memory in wxString::MakeLower") ); - return *this; - } - - 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; } @@ -1140,7 +1756,7 @@ wxString& wxString::MakeLower() // trimming and padding // --------------------------------------------------------------------------- -// some compilers (VC++ 6.0 not to name them) return TRUE for a call to +// some compilers (VC++ 6.0 not to name them) return true for a call to // isspace('ê') in the C locale which seems to be broken to me, but we have to // live with this by checking that the character is a 7 bit one - even if this // may fail to detect some spaces (I don't know if Unicode doesn't have @@ -1159,34 +1775,26 @@ wxString& wxString::Trim(bool bFromRight) ) ) { - // ok, there is at least one space to trim - if ( !CopyBeforeWrite() ) { - wxFAIL_MSG( _T("out of memory in wxString::Trim") ); - return *this; - } - 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); } } @@ -1203,7 +1811,7 @@ wxString& wxString::Pad(size_t nCount, wxChar chPad, bool bFromRight) else { s += *this; - *this = s; + swap(s); } return *this; @@ -1213,13 +1821,7 @@ wxString& wxString::Pad(size_t nCount, wxChar chPad, bool bFromRight) wxString& wxString::Truncate(size_t uiLen) { if ( uiLen < Len() ) { - if ( !CopyBeforeWrite() ) { - wxFAIL_MSG( _T("out of memory in wxString::Truncate") ); - return *this; - } - - *(m_pchData + uiLen) = wxT('\0'); - GetStringData()->nDataLength = uiLen; + erase(begin() + uiLen, end()); } //else: nothing to do, string is already short enough @@ -1233,17 +1835,17 @@ 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; } // ---------------------------------------------------------------------------- @@ -1252,41 +1854,41 @@ int wxString::Find(const wxChar *pszSub) const bool wxString::ToLong(long *val, int base) const { - wxCHECK_MSG( val, FALSE, _T("NULL pointer in wxString::ToLong") ); + 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, base); - // return TRUE only if scan was stopped by the terminating NUL and if the + // 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, int base) const { - wxCHECK_MSG( val, FALSE, _T("NULL pointer in wxString::ToULong") ); + 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, base); - // return TRUE only if scan was stopped by the terminating NUL and if the + // 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::ToDouble(double *val) const { - wxCHECK_MSG( val, FALSE, _T("NULL pointer in wxString::ToDouble") ); + wxCHECK_MSG( val, false, _T("NULL pointer in wxString::ToDouble") ); const wxChar *start = c_str(); wxChar *end; *val = wxStrtod(start, &end); - // return TRUE only if scan was stopped by the terminating NUL and if the + // 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); } @@ -1331,288 +1933,58 @@ 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; + + // wxVsnprintf() may modify the original arg pointer, so pass it + // only a copy + va_list argptrcopy; + wxVaCopy(argptrcopy, argptr); + len = wxVsnprintf(buf, size, pszFormat, argptrcopy); + va_end(argptrcopy); + + // 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; - } + // vsnprintf() may return either -1 (traditional Unix behaviour) or the + // total number of characters which would have been written if the + // buffer were large enough + if ( len >= 0 && len <= size ) + { + // 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(); } // ---------------------------------------------------------------------------- // misc other operations // ---------------------------------------------------------------------------- -// returns TRUE if the string matches the pattern which may contain '*' and +// 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 @@ -1678,7 +2050,7 @@ match: switch ( *pszMask ) { case wxT('?'): if ( *pszTxt == wxT('\0') ) - return FALSE; + return false; // pszTxt and pszMask will be incremented in the loop statement @@ -1697,7 +2069,7 @@ match: // if there is nothing more, match if ( *pszMask == wxT('\0') ) - return TRUE; + return true; // are there any other metacharacters in the mask? size_t uiLenMask; @@ -1715,7 +2087,7 @@ match: wxString strToMatch(pszMask, uiLenMask); const wxChar* pMatch = wxStrstr(pszTxt, strToMatch); if ( pMatch == NULL ) - return FALSE; + return false; // -1 to compensate "++" in the loop pszTxt = pMatch + uiLenMask - 1; @@ -1725,14 +2097,14 @@ match: default: if ( *pszMask != *pszTxt ) - return FALSE; + return false; break; } } // match only if nothing left if ( *pszTxt == wxT('\0') ) - return TRUE; + return true; // if we failed to match, backtrack if we can if ( pszLastStarInText ) { @@ -1746,7 +2118,7 @@ match: goto match; } - return FALSE; + return false; #endif // wxUSE_REGEX/!wxUSE_REGEX } @@ -1779,282 +2151,14 @@ 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, nSize - len); - } - //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 = tmp; -} - -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 == npos || 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 ? wxSTRING_MAXLEN : 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 // ============================================================================ +#include "wx/arrstr.h" + +#if !wxUSE_STL + // size increment = min(50% of current size, ARRAY_MAXSIZE_INCREMENT) #define ARRAY_MAXSIZE_INCREMENT 4096 @@ -2107,7 +2211,7 @@ void wxArrayString::Copy(const wxArrayString& src) void wxArrayString::Grow(size_t nIncrement) { // only do it if no more place - if ( m_nCount == m_nSize ) { + 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 @@ -2117,6 +2221,8 @@ void wxArrayString::Grow(size_t nIncrement) 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 { @@ -2177,6 +2283,11 @@ wxArrayString::~wxArrayString() wxDELETEA(m_pItems); } +void wxArrayString::reserve(size_t nSize) +{ + Alloc(nSize); +} + // pre-allocates memory (frees the previous data!) void wxArrayString::Alloc(size_t nSize) { @@ -2206,6 +2317,8 @@ void wxArrayString::Shrink() } } +#if WXWIN_COMPATIBILITY_2_4 + // return a wxString[] as required for some control ctors. wxString* wxArrayString::GetStringArray() const { @@ -2221,6 +2334,8 @@ wxString* wxArrayString::GetStringArray() const 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 { @@ -2282,7 +2397,7 @@ size_t wxArrayString::Add(const wxString& str, size_t nInsert) while ( lo < hi ) { i = (lo + hi)/2; - res = wxStrcmp(str, m_pItems[i]); + res = str.Cmp(m_pItems[i]); if ( res < 0 ) hi = i; else if ( res > 0 ) @@ -2305,7 +2420,7 @@ size_t wxArrayString::Add(const wxString& str, size_t nInsert) Grow(nInsert); for (size_t i = 0; i < nInsert; i++) - { + { // the string data must not be deleted! str.GetStringData()->Lock(); @@ -2340,6 +2455,30 @@ void wxArrayString::Insert(const wxString& str, size_t nIndex, size_t nInsert) m_nCount += nInsert; } +// range insert (STL 23.2.4.3) +void +wxArrayString::insert(iterator it, const_iterator first, const_iterator last) +{ + const int idx = it - begin(); + + // grow it once + Grow(last - first); + + // reset "it" since it can change inside Grow() + it = begin() + idx; + + while ( first != last ) + { + it = insert(it, *first); + + // insert returns an iterator to the last element inserted but we need + // insert the next after this one, that is before the next one + ++it; + + ++first; + } +} + // expand the array void wxArrayString::SetCount(size_t count) { @@ -2351,7 +2490,7 @@ void wxArrayString::SetCount(size_t count) } // removes item from array (by index) -void wxArrayString::Remove(size_t nIndex, size_t nRemove) +void wxArrayString::RemoveAt(size_t nIndex, size_t nRemove) { wxCHECK_RET( nIndex < m_nCount, wxT("bad index in wxArrayString::Remove") ); wxCHECK_RET( nIndex + nRemove <= m_nCount, @@ -2374,7 +2513,14 @@ void wxArrayString::Remove(const wxChar *sz) wxCHECK_RET( iIndex != wxNOT_FOUND, wxT("removing inexistent element in wxArrayString::Remove") ); - Remove(iIndex); + RemoveAt(iIndex); +} + +void wxArrayString::assign(const_iterator first, const_iterator last) +{ + reserve(last - first); + for(; first != last; ++first) + push_back(*first); } // ---------------------------------------------------------------------------- @@ -2406,10 +2552,10 @@ 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; +static bool gs_sortAscending = true; // function which is called by quick sort -extern "C" int LINKAGEMODE +extern "C" int wxC_CALLING_CONV // LINKAGEMODE wxStringCompareFunction(const void *first, const void *second) { wxString *strFirst = (wxString *)first; @@ -2420,7 +2566,7 @@ wxStringCompareFunction(const void *first, const void *second) } else { // maybe we should use wxStrcoll - int result = wxStrcmp(strFirst->c_str(), strSecond->c_str()); + int result = strFirst->Cmp(*strSecond); return gs_sortAscending ? result : -result; } @@ -2442,16 +2588,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() @@ -2466,14 +2612,25 @@ void wxArrayString::DoSort() bool wxArrayString::operator==(const wxArrayString& a) const { if ( m_nCount != a.m_nCount ) - return FALSE; + return false; for ( size_t n = 0; n < m_nCount; n++ ) { if ( Item(n) != a[n] ) - return FALSE; + return false; } - return TRUE; + return true; +} + +#endif // !wxUSE_STL + +int wxCMPFUNC_CONV wxStringSortAscending(wxString* s1, wxString* s2) +{ + return s1->Cmp(*s2); } +int wxCMPFUNC_CONV wxStringSortDescending(wxString* s1, wxString* s2) +{ + return -s1->Cmp(*s2); +}