As small as possible reorganization within wxDateTime to please PCH in DLL build...

[wxWidgets.git] / src / common / string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index f42bd4dfd4e69d04a2eb20628da85769e1f12478..4d16458ff8dfc0cce4a77a088e1c48cbaca819cd 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1,11 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        string.cpp
 // Purpose:     wxString class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        string.cpp
 // Purpose:     wxString class

-// Author:      Vadim Zeitlin
+// Author:      Vadim Zeitlin, Ryan Norton

 // Modified by:
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Modified by:
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

+//              (c) 2004 Ryan Norton <wxprojects@comcast.net>

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -55,14 +56,9 @@
 // static class variables definition
 // ---------------------------------------------------------------------------
 
 // static class variables definition
 // ---------------------------------------------------------------------------
 

-#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
 #if !wxUSE_STL

-  const size_t wxStringBase::npos = wxSTRING_MAXLEN;
+  //According to STL _must_ be a -1 size_t
+  const size_t wxStringBase::npos = (size_t) -1;

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -208,7 +204,7 @@ void wxStringBase::InitWith(const wxChar *psz, size_t nPos, size_t nLength)
       wxFAIL_MSG( _T("out of memory in wxStringBase::InitWith") );
       return;
     }
       wxFAIL_MSG( _T("out of memory in wxStringBase::InitWith") );
       return;
     }

-    memcpy(m_pchData, psz + nPos, nLength*sizeof(wxChar));
+    wxTmemcpy(m_pchData, psz + nPos, nLength);

   }
 }
 
   }
 }
 


@@ -273,7 +269,7 @@ bool wxStringBase::CopyBeforeWrite()
       // allocation failures are handled by the caller
       return false;
     }
       // allocation failures are handled by the caller
       return false;
     }

-    memcpy(m_pchData, pData->data(), nLen*sizeof(wxChar));
+    wxTmemcpy(m_pchData, pData->data(), nLen);

   }
 
   wxASSERT( !GetStringData()->IsShared() );  // we must be the only owner
   }
 
   wxASSERT( !GetStringData()->IsShared() );  // we must be the only owner


@@ -474,9 +470,27 @@ size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const
   wxASSERT( str.GetStringData()->IsValid() );
   wxASSERT( nStart <= length() );
 
   wxASSERT( str.GetStringData()->IsValid() );
   wxASSERT( nStart <= length() );
 

-  const wxChar *p = wxStrstr(c_str() + nStart, str.c_str());
+  //anchor
+  const wxChar* p = (const wxChar*)wxTmemchr(c_str() + nStart,
+                                            str.c_str()[0],
+                                            length() - nStart);

 
 

-  return p == NULL ? npos : p - c_str();
+  if(!p)
+      return npos;
+
+  while(p - c_str() + str.length() <= length() &&
+        wxTmemcmp(p, str.c_str(), str.length()) )
+  {
+      //anchor again
+      p = (const wxChar*)wxTmemchr(++p,
+                                  str.c_str()[0],
+                                  length() - (p - c_str()));
+
+      if(!p)
+          return npos;
+  }
+
+   return (p - c_str() + str.length() <= length()) ? p - c_str() : npos;

 }
 
 size_t wxStringBase::find(const wxChar* sz, size_t nStart, size_t n) const
 }
 
 size_t wxStringBase::find(const wxChar* sz, size_t nStart, size_t n) const


@@ -488,7 +502,7 @@ size_t wxStringBase::find(wxChar ch, size_t nStart) const
 {
   wxASSERT( nStart <= length() );
 
 {
   wxASSERT( nStart <= length() );
 

-  const wxChar *p = wxStrchr(c_str() + nStart, ch);
+  const wxChar *p = (const wxChar*)wxTmemchr(c_str() + nStart, ch, length() - nStart);

 
   return p == NULL ? npos : p - c_str();
 }
 
   return p == NULL ? npos : p - c_str();
 }


