#include <clib.h>
#endif
-#if wxUSE_WCSRTOMBS
- #include <wchar.h> // for wcsrtombs(), see comments where it's used
-#endif // GNU
-
-#ifdef WXSTRING_IS_WXOBJECT
- IMPLEMENT_DYNAMIC_CLASS(wxString, wxObject)
-#endif //WXSTRING_IS_WXOBJECT
-
#if wxUSE_UNICODE
-#undef wxUSE_EXPERIMENTAL_PRINTF
-#define wxUSE_EXPERIMENTAL_PRINTF 1
+ #undef wxUSE_EXPERIMENTAL_PRINTF
+ #define wxUSE_EXPERIMENTAL_PRINTF 1
#endif
// allocating extra space for each string consumes more memory but speeds up
// static class variables definition
// ---------------------------------------------------------------------------
+#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
+// must define this static for VA or else you get multiply defined symbols
+// everywhere
+const unsigned int wxSTRING_MAXLEN = UINT_MAX - 100;
+#endif // Visual Age
+
#ifdef wxSTD_STRING_COMPATIBILITY
const size_t wxString::npos = wxSTRING_MAXLEN;
#endif // wxSTD_STRING_COMPATIBILITY
wxChar dummy;
} g_strEmpty = { {-1, 0, 0}, wxT('\0') };
-#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
-// must define this static for VA or else you get multiply defined symbols everywhere
-const unsigned int wxSTRING_MAXLEN = UINT_MAX - 100;
-
-#endif
-
// empty C style string: points to 'string data' byte of g_strEmpty
extern const wxChar WXDLLEXPORT *wxEmptyString = &g_strEmpty.dummy;
#endif //compiler
#endif // no vsnprintf
-#ifdef _AIX
+#if defined(_AIX)
// AIX has vsnprintf, but there's no prototype in the system headers.
extern "C" int vsnprintf(char* str, size_t n, const char* format, va_list ap);
#endif
//
// ATTN: you can _not_ use both of these in the same program!
-istream& operator>>(istream& is, wxString& WXUNUSED(str))
+wxSTD istream& operator>>(wxSTD istream& is, wxString& WXUNUSED(str))
{
#if 0
int w = is.width(0);
return is;
}
-ostream& operator<<(ostream& os, const wxString& str)
+wxSTD ostream& operator<<(wxSTD ostream& os, const wxString& str)
{
os << str.c_str();
return os;
int iLen = s.PrintfV(format, argptr);
if ( iLen != -1 )
{
- wxStrncpy(buf, s.c_str(), iLen);
+ wxStrncpy(buf, s.c_str(), len);
+ buf[len-1] = wxT('\0');
}
return iLen;
#if wxUSE_WCHAR_T
// from wide string
-wxString::wxString(const wchar_t *pwz, wxMBConv& conv)
+wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength)
{
// first get necessary size
- size_t nLen = pwz ? conv.WC2MB((char *) NULL, pwz, 0) : 0;
+ size_t nLen = 0;
+ if (pwz)
+ {
+ if (nLength == wxSTRING_MAXLEN)
+ nLen = conv.WC2MB((char *) NULL, pwz, 0);
+ else
+ nLen = nLength;
+ }
// empty?
if ( (nLen != 0) && (nLen != (size_t)-1) ) {
{
wxStringData *pData = GetStringData();
- // this variable is unused in release build, so avoid the compiler warning
- // by just not declaring it
-#ifdef __WXDEBUG__
- void *p =
-#endif
- realloc(pData, sizeof(wxStringData) + (pData->nDataLength + 1)*sizeof(wxChar));
+ size_t nLen = pData->nDataLength;
+ void *p = realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));
- // we rely on a reasonable realloc() implementation here - so far I haven't
- // seen any which wouldn't behave like this
+ wxASSERT_MSG( p != NULL, _T("can't free memory?") );
- wxASSERT( p != NULL ); // can't free memory?
- wxASSERT( p == pData ); // we're decrementing the size - block shouldn't move!
+ if ( p != pData )
+ {
+ // contrary to what one might believe, some realloc() implementation do
+ // move the memory block even when its size is reduced
+ pData = (wxStringData *)p;
+
+ m_pchData = pData->data();
+ }
+
+ pData->nAllocLength = nLen;
}
// get the pointer to writable buffer of (at least) nLen bytes
return *this;
}
+
// assigns C string
wxString& wxString::operator=(const wxChar *psz)
{
// conversion to numbers
// ----------------------------------------------------------------------------
-bool wxString::ToLong(long *val) const
+bool wxString::ToLong(long *val, int base) const
{
wxCHECK_MSG( val, FALSE, _T("NULL pointer in wxString::ToLong") );
+ wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
const wxChar *start = c_str();
wxChar *end;
- *val = wxStrtol(start, &end, 10);
+ *val = wxStrtol(start, &end, base);
// return TRUE only if scan was stopped by the terminating NUL and if the
// string was not empty to start with
return !*end && (end != start);
}
-bool wxString::ToULong(unsigned long *val) const
+bool wxString::ToULong(unsigned long *val, int base) const
{
wxCHECK_MSG( val, FALSE, _T("NULL pointer in wxString::ToULong") );
+ wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
const wxChar *start = c_str();
wxChar *end;
- *val = wxStrtoul(start, &end, 10);
+ *val = wxStrtoul(start, &end, base);
// return TRUE only if scan was stopped by the terminating NUL and if the
// string was not empty to start with
// of them)
bool wxString::Matches(const wxChar *pszMask) const
{
- // check char by char
- const wxChar *pszTxt;
- for ( pszTxt = c_str(); *pszMask != wxT('\0'); pszMask++, pszTxt++ ) {
+ // I disable this code as it doesn't seem to be faster (in fact, it seems
+ // to be much slower) than the old, hand-written code below and using it
+ // here requires always linking with libregex even if the user code doesn't
+ // use it
+#if 0 // wxUSE_REGEX
+ // first translate the shell-like mask into a regex
+ wxString pattern;
+ pattern.reserve(wxStrlen(pszMask));
+
+ pattern += _T('^');
+ while ( *pszMask )
+ {
+ switch ( *pszMask )
+ {
+ case _T('?'):
+ pattern += _T('.');
+ break;
+
+ case _T('*'):
+ pattern += _T(".*");
+ break;
+
+ case _T('^'):
+ case _T('.'):
+ case _T('$'):
+ case _T('('):
+ case _T(')'):
+ case _T('|'):
+ case _T('+'):
+ case _T('\\'):
+ // these characters are special in a RE, quote them
+ // (however note that we don't quote '[' and ']' to allow
+ // using them for Unix shell like matching)
+ pattern += _T('\\');
+ // fall through
+
+ default:
+ pattern += *pszMask;
+ }
+
+ pszMask++;
+ }
+ pattern += _T('$');
+
+ // and now use it
+ return wxRegEx(pattern, wxRE_NOSUB | wxRE_EXTENDED).Matches(c_str());
+#else // !wxUSE_REGEX
+ // TODO: this is, of course, awfully inefficient...
+
+ // the char currently being checked
+ const wxChar *pszTxt = c_str();
+
+ // the last location where '*' matched
+ const wxChar *pszLastStarInText = NULL;
+ const wxChar *pszLastStarInMask = NULL;
+
+match:
+ for ( ; *pszMask != wxT('\0'); pszMask++, pszTxt++ ) {
switch ( *pszMask ) {
case wxT('?'):
if ( *pszTxt == wxT('\0') )
return FALSE;
- // pszText and pszMask will be incremented in the loop statement
+ // pszTxt and pszMask will be incremented in the loop statement
break;
case wxT('*'):
{
+ // remember where we started to be able to backtrack later
+ pszLastStarInText = pszTxt;
+ pszLastStarInMask = pszMask;
+
// ignore special chars immediately following this one
+ // (should this be an error?)
while ( *pszMask == wxT('*') || *pszMask == wxT('?') )
pszMask++;
}
// match only if nothing left
- return *pszTxt == wxT('\0');
+ if ( *pszTxt == wxT('\0') )
+ return TRUE;
+
+ // if we failed to match, backtrack if we can
+ if ( pszLastStarInText ) {
+ pszTxt = pszLastStarInText + 1;
+ pszMask = pszLastStarInMask;
+
+ pszLastStarInText = NULL;
+
+ // don't bother resetting pszLastStarInMask, it's unnecessary
+
+ goto match;
+ }
+
+ return FALSE;
+#endif // wxUSE_REGEX/!wxUSE_REGEX
}
// Count the number of chars
}
else if ( nSize > len )
{
- *this += wxString(ch, len - nSize);
+ *this += wxString(ch, nSize - len);
}
//else: we have exactly the specified length, nothing to do
}
// ref count always stays positive
wxString tmp = str;
str = *this;
- *this = str;
+ *this = tmp;
}
wxString& wxString::insert(size_t nPos, const wxString& str)
size_t wxString::rfind(const wxString& str, size_t nStart) const
{
wxASSERT( str.GetStringData()->IsValid() );
- wxASSERT( nStart <= Len() );
+ wxASSERT( nStart == npos || nStart <= Len() );
// TODO could be made much quicker than that
const wxChar *p = c_str() + (nStart == npos ? Len() : nStart);
#if !defined(__VISUALC__) || defined(__WIN32__)
size_t wxString::rfind(const wxChar* sz, size_t nStart, size_t n) const
{
- return rfind(wxString(sz, n == npos ? 0 : n), nStart);
+ return rfind(wxString(sz, n == npos ? wxSTRING_MAXLEN : n), nStart);
}
size_t wxString::rfind(wxChar ch, size_t nStart) const
// ArrayString
// ============================================================================
-// size increment = max(50% of current size, ARRAY_MAXSIZE_INCREMENT)
+// size increment = min(50% of current size, ARRAY_MAXSIZE_INCREMENT)
#define ARRAY_MAXSIZE_INCREMENT 4096
+
#ifndef ARRAY_DEFAULT_INITIAL_SIZE // also defined in dynarray.h
- #define ARRAY_DEFAULT_INITIAL_SIZE (16)
+#define ARRAY_DEFAULT_INITIAL_SIZE (16)
#endif
#define STRING(p) ((wxString *)(&(p)))
// ctor
-wxArrayString::wxArrayString(bool autoSort)
+void wxArrayString::Init(bool autoSort)
{
m_nSize =
m_nCount = 0;
// copy ctor
wxArrayString::wxArrayString(const wxArrayString& src)
{
- m_nSize =
- m_nCount = 0;
- m_pItems = (wxChar **) NULL;
- m_autoSort = src.m_autoSort;
+ Init(src.m_autoSort);
*this = src;
}
Copy(src);
+ m_autoSort = src.m_autoSort;
+
return *this;
}
void wxArrayString::Grow()
{
// only do it if no more place
- if( m_nCount == m_nSize ) {
- if( m_nSize == 0 ) {
+ if ( m_nCount == m_nSize ) {
+ // if ARRAY_DEFAULT_INITIAL_SIZE were set to 0, the initially empty would
+ // be never resized!
+ #if ARRAY_DEFAULT_INITIAL_SIZE == 0
+ #error "ARRAY_DEFAULT_INITIAL_SIZE must be > 0!"
+ #endif
+
+ if ( m_nSize == 0 ) {
// was empty, alloc some memory
m_nSize = ARRAY_DEFAULT_INITIAL_SIZE;
m_pItems = new wxChar *[m_nSize];
else {
// otherwise when it's called for the first time, nIncrement would be 0
// and the array would never be expanded
-#if defined(__VISAGECPP__) && defined(__WXDEBUG__)
- int array_size = ARRAY_DEFAULT_INITIAL_SIZE;
- wxASSERT( array_size != 0 );
-#else
- wxASSERT( ARRAY_DEFAULT_INITIAL_SIZE != 0 );
-#endif
-
// add 50% but not too much
size_t nIncrement = m_nSize < ARRAY_DEFAULT_INITIAL_SIZE
? ARRAY_DEFAULT_INITIAL_SIZE : m_nSize >> 1;
// pre-allocates memory (frees the previous data!)
void wxArrayString::Alloc(size_t nSize)
{
- wxASSERT( nSize > 0 );
-
// only if old buffer was not big enough
if ( nSize > m_nSize ) {
Free();
}
}
+// return a wxString[] as required for some control ctors.
+wxString* wxArrayString::GetStringArray() const
+{
+ wxString *array = 0;
+
+ if( m_nCount > 0 )
+ {
+ array = new wxString[m_nCount];
+ for( size_t i = 0; i < m_nCount; i++ )
+ array[i] = m_pItems[i];
+ }
+
+ return array;
+}
+
// searches the array for an item (forward or backwards)
int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const
{
m_nCount++;
}
+// expand the array
+void wxArrayString::SetCount(size_t count)
+{
+ Alloc(count);
+
+ wxString s;
+ while ( m_nCount < count )
+ m_pItems[m_nCount++] = (wxChar *)s.c_str();
+}
+
// removes item from array (by index)
void wxArrayString::Remove(size_t nIndex)
{
static bool gs_sortAscending = TRUE;
// function which is called by quick sort
-static int LINKAGEMODE wxStringCompareFunction(const void *first, const void *second)
+extern "C" int LINKAGEMODE
+wxStringCompareFunction(const void *first, const void *second)
{
wxString *strFirst = (wxString *)first;
wxString *strSecond = (wxString *)second;
projects / wxWidgets.git / blobdiff