"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],
+ PL_colors[4], PL_colors[5], PL_colors[0],
prog->precomp,
PL_colors[1],
(strlen(prog->precomp) > 60 ? "..." : ""),
*/
strpos = t + 1;
DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, "Found /%s^%s/m at offset %ld, rescanning for anchored from offset %ld...\n",
- PL_colors[0],PL_colors[1], (long)(strpos - i_strpos), (long)(strpos - i_strpos + prog->anchored_offset)));
+ PL_colors[0], PL_colors[1], (long)(strpos - i_strpos), (long)(strpos - i_strpos + prog->anchored_offset)));
goto do_other_anchored;
}
/* We don't contradict the found floating substring. */
/* XXXX Why not check for STCLASS? */
s = t + 1;
DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, "Found /%s^%s/m at offset %ld...\n",
- PL_colors[0],PL_colors[1], (long)(s - i_strpos)));
+ PL_colors[0], PL_colors[1], (long)(s - i_strpos)));
goto set_useful;
}
/* Position contradicts check-string */
/* XXXX probably better to look for check-string
than for "\n", so one should lower the limit for t? */
DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, "Found /%s^%s/m, restarting lookup for check-string at offset %ld...\n",
- PL_colors[0],PL_colors[1], (long)(t + 1 - i_strpos)));
+ PL_colors[0], PL_colors[1], (long)(t + 1 - i_strpos)));
other_last = strpos = s = t + 1;
goto restart;
}
t++;
}
DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, "Did not find /%s^%s/m...\n",
- PL_colors[0],PL_colors[1]));
+ PL_colors[0], PL_colors[1]));
goto fail_finish;
}
else {
DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, "Starting position does not contradict /%s^%s/m...\n",
- PL_colors[0],PL_colors[1]));
+ PL_colors[0], PL_colors[1]));
}
s = t;
set_useful:
}
DEBUG_EXECUTE_r( if (ml_anch)
PerlIO_printf(Perl_debug_log, "Position at offset %ld does not contradict /%s^%s/m...\n",
- (long)(strpos - i_strpos), PL_colors[0],PL_colors[1]);
+ (long)(strpos - i_strpos), PL_colors[0], PL_colors[1]);
);
success_at_start:
if (!(prog->reganch & ROPT_NAUGHTY) /* XXXX If strpos moved? */
regstclass does not come from lookahead... */
/* If regstclass takes bytelength more than 1: If charlength==1, OK.
This leaves EXACTF only, which is dealt with in find_byclass(). */
- U8* str = (U8*)STRING(prog->regstclass);
- int cl_l = (PL_regkind[(U8)OP(prog->regstclass)] == EXACT
+ const U8* str = (U8*)STRING(prog->regstclass);
+ const int cl_l = (PL_regkind[(U8)OP(prog->regstclass)] == EXACT
? CHR_DIST(str+STR_LEN(prog->regstclass), str)
: 1);
char *endpos = (prog->anchored_substr || prog->anchored_utf8 || ml_anch)
? HOP3c(HOP3c(check_at, -start_shift, strbeg),
cl_l, strend)
: strend);
- char *startpos = strbeg;
t = s;
cache_re(prog);
- s = find_byclass(prog, prog->regstclass, s, endpos, startpos, 1);
+ s = find_byclass(prog, prog->regstclass, s, endpos, 1);
if (!s) {
#ifdef DEBUGGING
- char *what = 0;
+ const char *what = 0;
#endif
if (endpos == strend) {
DEBUG_EXECUTE_r( PerlIO_printf(Perl_debug_log,
goto giveup;
DEBUG_EXECUTE_r( PerlIO_printf(Perl_debug_log,
"Looking for /%s^%s/m starting at offset %ld...\n",
- PL_colors[0],PL_colors[1], (long)(t - i_strpos)) );
+ PL_colors[0], PL_colors[1], (long)(t - i_strpos)) );
goto try_at_offset;
}
if (!(do_utf8 ? prog->float_utf8 : prog->float_substr)) /* Could have been deleted */
BmUSEFUL(do_utf8 ? prog->check_utf8 : prog->check_substr) += 5; /* hooray */
fail:
DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, "%sMatch rejected by optimizer%s\n",
- PL_colors[4],PL_colors[5]));
+ PL_colors[4], PL_colors[5]));
return Nullch;
}
/* We know what class REx starts with. Try to find this position... */
STATIC char *
-S_find_byclass(pTHX_ regexp * prog, regnode *c, char *s, char *strend, char *startpos, I32 norun)
+S_find_byclass(pTHX_ regexp * prog, regnode *c, char *s, char *strend, I32 norun)
{
I32 doevery = (prog->reganch & ROPT_SKIP) == 0;
char *m;
reginitcolors();
PerlIO_printf(Perl_debug_log,
"%sMatching REx%s `%s%*.*s%s%s' against `%s%.*s%s%s'\n",
- PL_colors[4],PL_colors[5],PL_colors[0],
+ PL_colors[4], PL_colors[5], PL_colors[0],
len0, len0, s0,
PL_colors[1],
len0 > 60 ? "..." : "",
len0, len0, s0,
len1, len1, s1);
});
- if (find_byclass(prog, c, s, strend, startpos, 0))
+ if (find_byclass(prog, c, s, strend, 0))
goto got_it;
DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, "Contradicts stclass...\n"));
}
}
else {
STRLEN len;
- char *little = SvPV(float_real, len);
+ const char * const little = SvPV(float_real, len);
if (SvTAIL(float_real)) {
if (memEQ(strend - len + 1, little, len - 1))
if (last == NULL) {
DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log,
"%sCan't trim the tail, match fails (should not happen)%s\n",
- PL_colors[4],PL_colors[5]));
+ PL_colors[4], PL_colors[5]));
goto phooey; /* Should not happen! */
}
dontbother = strend - last + prog->float_min_offset;
phooey:
DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, "%sMatch failed%s\n",
- PL_colors[4],PL_colors[5]));
+ PL_colors[4], PL_colors[5]));
if (PL_reg_eval_set)
restore_pos(aTHX_ 0);
return 0;
SAVEDESTRUCTOR_X(restore_pos, 0);
}
if (!PL_reg_curpm) {
- Newz(22,PL_reg_curpm, 1, PMOP);
+ Newz(22, PL_reg_curpm, 1, PMOP);
#ifdef USE_ITHREADS
{
SV* repointer = newSViv(0);
if(PL_reg_start_tmp)
Renew(PL_reg_start_tmp, PL_reg_start_tmpl, char*);
else
- New(22,PL_reg_start_tmp, PL_reg_start_tmpl, char*);
+ New(22, PL_reg_start_tmp, PL_reg_start_tmpl, char*);
}
/* XXXX What this code is doing here?!!! There should be no need
#define POSCACHE_SEEN 1 /* we know what we're caching */
#define POSCACHE_START 2 /* the real cache: this bit maps to pos 0 */
#define CACHEsayYES STMT_START { \
- if (PL_reg_poscache) { \
+ if (cache_offset | cache_bit) { \
if (!(PL_reg_poscache[0] & (1<<POSCACHE_SEEN))) \
PL_reg_poscache[0] |= (1<<POSCACHE_SUCCESS) || (1<<POSCACHE_SEEN); \
else if (!(PL_reg_poscache[0] & (1<<POSCACHE_SUCCESS))) { \
/* cache records failure, but this is success */ \
- I32 o = locinput - PL_bostr, b; \
- o = (scan->flags & 0xf) - 1 + POSCACHE_START + o * (scan->flags>>4); \
- b = o % 8; \
- o /= 8; \
DEBUG_r( \
PerlIO_printf(Perl_debug_log, \
"%*s (remove success from failure cache)\n", \
REPORT_CODE_OFF+PL_regindent*2, "") \
); \
- PL_reg_poscache[o] &= ~(1<<b); \
+ PL_reg_poscache[cache_offset] &= ~(1<<cache_bit); \
} \
} \
sayYES; \
} STMT_END
#define CACHEsayNO STMT_START { \
- if (PL_reg_poscache) { \
+ if (cache_offset | cache_bit) { \
if (!(PL_reg_poscache[0] & (1<<POSCACHE_SEEN))) \
PL_reg_poscache[0] |= (1<<POSCACHE_SEEN); \
else if ((PL_reg_poscache[0] & (1<<POSCACHE_SUCCESS))) { \
/* cache records success, but this is failure */ \
- I32 o = locinput - PL_bostr, b; \
- o = (scan->flags & 0xf) - 1 + POSCACHE_START + o * (scan->flags>>4); \
- b = o % 8; \
- o /= 8; \
DEBUG_r( \
PerlIO_printf(Perl_debug_log, \
"%*s (remove failure from success cache)\n", \
REPORT_CODE_OFF+PL_regindent*2, "") \
); \
- PL_reg_poscache[o] &= ~(1<<b); \
+ PL_reg_poscache[cache_offset] &= ~(1<<cache_bit); \
} \
} \
sayNO; \
I32 unwind = 0;
/* used by the trie code */
- SV *sv_accept_buff; /* accepting states we have traversed */
- reg_trie_accepted *accept_buff; /* "" */
- reg_trie_data *trie; /* what trie are we using right now */
- U32 accepted = 0; /* how many accepting states we have seen*/
+ SV *sv_accept_buff = 0; /* accepting states we have traversed */
+ reg_trie_accepted *accept_buff = 0; /* "" */
+ reg_trie_data *trie; /* what trie are we using right now */
+ U32 accepted = 0; /* how many accepting states we have seen*/
#if 0
I32 firstcp = PL_savestack_ix;
SV *dsv1 = PERL_DEBUG_PAD_ZERO(1);
SV *dsv2 = PERL_DEBUG_PAD_ZERO(2);
- SV *re_debug_flags;
+ SV *re_debug_flags = NULL;
#endif
GET_RE_DEBUG_FLAGS;
DEBUG_TRIE_EXECUTE_r(
PerlIO_printf( Perl_debug_log,
- "%*s %sState: %4x, Base: %4x Accepted: %4x ",
+ "%*s %sState: %4"UVxf", Base: %4"UVxf", Accepted: %4"UVxf" ",
REPORT_CODE_OFF + PL_regindent * 2, "", PL_colors[4],
- state, base, accepted );
+ (UV)state, (UV)base, (UV)accepted );
);
if ( base ) {
uscan = foldbuf + UNISKIP( uvc );
}
} else {
- uvc = (U32)*uc;
+ uvc = (UV)*uc;
len = 1;
}
state = 0;
}
DEBUG_TRIE_EXECUTE_r(
- PerlIO_printf( Perl_debug_log,
- "Charid:%3x CV:%4x After State: %4x%s\n",
- charid, uvc, state, PL_colors[5] );
+ PerlIO_printf( Perl_debug_log,
+ "Charid:%3x CV:%4"UVxf" After State: %4"UVxf"%s\n",
+ charid, uvc, (UV)state, PL_colors[5] );
);
}
if ( !accepted ) {
DEBUG_TRIE_EXECUTE_r(
PerlIO_printf( Perl_debug_log,
- "%*s %sState: %4x, Base: %4x Accepted: %4x ",
+ "%*s %sState: %4"UVxf", Base: %4"UVxf", Accepted: %4"UVxf" ",
REPORT_CODE_OFF + PL_regindent * 2, "", PL_colors[4],
- state, base, accepted );
+ (UV)state, (UV)base, (UV)accepted );
);
if ( base ) {
}
DEBUG_TRIE_EXECUTE_r(
PerlIO_printf( Perl_debug_log,
- "Charid:%3x CV:%4x After State: %4x%s\n",
- charid, uvc, state, PL_colors[5] );
+ "Charid:%3x CV:%4"UVxf" After State: %4"UVxf"%s\n",
+ charid, uvc, (UV)state, PL_colors[5] );
);
}
if ( !accepted ) {
SV **tmp = av_fetch( trie->words, accept_buff[ 0 ].wordnum-1, 0 );
PerlIO_printf( Perl_debug_log,
"%*s %sonly one match : #%d <%s>%s\n",
- REPORT_CODE_OFF+PL_regindent*2, "",PL_colors[4],
+ REPORT_CODE_OFF+PL_regindent*2, "", PL_colors[4],
accept_buff[ 0 ].wordnum,
tmp ? SvPV_nolen( *tmp ) : "not compiled under -Dr",
PL_colors[5] );
gotit = regmatch( scan + NEXT_OFF( scan ) );
} else {
DEBUG_EXECUTE_r(
- PerlIO_printf( Perl_debug_log,"%*s %sgot %d possible matches%s\n",
- REPORT_CODE_OFF + PL_regindent * 2, "",PL_colors[4], accepted,
+ PerlIO_printf( Perl_debug_log,"%*s %sgot %"IVdf" possible matches%s\n",
+ REPORT_CODE_OFF + PL_regindent * 2, "", PL_colors[4], (IV)accepted,
PL_colors[5] );
);
while ( !gotit && accepted-- ) {
U32 best = 0;
U32 cur;
for( cur = 1 ; cur <= accepted ; cur++ ) {
- DEBUG_TRIE_EXECUTE_r(
- PerlIO_printf( Perl_debug_log,
- "%*s %sgot %d (%d) as best, looking at %d (%d)%s\n",
- REPORT_CODE_OFF + PL_regindent * 2, "", PL_colors[4],
- best, accept_buff[ best ].wordnum, cur,
- accept_buff[ cur ].wordnum, PL_colors[5] );
- );
+ DEBUG_TRIE_EXECUTE_r(
+ PerlIO_printf( Perl_debug_log,
+ "%*s %sgot %"IVdf" (%d) as best, looking at %"IVdf" (%d)%s\n",
+ REPORT_CODE_OFF + PL_regindent * 2, "", PL_colors[4],
+ (IV)best, accept_buff[ best ].wordnum, (IV)cur,
+ accept_buff[ cur ].wordnum, PL_colors[5] );
+ );
if ( accept_buff[ cur ].wordnum < accept_buff[ best ].wordnum )
best = cur;
DEBUG_EXECUTE_r({
SV **tmp = av_fetch( trie->words, accept_buff[ best ].wordnum - 1, 0 );
PerlIO_printf( Perl_debug_log, "%*s %strying alternation #%d <%s> at 0x%p%s\n",
- REPORT_CODE_OFF+PL_regindent*2, "",PL_colors[4],
+ REPORT_CODE_OFF+PL_regindent*2, "", PL_colors[4],
accept_buff[best].wordnum,
tmp ? SvPV_nolen( *tmp ) : "not compiled under -Dr",scan,
PL_colors[5] );
CHECKPOINT cp, lastcp;
CURCUR* cc = PL_regcc;
char *lastloc = cc->lastloc; /* Detection of 0-len. */
+ I32 cache_offset = 0, cache_bit = 0;
n = cc->cur + 1; /* how many we know we matched */
PL_reginput = locinput;
);
}
if (PL_reg_leftiter < 0) {
- I32 o = locinput - PL_bostr, b;
+ cache_offset = locinput - PL_bostr;
- o = (scan->flags & 0xf) - 1 + POSCACHE_START + o * (scan->flags>>4);
- b = o % 8;
- o /= 8;
- if (PL_reg_poscache[o] & (1<<b)) {
+ cache_offset = (scan->flags & 0xf) - 1 + POSCACHE_START
+ + cache_offset * (scan->flags>>4);
+ cache_bit = cache_offset % 8;
+ cache_offset /= 8;
+ if (PL_reg_poscache[cache_offset] & (1<<cache_bit)) {
DEBUG_EXECUTE_r(
PerlIO_printf(Perl_debug_log,
"%*s already tried at this position...\n",
/* cache records failure */
sayNO_SILENT;
}
- PL_reg_poscache[o] |= (1<<b);
+ PL_reg_poscache[cache_offset] |= (1<<cache_bit);
}
}
DEBUG_EXECUTE_r(
PerlIO_printf(Perl_debug_log,
"%*s %scould match...%s\n",
- REPORT_CODE_OFF+PL_regindent*2, "", PL_colors[4],PL_colors[5])
+ REPORT_CODE_OFF+PL_regindent*2, "", PL_colors[4], PL_colors[5])
);
goto yes;
yes_final:
DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, "%sMatch successful!%s\n",
- PL_colors[4],PL_colors[5]));
+ PL_colors[4], PL_colors[5]));
yes:
#ifdef DEBUGGING
PL_regindent--;
DEBUG_EXECUTE_r(
PerlIO_printf(Perl_debug_log,
"%*s %sfailed...%s\n",
- REPORT_CODE_OFF+PL_regindent*2, "",PL_colors[4],PL_colors[5])
+ REPORT_CODE_OFF+PL_regindent*2, "", PL_colors[4], PL_colors[5])
);
goto do_no;
no_final:
PL_reginput = scan;
DEBUG_r({
- SV *re_debug_flags;
+ SV *re_debug_flags = NULL;
SV *prop = sv_newmortal();
GET_RE_DEBUG_FLAGS;
DEBUG_EXECUTE_r({
static void
restore_pos(pTHX_ void *arg)
{
+ (void)arg; /* unused */
if (PL_reg_eval_set) {
if (PL_reg_oldsaved) {
PL_reg_re->subbeg = PL_reg_oldsaved;
projects / p5sagit/p5-mst-13.2.git / blobdiff