Change 33149 by [EMAIL PROTECTED] on 2008/01/31 11:43:05
Integrate:
[ 32849]
Replace all reads of RXf_UTF8 with RX_UTF8().
Affected files ...
... //depot/maint-5.10/perl/dump.c#5 integrate
... //depot/maint-5.10/perl/ext/re/re.xs#3 integrate
... //depot/maint-5.10/perl/pp.c#4 integrate
... //depot/maint-5.10/perl/pp_hot.c#8 integrate
... //depot/maint-5.10/perl/regcomp.c#7 integrate
... //depot/maint-5.10/perl/regexec.c#6 integrate
Differences ...
==== //depot/maint-5.10/perl/dump.c#5 (text) ====
Index: perl/dump.c
--- perl/dump.c#4~33147~ 2008-01-31 03:07:48.000000000 -0800
+++ perl/dump.c 2008-01-31 03:43:05.000000000 -0800
@@ -1289,7 +1289,7 @@
= pv_pretty(dsv, RX_WRAPPED(re), RX_WRAPLEN(re),
60, NULL, NULL,
( PERL_PV_PRETTY_QUOTE | PERL_PV_ESCAPE_RE |
PERL_PV_PRETTY_ELLIPSES |
- ((RX_EXTFLAGS(re) & RXf_UTF8) ? PERL_PV_ESCAPE_UNI : 0))
+ (RX_UTF8(re) ? PERL_PV_ESCAPE_UNI : 0))
);
Perl_dump_indent(aTHX_ level+1, file, " PAT = %s\n", s);
Perl_dump_indent(aTHX_ level+1, file, " REFCNT = %"IVdf"\n",
==== //depot/maint-5.10/perl/ext/re/re.xs#3 (text) ====
Index: perl/ext/re/re.xs
--- perl/ext/re/re.xs#2~33130~ 2008-01-30 09:34:11.000000000 -0800
+++ perl/ext/re/re.xs 2008-01-31 03:43:05.000000000 -0800
@@ -118,7 +118,8 @@
}
pattern = sv_2mortal(newSVpvn(RX_PRECOMP(re),RX_PRELEN(re)));
- if (RX_EXTFLAGS(re) & RXf_UTF8) SvUTF8_on(pattern);
+ if (RX_UTF8(re))
+ SvUTF8_on(pattern);
/* return the pattern and the modifiers */
XPUSHs(pattern);
@@ -128,7 +129,7 @@
/* Scalar, so use the string that Perl would return */
/* return the pattern in (?msix:..) format */
pattern = sv_2mortal(newSVpvn(RX_WRAPPED(re),RX_WRAPLEN(re)));
- if (RX_EXTFLAGS(re) & RXf_UTF8)
+ if (RX_UTF8(re))
SvUTF8_on(pattern);
XPUSHs(pattern);
XSRETURN(1);
==== //depot/maint-5.10/perl/pp.c#4 (text) ====
Index: perl/pp.c
--- perl/pp.c#3~33139~ 2008-01-30 15:19:42.000000000 -0800
+++ perl/pp.c 2008-01-31 03:43:05.000000000 -0800
@@ -4782,7 +4782,7 @@
}
}
}
- else if (do_utf8 == ((RX_EXTFLAGS(rx) & RXf_UTF8) != 0) &&
+ else if (do_utf8 == (RX_UTF8(rx) != 0) &&
(RX_EXTFLAGS(rx) & RXf_USE_INTUIT) && !RX_NPARENS(rx)
&& (RX_EXTFLAGS(rx) & RXf_CHECK_ALL)
&& !(RX_EXTFLAGS(rx) & RXf_ANCH)) {
@@ -4790,7 +4790,7 @@
SV * const csv = CALLREG_INTUIT_STRING(rx);
len = RX_MINLENRET(rx);
- if (len == 1 && !(RX_EXTFLAGS(rx) & RXf_UTF8) && !tail) {
+ if (len == 1 && !RX_UTF8(rx) && !tail) {
const char c = *SvPV_nolen_const(csv);
while (--limit) {
for (m = s; m < strend && *m != c; m++)
==== //depot/maint-5.10/perl/pp_hot.c#8 (text) ====
Index: perl/pp_hot.c
--- perl/pp_hot.c#7~33139~ 2008-01-30 15:19:42.000000000 -0800
+++ perl/pp_hot.c 2008-01-31 03:43:05.000000000 -0800
@@ -1316,7 +1316,7 @@
minmatch = had_zerolen;
}
if (RX_EXTFLAGS(rx) & RXf_USE_INTUIT &&
- DO_UTF8(TARG) == ((RX_EXTFLAGS(rx) & RXf_UTF8) != 0)) {
+ DO_UTF8(TARG) == (RX_UTF8(rx) != 0)) {
/* FIXME - can PL_bostr be made const char *? */
PL_bostr = (char *)truebase;
s = CALLREG_INTUIT_START(rx, TARG, (char *)s, (char *)strend, r_flags,
NULL);
==== //depot/maint-5.10/perl/regcomp.c#7 (text) ====
Index: perl/regcomp.c
--- perl/regcomp.c#6~33148~ 2008-01-31 03:15:35.000000000 -0800
+++ perl/regcomp.c 2008-01-31 03:43:05.000000000 -0800
@@ -9240,7 +9240,7 @@
reginitcolors();
{
SV *dsv= sv_newmortal();
- RE_PV_QUOTED_DECL(s, (r->extflags & RXf_UTF8),
+ RE_PV_QUOTED_DECL(s, RX_UTF8(r),
dsv, RX_PRECOMP(r), RX_PRELEN(r), 60);
PerlIO_printf(Perl_debug_log,"%sFreeing REx:%s %s\n",
PL_colors[4],PL_colors[5],s);
@@ -9594,7 +9594,7 @@
if (haseval)
*haseval = RX_SEEN_EVALS(re);
if (flags)
- *flags = ((RX_EXTFLAGS(re) & RXf_UTF8) ? 1 : 0);
+ *flags = RX_UTF8(re) ? 1 : 0;
if (lp)
*lp = RX_WRAPLEN(re);
return RX_WRAPPED(re);
==== //depot/maint-5.10/perl/regexec.c#6 (text) ====
Index: perl/regexec.c
--- perl/regexec.c#5~33145~ 2008-01-31 02:26:59.000000000 -0800
+++ perl/regexec.c 2008-01-31 03:43:05.000000000 -0800
@@ -396,7 +396,7 @@
RX_MATCH_UTF8_set(prog,do_utf8);
- if (prog->extflags & RXf_UTF8) {
+ if (RX_UTF8(prog)) {
PL_reg_flags |= RF_utf8;
}
DEBUG_EXECUTE_r(
@@ -1804,7 +1804,7 @@
PL_reg_eval_set = 0;
PL_reg_maxiter = 0;
- if (prog->extflags & RXf_UTF8)
+ if (RX_UTF8(prog))
PL_reg_flags |= RF_utf8;
/* Mark beginning of line for ^ and lookbehind. */
@@ -3776,7 +3776,7 @@
PL_reg_maxiter = 0;
ST.toggle_reg_flags = PL_reg_flags;
- if (re->extflags & RXf_UTF8)
+ if (RX_UTF8(re))
PL_reg_flags |= RF_utf8;
else
PL_reg_flags &= ~RF_utf8;
End of Patch.
