summaryrefslogtreecommitdiff
path: root/regexec.c
diff options
context:
space:
mode:
authorGurusamy Sarathy <gsar@cpan.org>1998-07-26 05:07:05 +0000
committerGurusamy Sarathy <gsar@cpan.org>1998-07-26 05:07:05 +0000
commita176fa2a176313dc1a9b9594d080f47292ff4070 (patch)
tree84b70d108cda787375cc8e20221d4f319b96e18d /regexec.c
parent2d47f9631e4507635394284706f31b5286b80fcb (diff)
downloadperl-a176fa2a176313dc1a9b9594d080f47292ff4070.tar.gz
add new files to MANIFEST; add missing prototypes to proto.h;
s/PL_utf8skip/utf8skip/ for now, or we end up with Perl_PL_; add typecasts to silence warnings; tweaks for win32 builds p4raw-id: //depot/perl@1663
Diffstat (limited to 'regexec.c')
-rw-r--r--regexec.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/regexec.c b/regexec.c
index fe9f833634..400843bfe7 100644
--- a/regexec.c
+++ b/regexec.c
@@ -420,7 +420,7 @@ regexec_flags(register regexp *prog, char *stringarg, register char *strend,
I32 back_min =
prog->anchored_substr ? prog->anchored_offset : prog->float_min_offset;
I32 delta = back_max - back_min;
- char *last = HOP(strend, -(CHR_SVLEN(must) + back_min)); /* Cannot start after this */
+ char *last = HOP(strend, 0-(CHR_SVLEN(must) + back_min)); /* Cannot start after this */
char *last1; /* Last position checked before */
if (s > PL_bostr)
@@ -1130,7 +1130,7 @@ regmatch(regnode *prog)
break;
case SANYUTF8:
if (nextchr & 0x80) {
- locinput += PL_utf8skip[nextchr];
+ locinput += utf8skip[nextchr];
if (locinput > PL_regeol)
sayNO;
nextchr = UCHARAT(locinput);
@@ -1147,7 +1147,7 @@ regmatch(regnode *prog)
break;
case ANYUTF8:
if (nextchr & 0x80) {
- locinput += PL_utf8skip[nextchr];
+ locinput += utf8skip[nextchr];
if (locinput > PL_regeol)
sayNO;
nextchr = UCHARAT(locinput);
@@ -1219,7 +1219,7 @@ regmatch(regnode *prog)
sayNO;
if (locinput >= PL_regeol)
sayNO;
- locinput += PL_utf8skip[nextchr];
+ locinput += utf8skip[nextchr];
nextchr = UCHARAT(locinput);
break;
case ANYOF:
@@ -1253,7 +1253,7 @@ regmatch(regnode *prog)
if (!(OP(scan) == ALNUMUTF8
? swash_fetch(PL_utf8_alnum, locinput) : isALNUM_LC_utf8(locinput)))
sayNO;
- locinput += PL_utf8skip[nextchr];
+ locinput += utf8skip[nextchr];
nextchr = UCHARAT(locinput);
break;
}
@@ -1283,7 +1283,7 @@ regmatch(regnode *prog)
if (OP(scan) == NALNUMUTF8
? swash_fetch(PL_utf8_alnum, locinput) : isALNUM_LC_utf8(locinput))
sayNO;
- locinput += PL_utf8skip[nextchr];
+ locinput += utf8skip[nextchr];
nextchr = UCHARAT(locinput);
break;
}
@@ -1351,7 +1351,7 @@ regmatch(regnode *prog)
if (!(OP(scan) == SPACEUTF8
? swash_fetch(PL_utf8_space,locinput) : isSPACE_LC_utf8(locinput)))
sayNO;
- locinput += PL_utf8skip[nextchr];
+ locinput += utf8skip[nextchr];
nextchr = UCHARAT(locinput);
break;
}
@@ -1381,7 +1381,7 @@ regmatch(regnode *prog)
if (OP(scan) == NSPACEUTF8
? swash_fetch(PL_utf8_space,locinput) : isSPACE_LC_utf8(locinput))
sayNO;
- locinput += PL_utf8skip[nextchr];
+ locinput += utf8skip[nextchr];
nextchr = UCHARAT(locinput);
break;
}
@@ -1399,7 +1399,7 @@ regmatch(regnode *prog)
if (nextchr & 0x80) {
if (!(swash_fetch(PL_utf8_digit,locinput)))
sayNO;
- locinput += PL_utf8skip[nextchr];
+ locinput += utf8skip[nextchr];
nextchr = UCHARAT(locinput);
break;
}
@@ -1420,7 +1420,7 @@ regmatch(regnode *prog)
if (nextchr & 0x80) {
if (swash_fetch(PL_utf8_digit,locinput))
sayNO;
- locinput += PL_utf8skip[nextchr];
+ locinput += utf8skip[nextchr];
nextchr = UCHARAT(locinput);
break;
}
@@ -1431,7 +1431,7 @@ regmatch(regnode *prog)
case CLUMP:
if (locinput >= PL_regeol || swash_fetch(PL_utf8_mark, locinput))
sayNO;
- locinput += PL_utf8skip[nextchr];
+ locinput += utf8skip[nextchr];
while (locinput < PL_regeol && swash_fetch(PL_utf8_mark, locinput))
locinput += UTF8SKIP(locinput);
if (locinput > PL_regeol)