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

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){}
-
 	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

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_strlen(const wx_wchar* szString);
 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)
 {
-    
-    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,

src/regex/regex.h

@@ -44,6 +44,7 @@ extern "C" {
     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 */

src/regex/regexec.c

@@ -172,17 +172,7 @@ regexec(regex_t *re,
 		   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,