AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Got rid of warnings

Browse Source 
- Fixed locale problems (?)
- Fixed newlines of rege_dfa.c


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton 2004-01-19 22:11:48 +00:00
parent 2cfddfe7ca
commit b8f896a10a
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/regex/regc_locale.c
View File

@ -56,28 +56,23 @@ int char_and_wchar_strncmp (const char* cp, const wx_wchar* wp, size_t nNum)
return nNum; return nNum;
} }
int wx_isdigit(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsdigit((unsigned char) c));} int wx_isdigit(wx_wchar c) {return wxIsdigit(c);}
int wx_isalpha(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsalpha((unsigned char) c));} int wx_isalpha(wx_wchar c) {return wxIsalpha(c);}
int wx_isalnum(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsalnum((unsigned char) c));} int wx_isalnum(wx_wchar c) {return wxIsalnum(c);}
int wx_isupper(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsupper((unsigned char) c));} int wx_isupper(wx_wchar c) {return wxIsupper(c);}
int wx_islower(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIslower((unsigned char) c));} int wx_islower(wx_wchar c) {return wxIslower(c);}
int wx_isgraph(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsgraph((unsigned char) c));} int wx_isgraph(wx_wchar c) {return wxIsgraph(c);}
int wx_ispunct(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIspunct((unsigned char) c));} int wx_ispunct(wx_wchar c) {return wxIspunct(c);}
int wx_isspace(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX && wxIsspace((unsigned char) c));} int wx_isspace(wx_wchar c) {return wxIsspace(c);}
wx_wchar wx_toupper(wx_wchar c) wx_wchar wx_toupper(wx_wchar c)
{ {
if (c >= 0 && c <= UCHAR_MAX) return wxToupper(c);
return wxToupper((unsigned char) c);
return c;
} }
wx_wchar wx_tolower(wx_wchar c) wx_wchar wx_tolower(wx_wchar c)
{ {
if (c >= 0 && c <= UCHAR_MAX) return wxTolower(c);
return wxTolower((unsigned char) c);
return c;
} }
int wx_strlen(const wx_wchar* szString) int wx_strlen(const wx_wchar* szString)

1
src/regex/regcomp.c
View File

@ -188,7 +188,6 @@ extern int wx_ispunct(wx_wchar c);
extern int wx_isspace(wx_wchar c); extern int wx_isspace(wx_wchar c);
extern wx_wchar wx_toupper(wx_wchar c); extern wx_wchar wx_toupper(wx_wchar c);
extern wx_wchar wx_tolower(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 nmcces(struct vars *);
static int nleaders(struct vars *); static int nleaders(struct vars *);
static struct cvec *allmcces(struct vars *, struct cvec *); static struct cvec *allmcces(struct vars *, struct cvec *);

2
src/regex/regcustom.h
View File

@ -85,6 +85,8 @@ typedef long celt; /* type to hold chr, MCCE number, or
#define iscdigit(x) wx_isdigit(x) #define iscdigit(x) wx_isdigit(x)
#define iscspace(x) wx_isspace(x) #define iscspace(x) wx_isspace(x)
extern int wx_strlen(const wx_wchar* szString);
/* and pick up the standard header */ /* and pick up the standard header */
#include "regex.h" #include "regex.h"

2
src/regex/rege_dfa.c
View File

@ -696,4 +696,4 @@ pickss(struct vars * v, /* used only for debug flags */
assert(NOTREACHED); assert(NOTREACHED);
ERR(REG_ASSERT); ERR(REG_ASSERT);
return d->ssets; return d->ssets;
} }