Change 14004 by jhi@alpha on 2002/01/01 18:27:50
Now that to_utf8_fold() was fixed.
Affected files ...
.... //depot/perl/regcomp.c#267 edit
.... //depot/perl/regexec.c#234 edit
Differences ...
==== //depot/perl/regcomp.c#267 (text) ====
Index: perl/regcomp.c
--- perl/regcomp.c.~1~ Tue Jan 1 11:45:06 2002
+++ perl/regcomp.c Tue Jan 1 11:45:06 2002
@@ -3132,9 +3132,7 @@
p = regwhite(p, RExC_end);
if (UTF && FOLD) {
/* Prime the casefolded buffer. */
- toFOLD_uni(ender, tmpbuf, &foldlen);
- /* Need to peek at the first character. */
- ender = utf8_to_uvchr(tmpbuf, 0);
+ ender = toFOLD_uni(ender, tmpbuf, &foldlen);
}
if (ISMULT2(p)) { /* Back off on ?+*. */
if (len)
==== //depot/perl/regexec.c#234 (text) ====
Index: perl/regexec.c
--- perl/regexec.c.~1~ Tue Jan 1 11:45:06 2002
+++ perl/regexec.c Tue Jan 1 11:45:06 2002
@@ -1002,8 +1002,7 @@
goto got_it;
else {
uvchr_to_utf8(tmpbuf, c);
- to_utf8_fold(tmpbuf, foldbuf, &foldlen);
- f = utf8_to_uvchr(foldbuf, 0);
+ f = to_utf8_fold(tmpbuf, foldbuf, &foldlen);
if ( f != c
&& (f == c1 || f == c2)
&& (ln == foldlen ||
@@ -1041,8 +1040,7 @@
goto got_it;
else {
uvchr_to_utf8(tmpbuf, c);
- to_utf8_fold(tmpbuf, foldbuf, &foldlen);
- f = utf8_to_uvchr(foldbuf, 0);
+ f = to_utf8_fold(tmpbuf, foldbuf, &foldlen);
if ( f != c
&& (f == c1 || f == c2)
&& (ln == foldlen ||
End of Patch.
