Change 33148 by [EMAIL PROTECTED] on 2008/01/31 11:15:35
Integrate:
[ 32843]
Abolish RXp_PRELEN(rx) and RXp_WRAPLEN()
Fix up some uses of RX_* macros in the block conditionally compiled
with STUPID_PATTERN_CHECKS.
Affected files ...
... //depot/maint-5.10/perl/regcomp.c#6 integrate
... //depot/maint-5.10/perl/regexp.h#5 integrate
Differences ...
==== //depot/maint-5.10/perl/regcomp.c#6 (text) ====
Index: perl/regcomp.c
--- perl/regcomp.c#5~33145~ 2008-01-31 02:26:59.000000000 -0800
+++ perl/regcomp.c 2008-01-31 03:15:35.000000000 -0800
@@ -4288,11 +4288,11 @@
>> RXf_PMf_STD_PMMOD_SHIFT);
const char *fptr = STD_PAT_MODS; /*"msix"*/
char *p;
- RXp_WRAPLEN(r) = plen + has_minus + has_p + has_runon
+ RX_WRAPLEN(r) = plen + has_minus + has_p + has_runon
+ (sizeof(STD_PAT_MODS) - 1)
+ (sizeof("(?:)") - 1);
- Newx(RX_WRAPPED(r), RXp_WRAPLEN(r) + 1, char );
+ Newx(RX_WRAPPED(r), RX_WRAPLEN(r) + 1, char );
p = RX_WRAPPED(r);
*p++='('; *p++='?';
if (has_p)
@@ -4797,12 +4797,12 @@
if (r->extflags & RXf_SPLIT && RX_PRELEN(r) == 1 && RX_PRECOMP(r)[0] == '
')
/* XXX: this should happen BEFORE we compile */
r->extflags |= (RXf_SKIPWHITE|RXf_WHITE);
- else if (RX_PRELEN(r) == 3 && memEQ("\\s+", RXp_PRECOMP(r), 3))
+ else if (RX_PRELEN(r) == 3 && memEQ("\\s+", RX_PRECOMP(r), 3))
r->extflags |= RXf_WHITE;
else if (RX_PRELEN(r) == 1 && RXp_PRECOMP(r)[0] == '^')
r->extflags |= RXf_START_ONLY;
#else
- if (r->extflags & RXf_SPLIT && RXp_PRELEN(r) == 1 && RX_PRECOMP(r)[0] == '
')
+ if (r->extflags & RXf_SPLIT && RX_PRELEN(r) == 1 && RX_PRECOMP(r)[0] == '
')
/* XXX: this should happen BEFORE we compile */
r->extflags |= (RXf_SKIPWHITE|RXf_WHITE);
else {
@@ -9241,7 +9241,7 @@
{
SV *dsv= sv_newmortal();
RE_PV_QUOTED_DECL(s, (r->extflags & RXf_UTF8),
- dsv, RX_PRECOMP(r), RXp_PRELEN(r), 60);
+ 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);
}
@@ -9427,7 +9427,7 @@
precomp_offset = RX_PRECOMP(ret) - ret->wrapped;
- RX_WRAPPED(ret) = SAVEPVN(RX_WRAPPED(ret), RXp_WRAPLEN(ret)+1);
+ RX_WRAPPED(ret) = SAVEPVN(RX_WRAPPED(ret), RX_WRAPLEN(ret)+1);
RX_PRECOMP(ret) = ret->wrapped + precomp_offset;
ret->paren_names = hv_dup_inc(ret->paren_names, param);
==== //depot/maint-5.10/perl/regexp.h#5 (text) ====
Index: perl/regexp.h
--- perl/regexp.h#4~33145~ 2008-01-31 02:26:59.000000000 -0800
+++ perl/regexp.h 2008-01-31 03:15:35.000000000 -0800
@@ -360,8 +360,6 @@
? RX_MATCH_COPIED_on(prog) \
: RX_MATCH_COPIED_off(prog))
-#define RXp_PRELEN(rx) ((rx)->prelen)
-#define RXp_WRAPLEN(rx) ((rx)->wraplen)
#define RXp_EXTFLAGS(rx) ((rx)->extflags)
#define RX_PRECOMP(prog) ((prog)->precomp)
End of Patch.
