X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85833f5c6c5c136d16ccd01c90cc243d5d025e0a..82bf96f54849a84b449d1b9f0fcff8f28649b07e:/src/common/tokenzr.cpp diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp index 0307ac3a54..5bdae9d7fb 100644 --- a/src/common/tokenzr.cpp +++ b/src/common/tokenzr.cpp @@ -1,17 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: tokenzr.cpp +// Name: src/common/tokenzr.cpp // Purpose: String tokenizer // Author: Guilhem Lavaux -// Modified by: +// Modified by: Vadim Zeitlin (almost full rewrite) // Created: 04/22/98 // RCS-ID: $Id$ // Copyright: (c) Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "tokenzr.h" -#endif +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -22,117 +26,204 @@ #include "wx/tokenzr.h" -wxStringTokenizer::wxStringTokenizer(const wxString& to_tokenize, - const wxString& delims, - bool ret_delims) -{ - m_string = to_tokenize; - m_delims = delims; - m_retdelims = ret_delims; -} +#ifndef WX_PRECOMP + #include "wx/arrstr.h" +#endif -wxStringTokenizer::~wxStringTokenizer() +// Required for wxIs... functions +#include + +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxStringTokenizer construction +// ---------------------------------------------------------------------------- + +wxStringTokenizer::wxStringTokenizer(const wxString& str, + const wxString& delims, + wxStringTokenizerMode mode) { + SetString(str, delims, mode); } -off_t wxStringTokenizer::FindDelims(const wxString& str, const wxString& delims) +void wxStringTokenizer::SetString(const wxString& str, + const wxString& delims, + wxStringTokenizerMode mode) { - for ( int i = 0; i < str.Length(); i++ ) + if ( mode == wxTOKEN_DEFAULT ) { - char c = str[i]; - - for ( int j = 0; j < delims.Length() ; j++ ) + // by default, we behave like strtok() if the delimiters are only + // whitespace characters and as wxTOKEN_RET_EMPTY otherwise (for + // whitespace delimiters, strtok() behaviour is better because we want + // to count consecutive spaces as one delimiter) + const wxChar *p; + for ( p = delims.c_str(); *p; p++ ) { - if ( delims[j] == c ) - return i; + if ( !wxIsspace(*p) ) + break; } - } - return -1; -} - -int wxStringTokenizer::CountTokens() const -{ - 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) + if ( *p ) { - count++; - p_string = p_string(0, pos); + // not whitespace char in delims + mode = wxTOKEN_RET_EMPTY; } else { - found = FALSE; + // only whitespaces + mode = wxTOKEN_STRTOK; } } - return count; + m_delims = delims; + m_mode = mode; + + Reinit(str); } -bool wxStringTokenizer::HasMoreToken() +void wxStringTokenizer::Reinit(const wxString& str) { - return !m_string.IsEmpty(); + wxASSERT_MSG( IsOk(), _T("you should call SetString() first") ); + + m_string = str; + m_pos = 0; + m_lastDelim = _T('\0'); } -// needed to fix leading whitespace / mult. delims bugs -void wxStringTokenizer::EatLeadingDelims() +// ---------------------------------------------------------------------------- +// access to the tokens +// ---------------------------------------------------------------------------- + +// do we have more of them? +bool wxStringTokenizer::HasMoreTokens() const { - int pos; + wxCHECK_MSG( IsOk(), false, _T("you should call SetString() first") ); + + if ( m_string.find_first_not_of(m_delims, m_pos) != wxString::npos ) + { + // there are non delimiter characters left, so we do have more tokens + return true; + } - // while leading delims trim 'em from the left - while ( ( pos = FindDelims(m_string, m_delims)) == 0 ) + switch ( m_mode ) { - m_string = m_string.Mid((size_t)1); + case wxTOKEN_RET_EMPTY: + case wxTOKEN_RET_DELIMS: + // special hack for wxTOKEN_RET_EMPTY: we should return the initial + // empty token even if there are only delimiters after it + return m_pos == 0 && !m_string.empty(); + + case wxTOKEN_RET_EMPTY_ALL: + // special hack for wxTOKEN_RET_EMPTY_ALL: we can know if we had + // already returned the trailing empty token after the last + // delimiter by examining m_lastDelim: it is set to NUL if we run + // up to the end of the string in GetNextToken(), but if it is not + // NUL yet we still have this last token to return even if m_pos is + // already at m_string.length() + return m_pos < m_string.length() || m_lastDelim != _T('\0'); + + case wxTOKEN_INVALID: + case wxTOKEN_DEFAULT: + wxFAIL_MSG( _T("unexpected tokenizer mode") ); + // fall through + + case wxTOKEN_STRTOK: + // never return empty delimiters + break; } + + return false; } -wxString wxStringTokenizer::NextToken() +// count the number of (remaining) tokens in the string +size_t wxStringTokenizer::CountTokens() const { - off_t pos, pos2; - wxString r_string; - - if ( m_string.IsEmpty() ) - return m_string; + wxCHECK_MSG( IsOk(), 0, _T("you should call SetString() first") ); - if ( !m_retdelims ) - EatLeadingDelims(); + // VZ: this function is IMHO not very useful, so it's probably not very + // important if its implementation here is not as efficient as it + // could be -- but OTOH like this we're sure to get the correct answer + // in all modes + wxStringTokenizer tkz(m_string.c_str() + m_pos, m_delims, m_mode); - pos = FindDelims(m_string, m_delims); - if (pos == -1) + size_t count = 0; + while ( tkz.HasMoreTokens() ) { - r_string = m_string; - m_string = wxEmptyString; + count++; - return r_string; + (void)tkz.GetNextToken(); } - if (m_retdelims) + return count; +} + +// ---------------------------------------------------------------------------- +// token extraction +// ---------------------------------------------------------------------------- + +wxString wxStringTokenizer::GetNextToken() +{ + wxString token; + do { - if (!pos) + if ( !HasMoreTokens() ) { - pos++; - pos2 = 1; + break; } - else + + // find the end of this token + size_t pos = m_string.find_first_of(m_delims, m_pos); + + // and the start of the next one + if ( pos == wxString::npos ) { - pos2 = pos; + // no more delimiters, the token is everything till the end of + // string + token.assign(m_string, m_pos, wxString::npos); + + // skip the token + m_pos = m_string.length(); + + // it wasn't terminated + m_lastDelim = _T('\0'); + } + else // we found a delimiter at pos + { + // in wxTOKEN_RET_DELIMS mode we return the delimiter character + // with token, otherwise leave it out + size_t len = pos - m_pos; + if ( m_mode == wxTOKEN_RET_DELIMS ) + len++; + + token.assign(m_string, m_pos, len); + + // skip the token and the trailing delimiter + m_pos = pos + 1; + + m_lastDelim = m_string[pos]; } } - else + while ( !AllowEmpty() && token.empty() ); + + return token; +} + +// ---------------------------------------------------------------------------- +// public functions +// ---------------------------------------------------------------------------- + +wxArrayString wxStringTokenize(const wxString& str, + const wxString& delims, + wxStringTokenizerMode mode) +{ + wxArrayString tokens; + wxStringTokenizer tk(str, delims, mode); + while ( tk.HasMoreTokens() ) { - pos2 = pos + 1; + tokens.Add(tk.GetNextToken()); } - r_string = m_string.Left((size_t)pos); - m_string = m_string.Mid((size_t)pos2); - - return r_string; + return tokens; }