Change 13856 by jhi@alpha on 2001/12/22 23:45:35
Small tweaks.
Affected files ...
.... //depot/perl/handy.h#50 edit
.... //depot/perl/regexec.c#218 edit
Differences ...
==== //depot/perl/handy.h#50 (text) ====
Index: perl/handy.h
--- perl/handy.h.~1~ Sat Dec 22 17:00:05 2001
+++ perl/handy.h Sat Dec 22 17:00:05 2001
@@ -428,6 +428,7 @@
#define toUPPER_uni(c,s,l) to_uni_upper(c,s,l)
#define toTITLE_uni(c,s,l) to_uni_title(c,s,l)
#define toLOWER_uni(c,s,l) to_uni_lower(c,s,l)
+#define toFOLD_uni(c,s,l) to_uni_fold(c,s,l)
#define isPSXSPC_uni(c) (isSPACE_uni(c) ||(c) == '\f')
#define isBLANK_uni(c) isBLANK(c) /* could be wrong */
==== //depot/perl/regexec.c#218 (text) ====
Index: perl/regexec.c
--- perl/regexec.c.~1~ Sat Dec 22 17:00:05 2001
+++ perl/regexec.c Sat Dec 22 17:00:05 2001
@@ -393,11 +393,22 @@
SV *dsv = PERL_DEBUG_PAD_ZERO(0);
#endif
+ if (prog->reganch & ROPT_UTF8) {
+ DEBUG_r(PerlIO_printf(Perl_debug_log,
+ "UTF-8 regex...\n"));
+ PL_reg_flags |= RF_utf8;
+ }
+
DEBUG_r({
- char*s = UTF ? sv_uni_display(dsv, sv, 60, 0) : strpos;
- int len = UTF ? strlen(s) : strend - strpos;
+ char *s = PL_reg_match_utf8 ?
+ sv_uni_display(dsv, sv, 60, 0) : strpos;
+ int len = PL_reg_match_utf8 ?
+ strlen(s) : strend - strpos;
if (!PL_colorset)
reginitcolors();
+ if (PL_reg_match_utf8)
+ DEBUG_r(PerlIO_printf(Perl_debug_log,
+ "UTF-8 target...\n"));
PerlIO_printf(Perl_debug_log,
"%sGuessing start of match, REx%s `%s%.60s%s%s' against
`%s%.*s%s%s'...\n",
PL_colors[4],PL_colors[5],PL_colors[0],
@@ -411,9 +422,6 @@
);
});
- if (prog->reganch & ROPT_UTF8)
- PL_reg_flags |= RF_utf8;
-
if (prog->minlen > CHR_DIST((U8*)strend, (U8*)strpos)) {
DEBUG_r(PerlIO_printf(Perl_debug_log,
"String too short... [re_intuit_start]\n"));
End of Patch.