@@ -515,8 +529,8 @@ size_t wxStringBase::rfind(const wxStringBase& str, size_t nStart) const
         const wxChar *cursor = c_str() + top;
         do
         {
         const wxChar *cursor = c_str() + top;
         do
         {

-            if ( memcmp(cursor, str.c_str(),
-                        str.length() * sizeof(wxChar)) == 0 )
+            if ( wxTmemcmp(cursor, str.c_str(),
+                        str.length()) == 0 )

             {
                 return cursor - c_str();
             }
             {
                 return cursor - c_str();
             }


@@ -555,12 +569,21 @@ size_t wxStringBase::rfind(wxChar ch, size_t nStart) const
 
 size_t wxStringBase::find_first_of(const wxChar* sz, size_t nStart) const
 {
 
 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
+    wxASSERT(nStart <= length());
+
+    size_t len = wxStrlen(sz);
+
+    size_t i;
+    for(i = nStart; i < this->length(); ++i)
+    {
+        if (wxTmemchr(sz, *(c_str() + i), len))
+            break;
+    }
+
+    if(i == this->length())

         return npos;
         return npos;

+    else
+        return i;

 }
 
 size_t wxStringBase::find_first_of(const wxChar* sz, size_t nStart,
 }
 
 size_t wxStringBase::find_first_of(const wxChar* sz, size_t nStart,


@@ -581,9 +604,11 @@ size_t wxStringBase::find_last_of(const wxChar* sz, size_t nStart) const
                         _T("invalid index in find_last_of()") );
     }
 
                         _T("invalid index in find_last_of()") );
     }
 

+    size_t len = wxStrlen(sz);
+

     for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
     {
     for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
     {

-        if ( wxStrchr(sz, *p) )
+        if ( wxTmemchr(sz, *p, len) )

             return p - c_str();
     }
 
             return p - c_str();
     }
 


@@ -607,11 +632,19 @@ size_t wxStringBase::find_first_not_of(const wxChar* sz, size_t nStart) const
         wxASSERT( nStart <= length() );
     }
 
         wxASSERT( nStart <= length() );
     }
 

-    size_t nAccept = wxStrspn(c_str() + nStart, sz);
-    if ( nAccept >= length() - nStart )
-        return npos;
-    else
-        return nStart + nAccept;
+    size_t len = wxStrlen(sz);
+
+    size_t i;
+    for(i = nStart; i < this->length(); ++i)
+    {
+        if (!wxTmemchr(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 wxStringBase::find_first_not_of(const wxChar* sz, size_t nStart,


@@ -644,10 +677,12 @@ size_t wxStringBase::find_last_not_of(const wxChar* sz, size_t nStart) const
         wxASSERT( nStart <= length() );
     }
 
         wxASSERT( nStart <= length() );
     }
 

+    size_t len = wxStrlen(sz);
+

     for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
     {
     for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
     {

-        if ( !wxStrchr(sz, *p) )
-            return p - c_str();
+        if ( !wxTmemchr(sz, *p,len) )
+             return p - c_str();

     }
 
     return npos;
     }
 
     return npos;


@@ -702,7 +737,7 @@ wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
 wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
                                     size_t nCount, wxChar ch)
 {
 wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
                                     size_t nCount, wxChar ch)
 {

-  return replace(nStart, nLen, wxStringBase(ch, nCount).c_str());
+  return replace(nStart, nLen, wxStringBase(nCount, ch).c_str());

 }
 
 wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
 }
 
 wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,


