#define RF_warned 2 /* warned about big count? */
#define RF_evaled 4 /* Did an EVAL with setting? */
#define RF_utf8 8 /* String contains multibyte chars? */
+#define RF_false 16 /* odd number of nested negatives */
#define UTF ((PL_reg_flags & RF_utf8) != 0)
s = find_byclass(prog, prog->regstclass, s, endpos, startpos, 1);
if (!s) {
#ifdef DEBUGGING
- char *what = 0;
+ const char *what = 0;
#endif
if (endpos == strend) {
DEBUG_EXECUTE_r( PerlIO_printf(Perl_debug_log,
#define sayNO_SILENT goto do_no
#define saySAME(x) if (x) goto yes; else goto no
-#define POSCACHE_SUCCESS 0 /* caching success rather than failure */
-#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 (!(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); \
- } \
- } \
- sayYES; \
-} STMT_END
-#define CACHEsayNO STMT_START { \
- if (PL_reg_poscache) { \
- 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); \
- } \
- } \
- sayNO; \
-} STMT_END
-
/* this is used to determine how far from the left messages like
'failed...' are printed. Currently 29 makes these messages line
up with the opcode they refer to. Earlier perls used 25 which
} \
} \
if ( charid && \
- ( base + charid - 1 - trie->uniquecharcount ) >=0 && \
+ ( base + charid > trie->uniquecharcount ) && \
+ ( base + charid - 1 - trie->uniquecharcount < trie->lasttrans) && \
trie->trans[ base + charid - 1 - trie->uniquecharcount ].check == state ) \
{ \
state = trie->trans[ base + charid - 1 - trie->uniquecharcount ].next; \
tmp ? SvPV_nolen( *tmp ) : "not compiled under -Dr",
PL_colors[5] );
});
- PL_reginput = accept_buff[ 0 ].endpos;
+ PL_reginput = (char *)accept_buff[ 0 ].endpos;
/* in this case we free tmps/leave before we call regmatch
as we wont be using accept_buff again. */
FREETMPS;
accept_buff[ accepted ] = tmp;
best = accepted;
}
- PL_reginput = accept_buff[ best ].endpos;
+ PL_reginput = (char *)accept_buff[ best ].endpos;
/*
as far as I can tell we only need the SAVETMPS/FREETMPS
PL_reg_leftiter = PL_reg_maxiter;
}
if (PL_reg_leftiter-- == 0) {
- I32 size = (PL_reg_maxiter + 7 + POSCACHE_START)/8;
+ I32 size = (PL_reg_maxiter + 7)/8;
if (PL_reg_poscache) {
if ((I32)PL_reg_poscache_size < size) {
Renew(PL_reg_poscache, size, char);
if (PL_reg_leftiter < 0) {
I32 o = locinput - PL_bostr, b;
- o = (scan->flags & 0xf) - 1 + POSCACHE_START + o * (scan->flags>>4);
+ o = (scan->flags & 0xf) - 1 + o * (scan->flags>>4);
b = o % 8;
o /= 8;
if (PL_reg_poscache[o] & (1<<b)) {
"%*s already tried at this position...\n",
REPORT_CODE_OFF+PL_regindent*2, "")
);
- if (PL_reg_poscache[0] & (1<<POSCACHE_SUCCESS))
- /* cache records success */
+ if (PL_reg_flags & RF_false)
sayYES;
else
- /* cache records failure */
sayNO_SILENT;
}
PL_reg_poscache[o] |= (1<<b);
REGCP_SET(lastcp);
if (regmatch(cc->next)) {
regcpblow(cp);
- CACHEsayYES; /* All done. */
+ sayYES; /* All done. */
}
REGCP_UNWIND(lastcp);
regcppop();
"Complex regular subexpression recursion",
REG_INFTY - 1);
}
- CACHEsayNO;
+ sayNO;
}
DEBUG_EXECUTE_r(
REGCP_SET(lastcp);
if (regmatch(cc->scan)) {
regcpblow(cp);
- CACHEsayYES;
+ sayYES;
}
REGCP_UNWIND(lastcp);
regcppop();
cc->cur = n - 1;
cc->lastloc = lastloc;
- CACHEsayNO;
+ sayNO;
}
/* Prefer scan over next for maximal matching. */
REGCP_SET(lastcp);
if (regmatch(cc->scan)) {
regcpblow(cp);
- CACHEsayYES;
+ sayYES;
}
REGCP_UNWIND(lastcp);
regcppop(); /* Restore some previous $<digit>s? */
if (PL_regcc)
ln = PL_regcc->cur;
if (regmatch(cc->next))
- CACHEsayYES;
+ sayYES;
if (PL_regcc)
PL_regcc->cur = ln;
PL_regcc = cc;
cc->cur = n - 1;
cc->lastloc = lastloc;
- CACHEsayNO;
+ sayNO;
}
/* NOT REACHED */
case BRANCHJ:
}
else
PL_reginput = locinput;
+ PL_reg_flags ^= RF_false;
goto do_ifmatch;
case IFMATCH:
n = 1;
do_ifmatch:
inner = NEXTOPER(NEXTOPER(scan));
if (regmatch(inner) != n) {
+ if (n == 0)
+ PL_reg_flags ^= RF_false;
say_no:
if (logical) {
logical = 0;
else
sayNO;
}
+ if (n == 0)
+ PL_reg_flags ^= RF_false;
say_yes:
if (logical) {
logical = 0;
projects / p5sagit/p5-mst-13.2.git / blobdiff