X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ebacd1fe81ff3a493980d4263826c2bc095d88e8..75a2645e11fe191cc812cd768b61322456b5f8b8:/src/common/regex.cpp diff --git a/src/common/regex.cpp b/src/common/regex.cpp index 2efc4a026b..896d2ad248 100644 --- a/src/common/regex.cpp +++ b/src/common/regex.cpp @@ -38,22 +38,17 @@ #include "wx/intl.h" #endif //WX_PRECOMP -// FreeBSD & Watcom require this, it probably doesn't hurt for others +// 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 +# include #endif -#ifndef __WXWINCE__ #include -#endif - #include "wx/regex.h" -#ifdef wx_wchar - #define regerror wx_regerror - #define regfree wx_regfree -#endif - // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -66,24 +61,25 @@ public: wxRegExImpl(); ~wxRegExImpl(); - // return TRUE if Compile() had been called successfully + // return true if Compile() had been called successfully bool IsValid() const { return m_isCompiled; } // RE operations bool Compile(const wxString& expr, int flags = 0); bool Matches(const wxChar *str, int flags = 0) const; bool GetMatch(size_t *start, size_t *len, size_t index = 0) const; + size_t GetMatchCount() const; int Replace(wxString *pattern, const wxString& replacement, size_t maxMatches = 0) const; private: // return the string containing the error message for the given err code - wxString GetErrorMsg(int errorcode) const; + wxString GetErrorMsg(int errorcode, bool badconv) const; // init the members void Init() { - m_isCompiled = FALSE; + m_isCompiled = false; m_Matches = NULL; m_nMatches = 0; } @@ -114,7 +110,7 @@ private: regmatch_t *m_Matches; size_t m_nMatches; - // TRUE if m_RegEx is valid + // true if m_RegEx is valid bool m_isCompiled; }; @@ -136,48 +132,63 @@ wxRegExImpl::~wxRegExImpl() Free(); } -wxString wxRegExImpl::GetErrorMsg(int errorcode) const +wxString wxRegExImpl::GetErrorMsg(int errorcode, bool badconv) const { - wxString msg; +#if wxUSE_UNICODE && !defined(__REG_NOFRONT) + // currently only needed when using system library in Unicode mode + if ( badconv ) + { + return _("conversion to 8-bit encoding failed"); + } +#else + // 'use' badconv to avoid a compiler warning + (void)badconv; +#endif + + wxString szError; // first get the string length needed int len = regerror(errorcode, &m_RegEx, NULL, 0); if ( len > 0 ) { - len++; - -#ifdef wx_wchar - wxCharBuffer buf(len); - - (void)regerror(errorcode, &m_RegEx, (char *)buf.data(), len); + char* szcmbError = new char[++len]; - msg = wxString(buf.data(), wxConvLibc); -#else - (void)regerror(errorcode, &m_RegEx, msg.GetWriteBuf(len), len); + (void)regerror(errorcode, &m_RegEx, szcmbError, len); - msg.UngetWriteBuf(); -#endif + szError = wxConvertMB2WX(szcmbError); + delete [] szcmbError; } else // regerror() returned 0 { - msg = _("unknown error"); + szError = _("unknown error"); } - return msg; + return szError; } bool wxRegExImpl::Compile(const wxString& expr, int flags) { Reinit(); - // translate our flags to regcomp() ones - wxASSERT_MSG( !(flags & - ~(wxRE_BASIC | wxRE_ICASE | wxRE_NOSUB | wxRE_NEWLINE)), +#ifdef WX_NO_REGEX_ADVANCED +# define FLAVORS wxRE_BASIC +#else +# define FLAVORS (wxRE_ADVANCED | wxRE_BASIC) + wxASSERT_MSG( (flags & FLAVORS) != FLAVORS, + _T("incompatible flags in wxRegEx::Compile") ); +#endif + wxASSERT_MSG( !(flags & ~(FLAVORS | wxRE_ICASE | wxRE_NOSUB | wxRE_NEWLINE)), _T("unrecognized flags in wxRegEx::Compile") ); + // translate our flags to regcomp() ones int flagsRE = 0; if ( !(flags & wxRE_BASIC) ) - flagsRE |= REG_EXTENDED; +#ifndef WX_NO_REGEX_ADVANCED + if (flags & wxRE_ADVANCED) + flagsRE |= REG_ADVANCED; + else +#endif + flagsRE |= REG_EXTENDED; if ( flags & wxRE_ICASE ) flagsRE |= REG_ICASE; if ( flags & wxRE_NOSUB ) @@ -185,20 +196,21 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags) if ( flags & wxRE_NEWLINE ) flagsRE |= REG_NEWLINE; - // compile it -#ifdef wx_wchar - int errorcode = wx_regcomp(&m_RegEx, expr, expr.Length(), flagsRE); +#ifdef __REG_NOFRONT + bool conv = true; + int errorcode = wx_re_comp(&m_RegEx, expr, expr.length(), flagsRE); #else - int errorcode = regcomp(&m_RegEx, expr.mb_str(), flagsRE); + const wxWX2MBbuf conv = expr.mbc_str(); + int errorcode = conv ? regcomp(&m_RegEx, conv, flagsRE) : REG_BADPAT; #endif - if ( errorcode ) + if ( errorcode ) { wxLogError(_("Invalid regular expression '%s': %s"), - expr.c_str(), GetErrorMsg(errorcode).c_str()); + expr.c_str(), GetErrorMsg(errorcode, !conv).c_str()); - m_isCompiled = FALSE; + m_isCompiled = false; } else // ok { @@ -231,14 +243,17 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags) { // 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++; + // have a bare '(' and this indicates a group start for the + // extended syntax. '(?' is used for extensions by perl- + // like REs (e.g. advanced), and is not valid for POSIX + // extended, so ignore them always. + if ( cptr[1] != _T('?') ) + m_nMatches++; } } } - m_isCompiled = TRUE; + m_isCompiled = true; } return IsValid(); @@ -246,7 +261,7 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags) bool wxRegExImpl::Matches(const wxChar *str, int flags) const { - wxCHECK_MSG( IsValid(), FALSE, _T("must successfully Compile() first") ); + wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") ); // translate our flags to regexec() ones wxASSERT_MSG( !(flags & ~(wxRE_NOTBOL | wxRE_NOTEOL)), @@ -266,36 +281,38 @@ bool wxRegExImpl::Matches(const wxChar *str, int flags) const } // do match it -#ifdef wx_wchar - rm_detail_t rd; - int rc = wx_regexec(&self->m_RegEx, str, wxStrlen(str), &rd, m_nMatches, m_Matches, flagsRE); +#ifdef __REG_NOFRONT + bool conv = true; + int rc = wx_re_exec(&self->m_RegEx, str, wxStrlen(str), NULL, m_nMatches, m_Matches, flagsRE); #else - int rc = regexec(&self->m_RegEx, wxConvertWX2MB(str), m_nMatches, m_Matches, flagsRE); + const wxWX2MBbuf conv = wxConvertWX2MB(str); + int rc = conv ? regexec(&self->m_RegEx, conv, m_nMatches, m_Matches, flagsRE) : REG_BADPAT; #endif switch ( rc ) { case 0: // matched successfully - return TRUE; + return true; default: // an error occured wxLogError(_("Failed to match '%s' in regular expression: %s"), - str, GetErrorMsg(rc).c_str()); + str, GetErrorMsg(rc, !conv).c_str()); // fall through case REG_NOMATCH: // no match - return FALSE; + return false; } } bool wxRegExImpl::GetMatch(size_t *start, size_t *len, size_t index) const { - wxCHECK_MSG( IsValid(), FALSE, _T("must successfully Compile() first") ); - wxCHECK_MSG( m_Matches, FALSE, _T("can't use with wxRE_NOSUB") ); - wxCHECK_MSG( index < m_nMatches, FALSE, _T("invalid match index") ); + wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") ); + wxCHECK_MSG( m_nMatches, false, _T("can't use with wxRE_NOSUB") ); + wxCHECK_MSG( m_Matches, false, _T("must call Matches() first") ); + wxCHECK_MSG( index < m_nMatches, false, _T("invalid match index") ); const regmatch_t& match = m_Matches[index]; @@ -304,15 +321,23 @@ bool wxRegExImpl::GetMatch(size_t *start, size_t *len, size_t index) const if ( len ) *len = match.rm_eo - match.rm_so; - return TRUE; + return true; +} + +size_t wxRegExImpl::GetMatchCount() const +{ + wxCHECK_MSG( IsValid(), 0, _T("must successfully Compile() first") ); + wxCHECK_MSG( m_nMatches, 0, _T("can't use with wxRE_NOSUB") ); + + return m_nMatches; } int wxRegExImpl::Replace(wxString *text, const wxString& replacement, size_t maxMatches) const { - wxCHECK_MSG( text, -1, _T("NULL text in wxRegEx::Replace") ); - wxCHECK_MSG( IsValid(), -1, _T("must successfully Compile() first") ); + wxCHECK_MSG( text, wxNOT_FOUND, _T("NULL text in wxRegEx::Replace") ); + wxCHECK_MSG( IsValid(), wxNOT_FOUND, _T("must successfully Compile() first") ); // the replacement text wxString textNew; @@ -347,7 +372,7 @@ int wxRegExImpl::Replace(wxString *text, // the replacement text anew after each match if ( mayHaveBackrefs ) { - mayHaveBackrefs = FALSE; + mayHaveBackrefs = false; textNew.clear(); textNew.reserve(replacement.length()); @@ -388,7 +413,7 @@ int wxRegExImpl::Replace(wxString *text, textNew += wxString(text->c_str() + matchStart + start, len); - mayHaveBackrefs = TRUE; + mayHaveBackrefs = true; } } else // ordinary character @@ -404,7 +429,7 @@ int wxRegExImpl::Replace(wxString *text, // we did have match as Matches() returned true above! wxFAIL_MSG( _T("internal logic error in wxRegEx::Replace") ); - return -1; + return wxNOT_FOUND; } matchStart += start; @@ -446,22 +471,22 @@ bool wxRegEx::Compile(const wxString& expr, int flags) delete m_impl; m_impl = NULL; - return FALSE; + return false; } - return TRUE; + return true; } bool wxRegEx::Matches(const wxChar *str, int flags) const { - wxCHECK_MSG( IsValid(), FALSE, _T("must successfully Compile() first") ); + wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") ); return m_impl->Matches(str, flags); } bool wxRegEx::GetMatch(size_t *start, size_t *len, size_t index) const { - wxCHECK_MSG( IsValid(), FALSE, _T("must successfully Compile() first") ); + wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") ); return m_impl->GetMatch(start, len, index); } @@ -475,47 +500,20 @@ wxString wxRegEx::GetMatch(const wxString& text, size_t index) const return text.Mid(start, len); } -int wxRegEx::Replace(wxString *pattern, - const wxString& replacement, - size_t maxMatches) const +size_t wxRegEx::GetMatchCount() const { - wxCHECK_MSG( IsValid(), -1, _T("must successfully Compile() first") ); + wxCHECK_MSG( IsValid(), 0, _T("must successfully Compile() first") ); - return m_impl->Replace(pattern, replacement, maxMatches); + return m_impl->GetMatchCount(); } -#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) +int wxRegEx::Replace(wxString *pattern, + const wxString& replacement, + size_t maxMatches) const { - if (c >= 0 && c <= UCHAR_MAX) - return wxTolower((unsigned char) c); - return c; -} + wxCHECK_MSG( IsValid(), wxNOT_FOUND, _T("must successfully Compile() first") ); + return m_impl->Replace(pattern, replacement, maxMatches); } -#endif - #endif // wxUSE_REGEX