@@ -876,31 +911,24 @@ static inline int wxDoCmp(const wxChar* s1, size_t l1,
                           const wxChar* s2, size_t l2)
 {
     if( l1 == l2 )
                           const wxChar* s2, size_t l2)
 {
     if( l1 == l2 )

-        return wxStrncmp(s1, s2, l1);
+        return wxTmemcmp(s1, s2, l1);

     else if( l1 < l2 )
     {
     else if( l1 < l2 )
     {

-        int ret = wxStrncmp(s1, s2, l1);
+        int ret = wxTmemcmp(s1, s2, l1);

         return ret == 0 ? -1 : ret;
     }
         return ret == 0 ? -1 : ret;
     }

-    else if( l1 > l2 )
+    else

     {
     {

-        int ret = wxStrncmp(s1, s2, l2);
+        int ret = wxTmemcmp(s1, s2, l2);

         return ret == 0 ? +1 : ret;
     }
         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());
 }
 
 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
 {
 int STRINGCLASS::compare(size_t nStart, size_t nLen,
                          const wxStringBase& str) const
 {


@@ -923,16 +951,12 @@ int STRINGCLASS::compare(size_t nStart, size_t nLen,
     return ::wxDoCmp(data() + nStart, nLen, str.data() + nStart2, 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);
 }
 
 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
 {
 int STRINGCLASS::compare(size_t nStart, size_t nLen,
                          const wxChar* sz, size_t nCount) const
 {


@@ -954,7 +978,7 @@ int STRINGCLASS::compare(size_t nStart, size_t nLen,
 // ===========================================================================
 
 // ---------------------------------------------------------------------------
 // ===========================================================================
 
 // ---------------------------------------------------------------------------

-// construction
+// construction and conversion

 // ---------------------------------------------------------------------------
 
 #if wxUSE_UNICODE
 // ---------------------------------------------------------------------------
 
 #if wxUSE_UNICODE


@@ -981,7 +1005,10 @@ wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
     if ( psz )
     {
         // calculate the needed size ourselves or use the provided one
     if ( psz )
     {
         // calculate the needed size ourselves or use the provided one

-        nLen = conv.MB2WC(NULL, psz, 0);
+        if (nLength == npos)
+            nLen = strlen(psz);
+        else
+            nLen = nLength;

     }
     else
     {
     }
     else
     {


@@ -989,31 +1016,27 @@ wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
         nLen = 0;
     }
 
         nLen = 0;
     }
 

+

     // anything to do?
     if ( (nLen != 0) && (nLen != (size_t)-1) )
     {
     // 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);
-            // MB2WC wants the buffer size, not the string length hence +1
-            nLen = conv.MB2WC(buf.data(), psz, nLen + 1);
+        //Convert string
+        size_t nRealSize;
+        wxWCharBuffer theBuffer = conv.cMB2WC(psz, nLen, &nRealSize);

 
 

-            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?)
-        }
+        //Copy
+        if (nRealSize)
+            assign( theBuffer.data() , nRealSize - 1 );

     }
 }
 
     }
 }
 

+//Convert wxString in Unicode mode to a multi-byte string
+const wxCharBuffer wxString::mb_str(wxMBConv& conv) const
+{
+    size_t dwOutSize;
+    return conv.cWC2MB(c_str(), length(), &dwOutSize);
+}
+

 #else // ANSI
 
 #if wxUSE_WCHAR_T
 #else // ANSI
 
 #if wxUSE_WCHAR_T


@@ -1039,7 +1062,10 @@ wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength)
     if ( pwz )
     {
         // calculate the needed size ourselves or use the provided one
     if ( pwz )
     {
         // calculate the needed size ourselves or use the provided one

-        nLen = conv.WC2MB(NULL, pwz, 0);
+        if (nLength == npos)
+            nLen = wxWcslen(pwz);
+        else
+            nLen = nLength;

     }
     else
     {
     }
     else
     {


@@ -1050,26 +1076,24 @@ wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength)
     // anything to do?
     if ( (nLen != 0) && (nLen != (size_t)-1) )
     {
     // 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?)
-        }
+        //Convert string
+        size_t nRealSize;
+        wxCharBuffer theBuffer = conv.cWC2MB(pwz, nLen, &nRealSize);
+
+        //Copy
+        if (nRealSize)
+            assign( theBuffer.data() , nRealSize - 1 );

     }
     }

+}

 
 

-    // leave empty
+//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
+{
+    size_t dwOutSize;
+    return conv.cMB2WC(c_str(), length(), &dwOutSize);

 }
 }

+

 #endif // wxUSE_WCHAR_T
 
 #endif // Unicode/ANSI
 #endif // wxUSE_WCHAR_T
 
 #endif // Unicode/ANSI


@@ -1221,6 +1245,63 @@ wxString operator+(const wxChar *psz, const wxString& str)
 // other common string functions
 // ===========================================================================
 
 // 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 : wxTolower(s1[i]) < wxTolower(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 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1;
