diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2000-10-25 20:00:48 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2000-10-25 20:00:48 +0000 |
| commit | dcad28805702d580064bc39a267d63c58bbb3b3f (patch) | |
| tree | c59311ffbadd7bc18b3b7bcc1b2158652051f134 /regexec.c | |
| parent | fcc8fcf67e5ea5f08178c9ac86509bc972ef38ff (diff) | |
| download | perl-dcad28805702d580064bc39a267d63c58bbb3b3f.tar.gz | |
Continue the internal UTF-8 API tweaking.
Rename utf8_to_uv_chk() back to utf8_to_uv() because it's
used much more than the simpler API, now called utf8_to_uv_simple().
Still not quite happy with API, too much partial duplication
of functionality.
p4raw-id: //depot/perl@7439
Diffstat (limited to 'regexec.c')
| -rw-r--r-- | regexec.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -917,7 +917,7 @@ S_find_byclass(pTHX_ regexp * prog, regnode *c, char *s, char *strend, char *sta PL_reg_flags |= RF_tainted; /* FALL THROUGH */ case BOUNDUTF8: - tmp = (I32)(s != startpos) ? utf8_to_uv_chk(reghop((U8*)s, -1), + tmp = (I32)(s != startpos) ? utf8_to_uv(reghop((U8*)s, -1), strend - s, 0, 0) : '\n'; tmp = ((OP(c) == BOUNDUTF8 ? isALNUM_uni(tmp) : isALNUM_LC_uni(tmp)) != 0); @@ -955,7 +955,7 @@ S_find_byclass(pTHX_ regexp * prog, regnode *c, char *s, char *strend, char *sta PL_reg_flags |= RF_tainted; /* FALL THROUGH */ case NBOUNDUTF8: - tmp = (I32)(s != startpos) ? utf8_to_uv_chk(reghop((U8*)s, -1), + tmp = (I32)(s != startpos) ? utf8_to_uv(reghop((U8*)s, -1), strend - s, 0, 0) : '\n'; tmp = ((OP(c) == NBOUNDUTF8 ? isALNUM_uni(tmp) : isALNUM_LC_uni(tmp)) != 0); @@ -2002,7 +2002,7 @@ S_regmatch(pTHX_ regnode *prog) while (s < e) { if (l >= PL_regeol) sayNO; - if (utf8_to_uv_chk((U8*)s, e - s, 0, 0) != (c1 ? + if (utf8_to_uv((U8*)s, e - s, 0, 0) != (c1 ? toLOWER_utf8((U8*)l) : toLOWER_LC_utf8((U8*)l))) { @@ -2140,7 +2140,7 @@ S_regmatch(pTHX_ regnode *prog) case NBOUNDUTF8: /* was last char in word? */ ln = (locinput != PL_regbol) - ? utf8_to_uv_chk(reghop((U8*)locinput, -1), + ? utf8_to_uv(reghop((U8*)locinput, -1), PL_regeol - locinput, 0, 0) : PL_regprev; if (OP(scan) == BOUNDUTF8 || OP(scan) == NBOUNDUTF8) { ln = isALNUM_uni(ln); |