Fixes for previous fixes

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 4715f63154ab66df9062db9eb1c4bb892957d3db..f0cb6d2910382f5efead05073558b808ca9d5c2d 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -168,6 +168,8 @@ wxSTD ostream& operator<<(wxSTD ostream& os, const wxString& str)
   #define STATISTICS_ADD(av, val)
 #endif // WXSTRING_STATISTICS
 
+#if !wxUSE_STL
+
 // ===========================================================================
 // wxStringData class deallocation
 // ===========================================================================
@@ -180,8 +182,6 @@ void wxStringData::Free()
 }
 #endif
 
-#if !wxUSE_STL
-
 // ===========================================================================
 // wxStringBase
 // ===========================================================================
@@ -479,18 +479,35 @@ size_t wxStringBase::find(wxChar ch, size_t nStart) const
 
 size_t wxStringBase::rfind(const wxStringBase& str, size_t nStart) const
 {
-  wxASSERT( str.GetStringData()->IsValid() );
-  wxASSERT( nStart == npos || nStart <= length() );
-
-  // TODO could be made much quicker than that
-  const wxChar *p = c_str() + (nStart == npos ? length() : nStart);
-  while ( p >= c_str() + str.length() ) {
-    if ( wxStrncmp(p - str.length(), str.c_str(), str.length()) == 0 )
-      return p - str.length() - c_str();
-    p--;
-  }
+    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;
 
-  return npos;
+        // "top" is the point where search starts from
+        size_t top = length() - str.length();
+
+        if ( nStart == npos )
+            nStart = length() - 1;
+        if ( nStart < top )
+            top = nStart;
+
+        const wxChar *cursor = c_str() + top;
+        do
+        {
+            if ( memcmp(cursor, str.c_str(),
+                        str.length() * sizeof(wxChar)) == 0 )
+            {
+                return cursor - c_str();
+            }
+        } while ( cursor-- > c_str() );
+    }
+    
+    return npos;
 }
 
 size_t wxStringBase::rfind(const wxChar* sz, size_t nStart, size_t n) const
@@ -530,11 +547,17 @@ size_t wxStringBase::find_first_of(const wxChar* sz, size_t nStart) const
         return npos;
 }
 
+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();
+        nStart = length() - 1;
     }
     else
     {
@@ -542,7 +565,7 @@ size_t wxStringBase::find_last_of(const wxChar* sz, size_t nStart) const
                         _T("invalid index in find_last_of()") );
     }
 
-    for ( const wxChar *p = c_str() + nStart - 1; p >= c_str(); p-- )
+    for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
     {
         if ( wxStrchr(sz, *p) )
             return p - c_str();
@@ -551,6 +574,12 @@ size_t wxStringBase::find_last_of(const wxChar* sz, size_t nStart) const
     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 )
@@ -566,7 +595,13 @@ size_t wxStringBase::find_first_not_of(const wxChar* sz, size_t nStart) const
     if ( nAccept >= length() - nStart )
         return npos;
     else
-        return nAccept;
+        return nStart + nAccept;
+}
+
+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
@@ -586,14 +621,14 @@ size_t wxStringBase::find_last_not_of(const wxChar* sz, size_t nStart) const
 {
     if ( nStart == npos )
     {
-        nStart = length();
+        nStart = length() - 1;
     }
     else
     {
         wxASSERT( nStart <= length() );
     }
 
-    for ( const wxChar *p = c_str() + nStart - 1; p >= c_str(); p-- )
+    for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
     {
         if ( !wxStrchr(sz, *p) )
             return p - c_str();
@@ -602,18 +637,24 @@ size_t wxStringBase::find_last_not_of(const wxChar* sz, size_t nStart) const
     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();
+        nStart = length() - 1;
     }
     else
     {
         wxASSERT( nStart <= length() );
     }
 
-    for ( const wxChar *p = c_str() + nStart - 1; p >= c_str(); p-- )
+    for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
     {
         if ( *p != ch )
             return p - c_str();
@@ -1644,7 +1685,10 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
             buf[size] = _T('\0');
         }
 
-        if ( len >= 0 )
+        // 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;
@@ -2172,6 +2216,13 @@ void wxArrayString::Remove(const wxChar *sz)
   RemoveAt(iIndex);
 }
 
+void wxArrayString::assign(const_iterator first, const_iterator last)
+{
+    reserve(last - first);
+    for(; first != last; ++first)
+        push_back(*first);
+}
+
 // ----------------------------------------------------------------------------
 // sorting
 // ----------------------------------------------------------------------------