more encoding names for AIX/Solaris/IRIX

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

diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp
index b6272da149a720dcff508821acfa7b6aa53053ac..43641b726eec146a4b0965cb29f90c2d1a00cd73 100644 (file)
--- a/src/common/tokenzr.cpp
+++ b/src/common/tokenzr.cpp
@@ -2,7 +2,7 @@
 // Name:        tokenzr.cpp
 // Purpose:     String tokenizer
 // Author:      Guilhem Lavaux
 // Name:        tokenzr.cpp
 // Purpose:     String tokenizer
 // Author:      Guilhem Lavaux

-// Modified by: Vadim Zeitlin
+// Modified by: Vadim Zeitlin (almost full rewrite)

 // Created:     04/22/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
 // Created:     04/22/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "tokenzr.h"
 #endif
 
     #pragma implementation "tokenzr.h"
 #endif
 


@@ -29,6 +29,7 @@
 #endif
 
 #include "wx/tokenzr.h"
 #endif
 
 #include "wx/tokenzr.h"

+#include "wx/arrstr.h"

 
 // Required for wxIs... functions
 #include <ctype.h>
 
 // Required for wxIs... functions
 #include <ctype.h>


@@ -101,20 +102,26 @@ void wxStringTokenizer::Reinit(const wxString& str)
 // do we have more of them?
 bool wxStringTokenizer::HasMoreTokens() const
 {
 // do we have more of them?
 bool wxStringTokenizer::HasMoreTokens() const
 {

-    wxCHECK_MSG( IsOk(), FALSE, _T("you should call SetString() first") );
+    wxCHECK_MSG( IsOk(), false, _T("you should call SetString() first") );

 
     if ( m_string.find_first_not_of(m_delims) == wxString::npos )
     {
 
     if ( m_string.find_first_not_of(m_delims) == wxString::npos )
     {

-        // no non empty tokens left, but in wxTOKEN_RET_EMPTY_ALL mode we
-        // still may return TRUE if GetNextToken() wasn't called yet for the
-        // last trailing empty token
-        return m_mode == wxTOKEN_RET_EMPTY_ALL ? m_hasMore : FALSE;
+        // no non empty tokens left, but in 2 cases we still may return true if
+        // GetNextToken() wasn't called yet for this empty token:
+        //
+        //   a) in wxTOKEN_RET_EMPTY_ALL mode we always do it
+        //   b) in wxTOKEN_RET_EMPTY mode we do it in the special case of a
+        //      string containing only the delimiter: then there is an empty
+        //      token just before it
+        return (m_mode == wxTOKEN_RET_EMPTY_ALL) ||
+               (m_mode == wxTOKEN_RET_EMPTY && m_pos == 0)
+                    ? m_hasMore : false;

     }
     else
     {
         // there are non delimiter characters left, hence we do have more
         // tokens
     }
     else
     {
         // there are non delimiter characters left, hence we do have more
         // tokens

-        return TRUE;
+        return true;

     }
 }
 
     }
 }
 


@@ -174,7 +181,7 @@ wxString wxStringTokenizer::GetNextToken()
 
             // no more tokens in this string, even in wxTOKEN_RET_EMPTY_ALL
             // mode (we will return the trailing one right now in this case)
 
             // no more tokens in this string, even in wxTOKEN_RET_EMPTY_ALL
             // mode (we will return the trailing one right now in this case)

-            m_hasMore = FALSE;
+            m_hasMore = false;

         }
         else
         {
         }
         else
         {


@@ -196,3 +203,21 @@ wxString wxStringTokenizer::GetNextToken()
 
     return token;
 }
 
     return token;
 }

+
+// ----------------------------------------------------------------------------
+// public functions
+// ----------------------------------------------------------------------------
+
+wxArrayString wxStringTokenize(const wxString& str,
+                               const wxString& delims,
+                               wxStringTokenizerMode mode)
+{
+    wxArrayString tokens;
+    wxStringTokenizer tk(str, delims, mode);
+    while ( tk.HasMoreTokens() )
+    {
+        tokens.Add(tk.GetNextToken());
+    }
+
+    return tokens;
+}