Cleaned up regex.cpp

fixed strlen problem in regex
many other things related to cleanup of regex.cpp

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 072ea9df0fb7244dc60bfbd38d5c48eeaed718fe..7d0efb3acc36c9fb8ad650b083b4723996b7a3fe 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -52,9 +52,10 @@
 
 #include "wx/regex.h"
 
 
 #include "wx/regex.h"
 

-#ifdef wx_wchar
-    #define regerror wx_regerror
-    #define regfree wx_regfree
+#if wxUSE_UNICODE
+#   if !defined(wxUSE_BUILTIN_REGEX)
+#       error "Unicode not supported with system regex, please reconfigure with --with-regex=builtin"
+#   endif

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -141,32 +142,25 @@ wxRegExImpl::~wxRegExImpl()
 
 wxString wxRegExImpl::GetErrorMsg(int errorcode) const
 {
 
 wxString wxRegExImpl::GetErrorMsg(int errorcode) const
 {

-    wxString msg;
+    wxString szError;

 
     // first get the string length needed
     int len = regerror(errorcode, &m_RegEx, NULL, 0);
     if ( len > 0 )
     {
 
     // 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
     {
     }
     else // regerror() returned 0
     {

-        msg = _("unknown error");
+        szError = _("unknown error");

     }
 
     }
 

-    return msg;
+    return szError;

 }
 
 bool wxRegExImpl::Compile(const wxString& expr, int flags)
 }
 
 bool wxRegExImpl::Compile(const wxString& expr, int flags)


@@ -189,12 +183,8 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
         flagsRE |= REG_NEWLINE;
 
 
         flagsRE |= REG_NEWLINE;
 
 

-    // compile it
-#ifdef wx_wchar
-    int errorcode = wx_regcomp(&m_RegEx, expr, expr.Length(), flagsRE);
-#else
-    int errorcode = regcomp(&m_RegEx, expr.mb_str(), flagsRE);
-#endif
+
+    int errorcode = regcomp(&m_RegEx, expr, flagsRE);

 
      if ( errorcode )
     {
 
      if ( errorcode )
     {


@@ -269,12 +259,7 @@ bool wxRegExImpl::Matches(const wxChar *str, int flags) const
     }
 
     // do match it
     }
 
     // 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);
-#else
-    int rc = regexec(&self->m_RegEx, wxConvertWX2MB(str), m_nMatches, m_Matches, flagsRE);
-#endif
+    int rc = regexec(&self->m_RegEx, str, m_nMatches, m_Matches, flagsRE);

 
     switch ( rc )
     {
 
     switch ( rc )
     {


@@ -487,38 +472,4 @@ int wxRegEx::Replace(wxString *pattern,
     return m_impl->Replace(pattern, replacement, maxMatches);
 }
 
     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
 #endif // wxUSE_REGEX

diff --git a/src/regex/regc_locale.c b/src/regex/regc_locale.c
index 114f9a2823fb2d238f70f343fc515cbdf74455f4..4d92e46b640050833cdb0d6852d528263e91cee9 100644 (file)
--- a/src/regex/regc_locale.c
+++ b/src/regex/regc_locale.c
@@ -53,10 +53,44 @@
 int char_and_wchar_strncmp (const char* cp, const wx_wchar* wp, size_t nNum)
 {
        while(*cp++ == (const char)*wp++ && --nNum){}
 int char_and_wchar_strncmp (const char* cp, const wx_wchar* wp, size_t nNum)
 {
        while(*cp++ == (const char)*wp++ && --nNum){}

-

        return nNum;
 }
 
        return nNum;
 }
 

+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;
+}
+
+int wx_strlen(const wx_wchar* szString)
+{
+    /*  
+    Generic -- note that some clib functions also test for eol character '^Z'
+    
+       int     nLength = 0;
+       for (; *(szString + nLength) != '\0'; nLength++);
+       return nLength;
+    */
+    return szString == NULL ? 0 : wxStrlen_(szString);
+}

 /* ASCII character-name table */
 
 static struct cname
 /* ASCII character-name table */
 
 static struct cname

diff --git a/src/regex/regcomp.c b/src/regex/regcomp.c
index 39de02eb6f6f6b49388e9dd82e57a7557efdbaa0..109db3f0aa08d08e25f2facab4ae338662295ff4 100644 (file)
--- a/src/regex/regcomp.c
+++ b/src/regex/regcomp.c
@@ -188,6 +188,7 @@ extern int  wx_ispunct(wx_wchar c);
 extern int     wx_isspace(wx_wchar c);
 extern wx_wchar wx_toupper(wx_wchar c);
 extern wx_wchar wx_tolower(wx_wchar c);
 extern int     wx_isspace(wx_wchar c);
 extern wx_wchar wx_toupper(wx_wchar c);
 extern wx_wchar wx_tolower(wx_wchar c);

+extern int  wx_strlen(const wx_wchar* szString);

 static int     nmcces(struct vars *);
 static int     nleaders(struct vars *);
 static struct cvec *allmcces(struct vars *, struct cvec *);
 static int     nmcces(struct vars *);
 static int     nleaders(struct vars *);
 static struct cvec *allmcces(struct vars *, struct cvec *);


@@ -296,18 +297,7 @@ regcomp(regex_t *re,
                    const chr *string,
                   int flags)
 {
                    const chr *string,
                   int flags)
 {

-    
-    size_t nLen = 0;
-    chr* s2 = (chr*) string;
-
-    if (string && *string)
-    {
-        while(*++s2);
-    }
-
-    nLen = ((s2 - string) / sizeof(chr));
-
-       return wx_regcomp(re, string, nLen, flags);
+       return wx_regcomp(re, string, wx_strlen(string), flags);

 }
 int
 wx_regcomp(regex_t *re,
 }
 int
 wx_regcomp(regex_t *re,

diff --git a/src/regex/regex.h b/src/regex/regex.h
index 304e15d95e5af0ec6d8d45e0e570964f321277b5..6b7539ba8b3612eff6a42db3af944808c827a8b3 100644 (file)
--- a/src/regex/regex.h
+++ b/src/regex/regex.h
@@ -44,6 +44,7 @@ extern "C" {
     WXWINDOWS CUSTOM 
 *****************************/
 #ifndef _REGEX_CUSTOM_H_
     WXWINDOWS CUSTOM 
 *****************************/
 #ifndef _REGEX_CUSTOM_H_

+#   define wxUSE_BUILTIN_REGEX

 #   define wx_wchar wxChar
 /*  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 */
 #   define wx_wchar wxChar
 /*  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 */

diff --git a/src/regex/regexec.c b/src/regex/regexec.c
index c3a29093f580e96ca8a96eff4b6349c117d6ded0..dbae952f71298c43bf8a78cb6a7d11d03764aa7b 100644 (file)
--- a/src/regex/regexec.c
+++ b/src/regex/regexec.c
@@ -172,17 +172,7 @@ regexec(regex_t *re,
                   int flags)
 {
        rm_detail_t det;
                   int flags)
 {
        rm_detail_t det;

-    size_t nLen = 0;
-    chr* s2 = (chr*) string;
-
-    if (string && *string)
-    {
-        while(*++s2);
-    }
-
-    nLen = ((s2 - string) / sizeof(chr));
-
-    return wx_regexec(re, string, nLen, &det, nmatch, pmatch, flags);
+    return wx_regexec(re, string, wx_strlen(string), &det, nmatch, pmatch, flags);

 }
 int
 wx_regexec(regex_t *re,
 }
 int
 wx_regexec(regex_t *re,