X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce3ed50dbe32d118321082db84c3a9abb047d5b7..cf471cab8277f4cc2c19bce417356badf9e2ca49:/src/common/tokenzr.cpp

diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp
index 34079c0f66..0601d5d0e5 100644
--- a/src/common/tokenzr.cpp
+++ b/src/common/tokenzr.cpp
@@ -2,113 +2,129 @@
 // Name:        tokenzr.cpp
 // Purpose:     String tokenizer
 // Author:      Guilhem Lavaux
-// Modified by:
+// Modified by: Vadim Zeitlin
 // Created:     04/22/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
-#pragma implementation "tokenzr.h"
+    #pragma implementation "tokenzr.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
+    #pragma hdrstop
 #endif
 
-#include "wx/object.h"
-#include "wx/string.h"
 #include "wx/tokenzr.h"
 
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxStringTokenizer construction
+// ----------------------------------------------------------------------------
+
 wxStringTokenizer::wxStringTokenizer(const wxString& to_tokenize,
                                      const wxString& delims,
-				     bool ret_delims)
-  : wxObject()
+                                     bool ret_delims)
 {
-  m_string = to_tokenize;
-  m_delims = delims;
-  m_retdelims = ret_delims;
+    SetString(to_tokenize, delims, ret_delims);
 }
 
-wxStringTokenizer::~wxStringTokenizer()
+void wxStringTokenizer::SetString(const wxString& to_tokenize,
+                                  const wxString& delims,
+                                  bool ret_delim)
 {
-}
+    m_string = to_tokenize;
+    m_delims = delims;
+    m_retdelims = ret_delim;
+    m_pos = 0;
 
-off_t wxStringTokenizer::FindDelims(const wxString& str, const wxString& delims)
-{
-  int i, j;
-  register int s_len = str.Length(),
-               len = delims.Length();
-
-  for (i=0;i<s_len;i++) {
-    register char c = str[i];
-
-    for (j=0;j<len;j++)
-      if (delims[j] == c)
-        return i;
-  }
-  return -1;
+    // empty string doesn't have any tokens
+    m_hasMore = !m_string.empty();
 }
 
-int wxStringTokenizer::CountTokens()
+wxStringTokenizer::~wxStringTokenizer()
 {
-  wxString p_string = m_string;
-  bool found = TRUE;
-  int pos, count = 1; 
-
-  if (p_string.Length() == 0)
-    return 0;
-
-  while (found) {
-    pos = FindDelims(p_string, m_delims);
-    if (pos != -1) {
-      count++;
-      p_string = p_string(0, pos);
-    } else
-      found = FALSE;
-  }
-  return count;
 }
 
-bool wxStringTokenizer::HasMoreToken()
+// ----------------------------------------------------------------------------
+// count the number of tokens in the string
+// ----------------------------------------------------------------------------
+
+size_t wxStringTokenizer::CountTokens() const
 {
-  return (m_string.Length() != 0);
+    size_t pos = 0;
+    size_t count = 0;
+    for ( ;; )
+    {
+        pos = m_string.find_first_of(m_delims, pos);
+        if ( pos == wxString::npos )
+            break;
+
+        count++;    // one more token found
+
+        pos++;      // skip delimiter
+    }
+
+    // normally, we didn't count the last token in the loop above - so add it
+    // unless the string was empty from the very beginning, in which case it
+    // still has 0 (and not 1) tokens
+    if ( !m_string.empty() )
+    {
+        count++;
+    }
+
+    return count;
 }
 
-wxString wxStringTokenizer::NextToken()
+// ----------------------------------------------------------------------------
+// token extraction
+// ----------------------------------------------------------------------------
+
+wxString wxStringTokenizer::GetNextToken()
 {
-  register off_t pos, pos2;
-  wxString r_string;
-
-  if (m_string.IsNull())
-    return m_string;
-
-  pos = FindDelims(m_string, m_delims);
-  if (pos == -1) {
-    r_string = m_string;
-    m_string = wxEmptyString;
-    
-    return r_string;
-  }
-
-  if (m_retdelims) {
-    if (!pos) {
-      pos++;
-      pos2 = 1;
-    } else
-      pos2 = pos;
-  } else
-      pos2 = pos + 1;
-  
-  r_string = m_string.Left((size_t)pos);
-  m_string = m_string.Mid((size_t)pos2);
-
-  return r_string;
+    wxString token;
+    if ( HasMoreTokens() )
+    {
+        size_t pos = m_string.find_first_of(m_delims); // end of token
+        size_t pos2;                                   // start of the next one
+        if ( pos != wxString::npos )
+        {
+            // return the delimiter too
+            pos2 = pos + 1;
+        }
+        else
+        {
+            pos2 = m_string.length();
+
+            // no more tokens in this string
+            m_hasMore = FALSE;
+        }
+
+        token = wxString(m_string, m_retdelims ? pos2 : pos);
+
+        // remove token with the following it delimiter from string
+        m_string.erase(0, pos2);
+
+        // keep track of the position in the original string too
+        m_pos += pos2;
+    }
+    //else: no more tokens, return empty token
+
+    return token;
 }