+    }
+    else
+    {
+        for(i = 0; i < l2; ++i)
+        {
+            if(wxTolower(s1[i]) != wxTolower(s2[i]))
+                break;
+        }
+        return i == l2 ? 1 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1;
+    }
+}
+
+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
 
 #ifdef __MWERKS__
 #if wxUSE_UNICODE
 
 #ifdef __MWERKS__


@@ -1268,12 +1349,13 @@ const wxCharBuffer wxString::ToAscii() const
     // this will allocate enough space for the terminating NUL too
     wxCharBuffer buffer(length());
 
     // this will allocate enough space for the terminating NUL too
     wxCharBuffer buffer(length());
 

-    signed char *dest = (signed char *)buffer.data();
+
+    char *dest = buffer.data();

 
     const wchar_t *pwc = c_str();
     for ( ;; )
     {
 
     const wchar_t *pwc = c_str();
     for ( ;; )
     {

-        *dest++ = *pwc > SCHAR_MAX ? '_' : *pwc;
+        *dest++ = (char)(*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
 
         // the output string can't have embedded NULs anyhow, so we can safely
         // stop at first of them even if we do have any


@@ -1495,7 +1577,7 @@ bool wxString::IsNumber() const
 {
   const wxChar *s = (const wxChar*) *this;
   if (wxStrlen(s))
 {
   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);
     s++;
   while(*s){
     if(!wxIsdigit(*s)) return(false);
     s++;


@@ -1547,7 +1629,7 @@ inline int wxSafeIsspace(wxChar ch) { return (ch < 127) && wxIsspace(ch); }
 wxString& wxString::Trim(bool bFromRight)
 {
   // first check if we're going to modify the string at all
 wxString& wxString::Trim(bool bFromRight)
 {
   // first check if we're going to modify the string at all

-  if ( !IsEmpty() &&
+  if ( !empty() &&

        (
         (bFromRight && wxSafeIsspace(GetChar(Len() - 1))) ||
         (!bFromRight && wxSafeIsspace(GetChar(0u)))
        (
         (bFromRight && wxSafeIsspace(GetChar(Len() - 1))) ||
         (!bFromRight && wxSafeIsspace(GetChar(0u)))


@@ -1727,7 +1809,12 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
                 return -1;
             }
 
                 return -1;
             }
 

-            len = wxVsnprintf(buf, size, pszFormat, argptr);
+            // 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
 
             // some implementations of vsnprintf() don't NUL terminate
             // the string if there is not enough space for it so


@@ -2108,6 +2195,11 @@ wxString* wxArrayString::GetStringArray() const
     return array;
 }
 
     return array;
 }
 

+void wxArrayString::Remove(size_t nIndex, size_t nRemove)
+{
+    RemoveAt(nIndex, nRemove);
+}
+

 #endif // WXWIN_COMPATIBILITY_2_4
 
 // searches the array for an item (forward or backwards)
 #endif // WXWIN_COMPATIBILITY_2_4
 
 // searches the array for an item (forward or backwards)


@@ -2171,7 +2263,7 @@ size_t wxArrayString::Add(const wxString& str, size_t nInsert)
     while ( lo < hi ) {
       i = (lo + hi)/2;
 
     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 )
       if ( res < 0 )
         hi = i;
       else if ( res > 0 )


@@ -2340,7 +2432,7 @@ wxStringCompareFunction(const void *first, const void *second)
   }
   else {
     // maybe we should use wxStrcoll
   }
   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;
   }
 
     return gs_sortAscending ? result : -result;
   }


@@ -2401,10 +2493,10 @@ bool wxArrayString::operator==(const wxArrayString& a) const
 
 int wxCMPFUNC_CONV wxStringSortAscending(wxString* s1, wxString* s2)
 {
 
 int wxCMPFUNC_CONV wxStringSortAscending(wxString* s1, wxString* s2)
 {

-    return wxStrcmp(s1->c_str(), s2->c_str());
+    return  s1->Cmp(*s2);

 }
 
 int wxCMPFUNC_CONV wxStringSortDescending(wxString* s1, wxString* s2)
 {
 }
 
 int wxCMPFUNC_CONV wxStringSortDescending(wxString* s1, wxString* s2)
 {

-    return -wxStrcmp(s1->c_str(), s2->c_str());
+    return -s1->Cmp(*s2);

 }
 }