#ifndef WX_PRECOMP
#include "wx/arrstr.h"
+ #include "wx/crt.h"
#endif
// Required for wxIs... functions
// implementation
// ============================================================================
+// ----------------------------------------------------------------------------
+// helpers
+// ----------------------------------------------------------------------------
+
+static wxString::const_iterator
+find_first_of(const wxChar *delims, size_t len,
+ const wxString::const_iterator& from,
+ const wxString::const_iterator& end)
+{
+ wxASSERT_MSG( from <= end, _T("invalid index") );
+
+ for ( wxString::const_iterator i = from; i != end; ++i )
+ {
+ if ( wxTmemchr(delims, *i, len) )
+ return i;
+ }
+
+ return end;
+}
+
+static wxString::const_iterator
+find_first_not_of(const wxChar *delims, size_t len,
+ const wxString::const_iterator& from,
+ const wxString::const_iterator& end)
+{
+ wxASSERT_MSG( from <= end, _T("invalid index") );
+
+ for ( wxString::const_iterator i = from; i != end; ++i )
+ {
+ if ( !wxTmemchr(delims, *i, len) )
+ return i;
+ }
+
+ return end;
+}
+
// ----------------------------------------------------------------------------
// wxStringTokenizer construction
// ----------------------------------------------------------------------------
// 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++ )
+ wxString::const_iterator p;
+ for ( p = delims.begin(); p != delims.end(); ++p )
{
if ( !wxIsspace(*p) )
break;
}
- if ( *p )
+ if ( p != delims.end() )
{
// not whitespace char in delims
mode = wxTOKEN_RET_EMPTY;
}
}
- m_delims = delims;
+#if wxUSE_UNICODE // FIXME-UTF8: only wc_str()
+ m_delims = delims.wc_str();
+#else
+ m_delims = delims.mb_str();
+#endif
+ m_delimsLen = delims.length();
+
m_mode = mode;
Reinit(str);
wxASSERT_MSG( IsOk(), _T("you should call SetString() first") );
m_string = str;
- m_pos = 0;
+ m_stringEnd = m_string.end();
+ m_pos = m_string.begin();
m_lastDelim = _T('\0');
+ m_hasMoreTokens = MoreTokens_Unknown;
}
// ----------------------------------------------------------------------------
// do we have more of them?
bool wxStringTokenizer::HasMoreTokens() const
+{
+ // GetNextToken() calls HasMoreTokens() and so HasMoreTokens() is called
+ // twice in every interation in the following common usage patten:
+ // while ( HasMoreTokens() )
+ // GetNextToken();
+ // We optimize this case by caching HasMoreTokens() return value here:
+ if ( m_hasMoreTokens == MoreTokens_Unknown )
+ {
+ bool r = DoHasMoreTokens();
+ wxConstCast(this, wxStringTokenizer)->m_hasMoreTokens =
+ r ? MoreTokens_Yes : MoreTokens_No;
+ return r;
+ }
+ else
+ return m_hasMoreTokens == MoreTokens_Yes;
+}
+
+bool wxStringTokenizer::DoHasMoreTokens() const
{
wxCHECK_MSG( IsOk(), false, _T("you should call SetString() first") );
- if ( m_string.find_first_not_of(m_delims, m_pos) != wxString::npos )
+ if ( find_first_not_of(m_delims, m_delimsLen, m_pos, m_stringEnd)
+ != m_stringEnd )
{
// there are non delimiter characters left, so we do have more tokens
return true;
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();
+ return !m_string.empty() && m_pos == m_string.begin();
case wxTOKEN_RET_EMPTY_ALL:
// special hack for wxTOKEN_RET_EMPTY_ALL: we can know if we had
// 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');
+ return m_pos < m_stringEnd || m_lastDelim != _T('\0');
case wxTOKEN_INVALID:
case wxTOKEN_DEFAULT:
// 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);
+ wxStringTokenizer tkz(wxString(m_pos, m_stringEnd), m_delims, m_mode);
size_t count = 0;
while ( tkz.HasMoreTokens() )
break;
}
+ m_hasMoreTokens = MoreTokens_Unknown;
+
// find the end of this token
- size_t pos = m_string.find_first_of(m_delims, m_pos);
+ wxString::const_iterator pos =
+ find_first_of(m_delims, m_delimsLen, m_pos, m_stringEnd);
// and the start of the next one
- if ( pos == wxString::npos )
+ if ( pos == m_stringEnd )
{
// no more delimiters, the token is everything till the end of
// string
- token.assign(m_string, m_pos, wxString::npos);
+ token.assign(m_pos, m_stringEnd);
// skip the token
- m_pos = m_string.length();
+ m_pos = m_stringEnd;
// it wasn't terminated
m_lastDelim = _T('\0');
{
// in wxTOKEN_RET_DELIMS mode we return the delimiter character
// with token, otherwise leave it out
- size_t len = pos - m_pos;
+ wxString::const_iterator tokenEnd(pos);
if ( m_mode == wxTOKEN_RET_DELIMS )
- len++;
+ ++tokenEnd;
- token.assign(m_string, m_pos, len);
+ token.assign(m_pos, tokenEnd);
// skip the token and the trailing delimiter
m_pos = pos + 1;
- m_lastDelim = m_string[pos];
+ m_lastDelim = (pos == m_stringEnd) ? _T('\0') : (wxChar)*pos;
}
}
while ( !AllowEmpty() && token.empty() );
projects / wxWidgets.git / blobdiff