X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59078e629d5ad9fc0b11dfd6100d0feff5af95d3..9c54e4ae1f401a9c337b97b588e5a356d79cbe82:/src/common/regex.cpp?ds=sidebyside diff --git a/src/common/regex.cpp b/src/common/regex.cpp index 45efe1a5b2..072ea9df0f 100644 --- a/src/common/regex.cpp +++ b/src/common/regex.cpp @@ -18,7 +18,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "regex.h" #endif @@ -38,15 +38,25 @@ #include "wx/intl.h" #endif //WX_PRECOMP -// FreeBSD requires this, it probably doesn't hurt for others -#ifdef __UNIX__ - #include +// FreeBSD, Watcom and DMars require this, CW doesn't have nor need it. +// Others also don't seem to need it. If you have an error related to +// (not) including please report details to +// wx-dev@lists.wxwindows.org +#if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__) +# include #endif +#ifndef __WXWINCE__ #include +#endif #include "wx/regex.h" +#ifdef wx_wchar + #define regerror wx_regerror + #define regfree wx_regfree +#endif + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -73,17 +83,33 @@ private: // return the string containing the error message for the given err code wxString GetErrorMsg(int errorcode) const; + // init the members + void Init() + { + m_isCompiled = FALSE; + m_Matches = NULL; + m_nMatches = 0; + } + // free the RE if compiled void Free() { if ( IsValid() ) { regfree(&m_RegEx); - - m_isCompiled = FALSE; } + + delete [] m_Matches; } + // free the RE if any and reinit the members + void Reinit() + { + Free(); + Init(); + } + + // compiled RE regex_t m_RegEx; @@ -105,16 +131,12 @@ private: wxRegExImpl::wxRegExImpl() { - m_isCompiled = FALSE; - m_Matches = NULL; - m_nMatches = 0; + Init(); } wxRegExImpl::~wxRegExImpl() { Free(); - - delete [] m_Matches; } wxString wxRegExImpl::GetErrorMsg(int errorcode) const @@ -127,9 +149,17 @@ wxString wxRegExImpl::GetErrorMsg(int errorcode) const { len++; +#ifdef wx_wchar + wxCharBuffer buf(len); + + (void)regerror(errorcode, &m_RegEx, (char *)buf.data(), len); + + msg = wxString(buf.data(), wxConvLibc); +#else (void)regerror(errorcode, &m_RegEx, msg.GetWriteBuf(len), len); msg.UngetWriteBuf(); +#endif } else // regerror() returned 0 { @@ -141,7 +171,7 @@ wxString wxRegExImpl::GetErrorMsg(int errorcode) const bool wxRegExImpl::Compile(const wxString& expr, int flags) { - Free(); + Reinit(); // translate our flags to regcomp() ones wxASSERT_MSG( !(flags & @@ -158,9 +188,15 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags) if ( flags & wxRE_NEWLINE ) flagsRE |= REG_NEWLINE; + // compile it - int errorcode = regcomp(&m_RegEx, expr, flagsRE); - if ( errorcode ) +#ifdef wx_wchar + int errorcode = wx_regcomp(&m_RegEx, expr, expr.Length(), flagsRE); +#else + int errorcode = regcomp(&m_RegEx, expr.mb_str(), flagsRE); +#endif + + if ( errorcode ) { wxLogError(_("Invalid regular expression '%s': %s"), expr.c_str(), GetErrorMsg(errorcode).c_str()); @@ -184,21 +220,24 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags) m_nMatches = 1; // and some more for bracketed subexperessions - const wxChar *cptr = expr.c_str(); - wxChar prev = _T('\0'); - while ( *cptr != _T('\0') ) + for ( const wxChar *cptr = expr.c_str(); *cptr; cptr++ ) { - // is this a subexpr start, i.e. "(" for extended regex or - // "\(" for a basic one? - if ( *cptr == _T('(') && - (flags & wxRE_BASIC ? prev == _T('\\') - : prev != _T('\\')) ) + if ( *cptr == _T('\\') ) { + // in basic RE syntax groups are inside \(...\) + if ( *++cptr == _T('(') && (flags & wxRE_BASIC) ) + { + m_nMatches++; + } + } + else if ( *cptr == _T('(') && !(flags & wxRE_BASIC) ) + { + // we know that the previous character is not an unquoted + // backslash because it would have been eaten above, so we + // have a bar '(' and this indicates a group start for the + // extended syntax m_nMatches++; } - - prev = *cptr; - cptr++; } } @@ -230,7 +269,12 @@ bool wxRegExImpl::Matches(const wxChar *str, int flags) const } // do match it - int rc = regexec(&self->m_RegEx, str, m_nMatches, m_Matches, flagsRE); +#ifdef wx_wchar + rm_detail_t rd; + int rc = wx_regexec(&self->m_RegEx, str, wxStrlen(str), &rd, m_nMatches, m_Matches, flagsRE); +#else + int rc = regexec(&self->m_RegEx, wxConvertWX2MB(str), m_nMatches, m_Matches, flagsRE); +#endif switch ( rc ) { @@ -443,4 +487,38 @@ int wxRegEx::Replace(wxString *pattern, return m_impl->Replace(pattern, replacement, maxMatches); } +#ifdef wx_wchar + +/** Locale functions */ + +extern "C" { + +int wx_isdigit(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsdigit((unsigned char) c));} +int wx_isalpha(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsalpha((unsigned char) c));} +int wx_isalnum(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsalnum((unsigned char) c));} +int wx_isupper(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsupper((unsigned char) c));} +int wx_islower(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIslower((unsigned char) c));} +int wx_isgraph(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsgraph((unsigned char) c));} +int wx_ispunct(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIspunct((unsigned char) c));} +int wx_isspace(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsspace((unsigned char) c));} + +wx_wchar wx_toupper(wx_wchar c) +{ + if (c >= 0 && c <= UCHAR_MAX) + return wxToupper((unsigned char) c); + return c; + +} + +wx_wchar wx_tolower(wx_wchar c) +{ + if (c >= 0 && c <= UCHAR_MAX) + return wxTolower((unsigned char) c); + return c; +} + +} + +#endif + #endif // wxUSE_REGEX