emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor source modifications to improve readability.

Browse Source
This commit is contained in:
Mark Whitley 2000-05-01 22:08:54 +00:00
parent 12d1b378be
commit d16665810d
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
regexp.c
View File

@ -353,14 +353,11 @@ static int match1(regexp * re, char ch, int token, int ignoreCase)
if (token == M_ANY) { if (token == M_ANY) {
return 0; return 0;
} else if (IS_CLASS(token)) { } else if (IS_CLASS(token)) {
if (re-> if (re->program[1 + 32 * (token - M_CLASS(0)) + (ch >> 3)] & (1 << (ch & 7)))
program[1 + 32 * (token - M_CLASS(0)) +
(ch >> 3)] & (1 << (ch & 7)))
return 0; return 0;
} }
//fprintf(stderr, "match1: ch='%c' token='%c': ", ch, token); //fprintf(stderr, "match1: ch='%c' token='%c': ", ch, token);
if (ch == token if (ch == token || (ignoreCase == TRUE && tolower(ch) == tolower(token))) {
|| (ignoreCase == TRUE && tolower(ch) == tolower(token))) {
//fprintf(stderr, "match\n"); //fprintf(stderr, "match\n");
return 0; return 0;
} }
@ -532,16 +529,15 @@ extern regexp *regcomp(char *text)
retext = text; retext = text;
for (token = M_START(0), peek = gettoken(&text, re); for (token = M_START(0), peek = gettoken(&text, re);
token; token = peek, peek = gettoken(&text, re)) { token; token = peek, peek = gettoken(&text, re)) {
/* special processing for the closure operator */ /* special processing for the closure operator */
if (IS_CLOSURE(peek)) { if (IS_CLOSURE(peek)) {
/* detect misuse of closure operator */ /* detect misuse of closure operator */
if (IS_START(token)) { if (IS_START(token)) {
FAIL("* or \\+ or \\? follows nothing"); FAIL("* or \\+ or \\? follows nothing");
} } else if (IS_META(token) && token != M_ANY && !IS_CLASS(token)) {
else if (IS_META(token) && token != M_ANY FAIL("* or \\+ or \\? can only follow a normal character or . or []");
&& !IS_CLASS(token)) {
FAIL
("* or \\+ or \\? can only follow a normal character or . or []");
} }
/* it is okay -- make it prefix instead of postfix */ /* it is okay -- make it prefix instead of postfix */