#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 <sys/types.h> please report details to
+// wx-dev@lists.wxwindows.org
#if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__)
- #include <sys/types.h>
+# include <sys/types.h>
#endif
-#ifndef __WXWINCE__
#include <regex.h>
-#endif
-
#include "wx/regex.h"
-#ifdef wx_wchar
- #define regerror wx_regerror
- #define regfree wx_regfree
-#endif
-
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------
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()
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++;
+ char* szcmbError = new char[++len];
-#ifdef wx_wchar
- wxCharBuffer buf(len);
+ (void)regerror(errorcode, &m_RegEx, szcmbError, 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
+ 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 )
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 = 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;
}
}
// 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 = 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 )
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:
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
projects / wxWidgets.git / blobdiff