* with the POSIX routines of the same names.
*/
+#ifdef PERL_EXT_RE_BUILD
+/* need to replace pregcomp et al, so enable that */
+# ifndef PERL_IN_XSUB_RE
+# define PERL_IN_XSUB_RE
+# endif
+/* need access to debugger hooks */
+# ifndef DEBUGGING
+# define DEBUGGING
+# endif
+#endif
+
+#ifdef PERL_IN_XSUB_RE
+/* We *really* need to overwrite these symbols: */
+# define Perl_regexec_flags my_regexec
+# define Perl_regdump my_regdump
+# define Perl_regprop my_regprop
+/* *These* symbols are masked to allow static link. */
+# define Perl_pregexec my_pregexec
+#endif
+
/*SUPPRESS 112*/
/*
* pregcomp and pregexec -- regsub and regerror are not used in perl
#include "perl.h"
#include "regcomp.h"
-static char * reginput; /* String-input pointer. */
-static char * regbol; /* Beginning of input, for ^ check. */
-static char * regeol; /* End of input, for $ check. */
-static char ** regstartp; /* Pointer to startp array. */
-static char ** regendp; /* Ditto for endp. */
-static U32 * reglastparen; /* Similarly for lastparen. */
-static char * regtill; /* How far we are required to go. */
-static char regprev; /* char before regbol, \n if none */
-
-static char * regprecomp; /* uncompiled string. */
-static I32 regnpar; /* () count. */
-static I32 regsize; /* Largest OPEN seens. */
-static char ** reg_start_tmp;
-static U32 reg_start_tmpl;
-static struct reg_data *data;
-static char *bostr;
-
-static U32 reg_flags; /* tainted/warned */
-static I32 reg_eval_set;
-
#define RF_tainted 1 /* tainted information used? */
#define RF_warned 2 /* warned about big count? */
-#define RF_evaled 4 /* Did an EVAL? */
+#define RF_evaled 4 /* Did an EVAL with setting? */
+
+#define RS_init 1 /* eval environment created */
+#define RS_set 2 /* replsv value is set */
#ifndef STATIC
#define STATIC static
#endif
-#ifdef DEBUGGING
-static I32 regnarrate = 0;
-static regnode* regprogram = 0;
-#endif
-
-/* Current curly descriptor */
-typedef struct curcur CURCUR;
-struct curcur {
- int parenfloor; /* how far back to strip paren data */
- int cur; /* how many instances of scan we've matched */
- int min; /* the minimal number of scans to match */
- int max; /* the maximal number of scans to match */
- int minmod; /* whether to work our way up or down */
- regnode * scan; /* the thing to match */
- regnode * next; /* what has to match after it */
- char * lastloc; /* where we started matching this scan */
- CURCUR * oldcc; /* current curly before we started this one */
-};
-
-static CURCUR* regcc;
-
+#ifndef PERL_OBJECT
typedef I32 CHECKPOINT;
/*
static I32 regrepeat _((regnode *p, I32 max));
static I32 regrepeat_hard _((regnode *p, I32 max, I32 *lp));
static I32 regtry _((regexp *prog, char *startpos));
+
static bool reginclass _((char *p, I32 c));
static CHECKPOINT regcppush _((I32 parenfloor));
static char * regcppop _((void));
+#endif
+#define REGINCLASS(p,c) (*(p) ? reginclass(p,c) : ANYOF_TEST(p,c))
-static CHECKPOINT
+STATIC CHECKPOINT
regcppush(I32 parenfloor)
{
dTHR;
- int retval = savestack_ix;
- int i = (regsize - parenfloor) * 4;
+ int retval = PL_savestack_ix;
+ int i = (PL_regsize - parenfloor) * 4;
int p;
SSCHECK(i + 5);
- for (p = regsize; p > parenfloor; p--) {
- SSPUSHPTR(regendp[p]);
- SSPUSHPTR(regstartp[p]);
- SSPUSHPTR(reg_start_tmp[p]);
+ for (p = PL_regsize; p > parenfloor; p--) {
+ SSPUSHPTR(PL_regendp[p]);
+ SSPUSHPTR(PL_regstartp[p]);
+ SSPUSHPTR(PL_reg_start_tmp[p]);
SSPUSHINT(p);
}
- SSPUSHINT(regsize);
- SSPUSHINT(*reglastparen);
- SSPUSHPTR(reginput);
+ SSPUSHINT(PL_regsize);
+ SSPUSHINT(*PL_reglastparen);
+ SSPUSHPTR(PL_reginput);
SSPUSHINT(i + 3);
SSPUSHINT(SAVEt_REGCONTEXT);
return retval;
}
/* These are needed since we do not localize EVAL nodes: */
-# define REGCP_SET DEBUG_r(PerlIO_printf(Perl_debug_log, " Setting an EVAL scope, savestack=%i\n", savestack_ix)); lastcp = savestack_ix
-# define REGCP_UNWIND DEBUG_r(lastcp != savestack_ix ? PerlIO_printf(Perl_debug_log," Clearing an EVAL scope, savestack=%i..%i\n", lastcp, savestack_ix) : 0); regcpblow(lastcp)
+# define REGCP_SET DEBUG_r(PerlIO_printf(Perl_debug_log, \
+ " Setting an EVAL scope, savestack=%i\n", \
+ PL_savestack_ix)); lastcp = PL_savestack_ix
-static char *
+# define REGCP_UNWIND DEBUG_r(lastcp != PL_savestack_ix ? \
+ PerlIO_printf(Perl_debug_log, \
+ " Clearing an EVAL scope, savestack=%i..%i\n", \
+ lastcp, PL_savestack_ix) : 0); regcpblow(lastcp)
+
+STATIC char *
regcppop(void)
{
dTHR;
assert(i == SAVEt_REGCONTEXT);
i = SSPOPINT;
input = (char *) SSPOPPTR;
- *reglastparen = SSPOPINT;
- regsize = SSPOPINT;
+ *PL_reglastparen = SSPOPINT;
+ PL_regsize = SSPOPINT;
for (i -= 3; i > 0; i -= 4) {
paren = (U32)SSPOPINT;
- reg_start_tmp[paren] = (char *) SSPOPPTR;
- regstartp[paren] = (char *) SSPOPPTR;
+ PL_reg_start_tmp[paren] = (char *) SSPOPPTR;
+ PL_regstartp[paren] = (char *) SSPOPPTR;
tmps = (char*)SSPOPPTR;
- if (paren <= *reglastparen)
- regendp[paren] = tmps;
+ if (paren <= *PL_reglastparen)
+ PL_regendp[paren] = tmps;
DEBUG_r(
- PerlIO_printf(Perl_debug_log, " restoring \\%d to %d(%d)..%d%s\n",
- paren, regstartp[paren] - regbol,
- reg_start_tmp[paren] - regbol,
- regendp[paren] - regbol,
- (paren > *reglastparen ? "(no)" : ""));
+ PerlIO_printf(Perl_debug_log,
+ " restoring \\%d to %d(%d)..%d%s\n",
+ paren, PL_regstartp[paren] - PL_regbol,
+ PL_reg_start_tmp[paren] - PL_regbol,
+ PL_regendp[paren] - PL_regbol,
+ (paren > *PL_reglastparen ? "(no)" : ""));
);
}
DEBUG_r(
- if (*reglastparen + 1 <= regnpar) {
- PerlIO_printf(Perl_debug_log, " restoring \\%d..\\%d to undef\n",
- *reglastparen + 1, regnpar);
+ if (*PL_reglastparen + 1 <= PL_regnpar) {
+ PerlIO_printf(Perl_debug_log,
+ " restoring \\%d..\\%d to undef\n",
+ *PL_reglastparen + 1, PL_regnpar);
}
);
- for (paren = *reglastparen + 1; paren <= regnpar; paren++) {
- if (paren > regsize)
- regstartp[paren] = Nullch;
- regendp[paren] = Nullch;
+ for (paren = *PL_reglastparen + 1; paren <= PL_regnpar; paren++) {
+ if (paren > PL_regsize)
+ PL_regstartp[paren] = Nullch;
+ PL_regendp[paren] = Nullch;
}
return input;
}
- pregexec - match a regexp against a string
*/
I32
-pregexec(register regexp *prog, char *stringarg, register char *strend, char *strbeg, I32 minend, SV *screamer, U32 nosave)
+pregexec(register regexp *prog, char *stringarg, register char *strend,
+ char *strbeg, I32 minend, SV *screamer, U32 nosave)
/* strend: pointer to null at end of string */
/* strbeg: real beginning of string */
/* minend: end of match must be >=minend after stringarg. */
- regexec_flags - match a regexp against a string
*/
I32
-regexec_flags(register regexp *prog, char *stringarg, register char *strend, char *strbeg, I32 minend, SV *screamer, void *data, U32 flags)
+regexec_flags(register regexp *prog, char *stringarg, register char *strend,
+ char *strbeg, I32 minend, SV *screamer, void *data, U32 flags)
/* strend: pointer to null at end of string */
/* strbeg: real beginning of string */
/* minend: end of match must be >=minend after stringarg. */
/* data: May be used for some additional optimizations. */
/* nosave: For optimizations. */
{
+ dTHR;
register char *s;
register regnode *c;
register char *startpos = stringarg;
I32 end_shift = 0; /* Same for the end. */
I32 scream_pos = -1; /* Internal iterator of scream. */
char *scream_olds;
+ SV* oreplsv = GvSV(PL_replgv);
cc.cur = 0;
cc.oldcc = 0;
- regcc = &cc;
+ PL_regcc = &cc;
- regprecomp = prog->precomp; /* Needed for error messages. */
+ PL_regprecomp = prog->precomp; /* Needed for error messages. */
#ifdef DEBUGGING
- regnarrate = debug & 512;
- regprogram = prog->program;
+ PL_regnarrate = PL_debug & 512;
+ PL_regprogram = prog->program;
#endif
/* Be paranoid... */
if (strend - startpos < minlen) goto phooey;
if (startpos == strbeg) /* is ^ valid at stringarg? */
- regprev = '\n';
+ PL_regprev = '\n';
else {
- regprev = stringarg[-1];
- if (!multiline && regprev == '\n')
- regprev = '\0'; /* force ^ to NOT match */
+ PL_regprev = stringarg[-1];
+ if (!PL_multiline && PL_regprev == '\n')
+ PL_regprev = '\0'; /* force ^ to NOT match */
}
/* Check validity of program. */
FAIL("corrupted regexp program");
}
- regnpar = prog->nparens;
- reg_flags = 0;
- reg_eval_set = 0;
+ PL_regnpar = prog->nparens;
+ PL_reg_flags = 0;
+ PL_reg_eval_set = 0;
/* If there is a "must appear" string, look for it. */
s = startpos;
&& prog->check_substr != Nullsv &&
!(prog->reganch & ROPT_ANCH_GPOS) &&
(!(prog->reganch & (ROPT_ANCH_BOL | ROPT_ANCH_MBOL))
- || (multiline && prog->check_substr == prog->anchored_substr)) )
+ || (PL_multiline && prog->check_substr == prog->anchored_substr)) )
{
start_shift = prog->check_offset_min;
/* Should be nonnegative! */
end_shift = minlen - start_shift - SvCUR(prog->check_substr);
if (screamer) {
- if (screamfirst[BmRARE(prog->check_substr)] >= 0)
+ if (PL_screamfirst[BmRARE(prog->check_substr)] >= 0)
s = screaminstr(screamer, prog->check_substr,
start_shift + (stringarg - strbeg),
end_shift, &scream_pos, 0);
else
s = fbm_instr((unsigned char*)s + start_shift,
(unsigned char*)strend - end_shift,
- prog->check_substr);
+ prog->check_substr, 0);
if (!s) {
++BmUSEFUL(prog->check_substr); /* hooray */
goto phooey; /* not present */
}
/* Mark beginning of line for ^ and lookbehind. */
- regbol = startpos;
- bostr = strbeg;
+ PL_regbol = startpos;
+ PL_bostr = strbeg;
/* Mark end of line for $ (and such) */
- regeol = strend;
+ PL_regeol = strend;
/* see how far we have to get to not match where we matched before */
- regtill = startpos+minend;
+ PL_regtill = startpos+minend;
DEBUG_r(
PerlIO_printf(Perl_debug_log,
- "Matching `%.60s%s' against `%.*s%s'\n",
- prog->precomp,
+ "%sMatching%s `%s%.60s%s%s' against `%s%.*s%s%s'\n",
+ PL_colors[4],PL_colors[5],PL_colors[0],
+ prog->precomp,
+ PL_colors[1],
(strlen(prog->precomp) > 60 ? "..." : ""),
+ PL_colors[0],
(strend - startpos > 60 ? 60 : strend - startpos),
- startpos,
+ startpos, PL_colors[1],
(strend - startpos > 60 ? "..." : ""))
);
if (regtry(prog, startpos))
goto got_it;
else if (!(prog->reganch & ROPT_ANCH_GPOS) &&
- (multiline || (prog->reganch & ROPT_IMPLICIT)
+ (PL_multiline || (prog->reganch & ROPT_IMPLICIT)
|| (prog->reganch & ROPT_ANCH_MBOL)))
{
if (minlen)
? (s = screaminstr(screamer, must, s + back_min - strbeg,
end_shift, &scream_pos, 0))
: (s = fbm_instr((unsigned char*)s + back_min,
- (unsigned char*)strend, must))) ) {
+ (unsigned char*)strend, must, 0))) ) {
if (s - back_max > last1) {
last1 = s - back_min;
s = s - back_max;
case ANYOF:
Class = (char *) OPERAND(c);
while (s < strend) {
- if (reginclass(Class, *s)) {
+ if (REGINCLASS(Class, *s)) {
if (tmp && regtry(prog, s))
goto got_it;
else
}
break;
case BOUNDL:
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
/* FALL THROUGH */
case BOUND:
if (minlen)
dontbother++,strend--;
- tmp = (s != startpos) ? UCHARAT(s - 1) : regprev;
+ tmp = (s != startpos) ? UCHARAT(s - 1) : PL_regprev;
tmp = ((OP(c) == BOUND ? isALNUM(tmp) : isALNUM_LC(tmp)) != 0);
while (s < strend) {
if (tmp == !(OP(c) == BOUND ? isALNUM(*s) : isALNUM_LC(*s))) {
goto got_it;
break;
case NBOUNDL:
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
/* FALL THROUGH */
case NBOUND:
if (minlen)
dontbother++,strend--;
- tmp = (s != startpos) ? UCHARAT(s - 1) : regprev;
+ tmp = (s != startpos) ? UCHARAT(s - 1) : PL_regprev;
tmp = ((OP(c) == NBOUND ? isALNUM(tmp) : isALNUM_LC(tmp)) != 0);
while (s < strend) {
if (tmp == !(OP(c) == NBOUND ? isALNUM(*s) : isALNUM_LC(*s)))
}
break;
case ALNUML:
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
while (s < strend) {
if (isALNUM_LC(*s)) {
if (tmp && regtry(prog, s))
}
break;
case NALNUML:
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
while (s < strend) {
if (!isALNUM_LC(*s)) {
if (tmp && regtry(prog, s))
}
break;
case SPACEL:
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
while (s < strend) {
if (isSPACE_LC(*s)) {
if (tmp && regtry(prog, s))
}
break;
case NSPACEL:
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
while (s < strend) {
if (!isSPACE_LC(*s)) {
if (tmp && regtry(prog, s))
} else {
STRLEN len;
char *little = SvPV(prog->float_substr, len);
- last = rninstr(s, strend, little, little + len);
+ if (len)
+ last = rninstr(s, strend, little, little + len);
+ else
+ last = strend; /* matching `$' */
}
if (last == NULL) goto phooey; /* Should not happen! */
- dontbother = strend - last - 1;
+ dontbother = strend - last + prog->float_min_offset;
}
if (minlen && (dontbother < minlen))
dontbother = minlen - 1;
goto phooey;
got_it:
- strend += dontbother; /* uncheat */
prog->subbeg = strbeg;
- prog->subend = strend;
- RX_MATCH_TAINTED_SET(prog, reg_flags & RF_tainted);
+ prog->subend = PL_regeol; /* strend may have been modified */
+ RX_MATCH_TAINTED_set(prog, PL_reg_flags & RF_tainted);
/* make sure $`, $&, $', and $digit will work later */
if (strbeg != prog->subbase) { /* second+ //g match. */
}
}
else {
- I32 i = strend - startpos + (stringarg - strbeg);
+ I32 i = PL_regeol - startpos + (stringarg - strbeg);
s = savepvn(strbeg, i);
Safefree(prog->subbase);
prog->subbase = s;
}
}
}
+ /* Preserve the current value of $^R */
+ if (oreplsv != GvSV(PL_replgv)) {
+ sv_setsv(oreplsv, GvSV(PL_replgv));/* So that when GvSV(replgv) is
+ restored, the value remains
+ the same. */
+ }
return 1;
phooey:
/*
- regtry - try match at specific point
*/
-static I32 /* 0 failure, 1 success */
+STATIC I32 /* 0 failure, 1 success */
regtry(regexp *prog, char *startpos)
{
dTHR;
register char **ep;
CHECKPOINT lastcp;
- reginput = startpos;
- regstartp = prog->startp;
- regendp = prog->endp;
- reglastparen = &prog->lastparen;
+ if ((prog->reganch & ROPT_EVAL_SEEN) && !PL_reg_eval_set) {
+ PL_reg_eval_set = RS_init;
+ DEBUG_r(DEBUG_s(
+ PerlIO_printf(Perl_debug_log, " setting stack tmpbase at %i\n",
+ PL_stack_sp - PL_stack_base);
+ ));
+ SAVEINT(cxstack[cxstack_ix].blk_oldsp);
+ cxstack[cxstack_ix].blk_oldsp = PL_stack_sp - PL_stack_base;
+ /* Otherwise OP_NEXTSTATE will free whatever on stack now. */
+ SAVETMPS;
+ /* Apparently this is not needed, judging by wantarray. */
+ /* SAVEINT(cxstack[cxstack_ix].blk_gimme);
+ cxstack[cxstack_ix].blk_gimme = G_SCALAR; */
+ }
+ PL_reginput = startpos;
+ PL_regstartp = prog->startp;
+ PL_regendp = prog->endp;
+ PL_reglastparen = &prog->lastparen;
prog->lastparen = 0;
- regsize = 0;
- if (reg_start_tmpl <= prog->nparens) {
- reg_start_tmpl = prog->nparens*3/2 + 3;
- if(reg_start_tmp)
- Renew(reg_start_tmp, reg_start_tmpl, char*);
+ PL_regsize = 0;
+ if (PL_reg_start_tmpl <= prog->nparens) {
+ PL_reg_start_tmpl = prog->nparens*3/2 + 3;
+ if(PL_reg_start_tmp)
+ Renew(PL_reg_start_tmp, PL_reg_start_tmpl, char*);
else
- New(22,reg_start_tmp, reg_start_tmpl, char*);
+ New(22,PL_reg_start_tmp, PL_reg_start_tmpl, char*);
}
sp = prog->startp;
ep = prog->endp;
- data = prog->data;
+ PL_regdata = prog->data;
if (prog->nparens) {
for (i = prog->nparens; i >= 0; i--) {
*sp++ = NULL;
}
}
REGCP_SET;
- if (regmatch(prog->program + 1) && reginput >= regtill) {
+ if (regmatch(prog->program + 1)) {
prog->startp[0] = startpos;
- prog->endp[0] = reginput;
+ prog->endp[0] = PL_reginput;
return 1;
}
REGCP_UNWIND;
* maybe save a little bit of pushing and popping on the stack. It also takes
* advantage of machines that use a register save mask on subroutine entry.
*/
-static I32 /* 0 failure, 1 success */
+STATIC I32 /* 0 failure, 1 success */
regmatch(regnode *prog)
{
dTHR;
register regnode *scan; /* Current node. */
regnode *next; /* Next node. */
regnode *inner; /* Next node in internal branch. */
- register I32 nextchar;
+ register I32 nextchr; /* renamed nextchr - nextchar colides with
+ function of same name */
register I32 n; /* no or next */
register I32 ln; /* len or last */
register char *s; /* operand or save */
- register char *locinput = reginput;
+ register char *locinput = PL_reginput;
register I32 c1, c2, paren; /* case fold search, parenth */
int minmod = 0, sw = 0, logical = 0;
#ifdef DEBUGGING
- static int regindent = 0;
- regindent++;
+ PL_regindent++;
#endif
- nextchar = UCHARAT(locinput);
+ nextchr = UCHARAT(locinput);
scan = prog;
while (scan != NULL) {
#define sayNO_L (logical ? (logical = 0, sw = 0, goto cont) : sayNO)
#endif
DEBUG_r( {
SV *prop = sv_newmortal();
- int docolor = *colors[0];
+ int docolor = *PL_colors[0];
int taill = (docolor ? 10 : 7); /* 3 chars for "> <" */
- int l = (regeol - locinput > taill ? taill : regeol - locinput);
- int pref_len = (locinput - bostr > (5 + taill) - l
- ? (5 + taill) - l : locinput - bostr);
-
- if (l + pref_len < (5 + taill) && l < regeol - locinput)
- l = ( regeol - locinput > (5 + taill) - pref_len
- ? (5 + taill) - pref_len : regeol - locinput);
+ int l = (PL_regeol - locinput > taill ? taill : PL_regeol - locinput);
+ int pref_len = (locinput - PL_bostr > (5 + taill) - l
+ ? (5 + taill) - l : locinput - PL_bostr);
+ int pref0_len = pref_len - (locinput - PL_reginput);
+
+ if (l + pref_len < (5 + taill) && l < PL_regeol - locinput)
+ l = ( PL_regeol - locinput > (5 + taill) - pref_len
+ ? (5 + taill) - pref_len : PL_regeol - locinput);
+ if (pref0_len < 0)
+ pref0_len = 0;
regprop(prop, scan);
PerlIO_printf(Perl_debug_log,
- "%4i <%s%.*s%s%s%s%.*s%s>%*s|%*s%2d%s\n",
- locinput - bostr,
- colors[2], pref_len, locinput - pref_len, colors[3],
+ "%4i <%s%.*s%s%s%.*s%s%s%s%.*s%s>%*s|%3d:%*s%s\n",
+ locinput - PL_bostr,
+ PL_colors[4], pref0_len,
+ locinput - pref_len, PL_colors[5],
+ PL_colors[2], pref_len - pref0_len,
+ locinput - pref_len + pref0_len, PL_colors[3],
(docolor ? "" : "> <"),
- colors[0], l, locinput, colors[1],
+ PL_colors[0], l, locinput, PL_colors[1],
15 - l - pref_len + 1,
"",
- regindent*2, "", scan - regprogram,
+ scan - PL_regprogram, PL_regindent*2, "",
SvPVX(prop));
} );
-#ifdef REGALIGN
next = scan + NEXT_OFF(scan);
if (next == scan)
next = NULL;
-#else
- next = regnext(scan);
-#endif
switch (OP(scan)) {
case BOL:
- if (locinput == regbol
- ? regprev == '\n'
- : (multiline &&
- (nextchar || locinput < regeol) && locinput[-1] == '\n') )
+ if (locinput == PL_bostr
+ ? PL_regprev == '\n'
+ : (PL_multiline &&
+ (nextchr || locinput < PL_regeol) && locinput[-1] == '\n') )
{
- /* regtill = regbol; */
+ /* PL_regtill = PL_regbol; */
break;
}
sayNO;
case MBOL:
- if (locinput == regbol
- ? regprev == '\n'
- : ((nextchar || locinput < regeol) && locinput[-1] == '\n') )
+ if (locinput == PL_bostr
+ ? PL_regprev == '\n'
+ : ((nextchr || locinput < PL_regeol) && locinput[-1] == '\n') )
{
break;
}
sayNO;
case SBOL:
- if (locinput == regbol && regprev == '\n')
+ if (locinput == PL_regbol && PL_regprev == '\n')
break;
sayNO;
case GPOS:
- if (locinput == regbol)
+ if (locinput == PL_regbol)
break;
sayNO;
case EOL:
- if (multiline)
+ if (PL_multiline)
goto meol;
else
goto seol;
case MEOL:
meol:
- if ((nextchar || locinput < regeol) && nextchar != '\n')
+ if ((nextchr || locinput < PL_regeol) && nextchr != '\n')
sayNO;
break;
case SEOL:
seol:
- if ((nextchar || locinput < regeol) && nextchar != '\n')
+ if ((nextchr || locinput < PL_regeol) && nextchr != '\n')
sayNO;
- if (regeol - locinput > 1)
+ if (PL_regeol - locinput > 1)
+ sayNO;
+ break;
+ case EOS:
+ if (PL_regeol != locinput)
sayNO;
break;
case SANY:
- if (!nextchar && locinput >= regeol)
+ if (!nextchr && locinput >= PL_regeol)
sayNO;
- nextchar = UCHARAT(++locinput);
+ nextchr = UCHARAT(++locinput);
break;
case ANY:
- if (!nextchar && locinput >= regeol || nextchar == '\n')
+ if (!nextchr && locinput >= PL_regeol || nextchr == '\n')
sayNO;
- nextchar = UCHARAT(++locinput);
+ nextchr = UCHARAT(++locinput);
break;
case EXACT:
s = (char *) OPERAND(scan);
ln = UCHARAT(s++);
/* Inline the first character, for speed. */
- if (UCHARAT(s) != nextchar)
+ if (UCHARAT(s) != nextchr)
sayNO;
- if (regeol - locinput < ln)
+ if (PL_regeol - locinput < ln)
sayNO;
if (ln > 1 && memNE(s, locinput, ln))
sayNO;
locinput += ln;
- nextchar = UCHARAT(locinput);
+ nextchr = UCHARAT(locinput);
break;
case EXACTFL:
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
/* FALL THROUGH */
case EXACTF:
s = (char *) OPERAND(scan);
ln = UCHARAT(s++);
/* Inline the first character, for speed. */
- if (UCHARAT(s) != nextchar &&
+ if (UCHARAT(s) != nextchr &&
UCHARAT(s) != ((OP(scan) == EXACTF)
- ? fold : fold_locale)[nextchar])
+ ? fold : fold_locale)[nextchr])
sayNO;
- if (regeol - locinput < ln)
+ if (PL_regeol - locinput < ln)
sayNO;
if (ln > 1 && (OP(scan) == EXACTF
? ibcmp(s, locinput, ln)
: ibcmp_locale(s, locinput, ln)))
sayNO;
locinput += ln;
- nextchar = UCHARAT(locinput);
+ nextchr = UCHARAT(locinput);
break;
case ANYOF:
s = (char *) OPERAND(scan);
- if (nextchar < 0)
- nextchar = UCHARAT(locinput);
- if (!reginclass(s, nextchar))
+ if (nextchr < 0)
+ nextchr = UCHARAT(locinput);
+ if (!REGINCLASS(s, nextchr))
sayNO;
- if (!nextchar && locinput >= regeol)
+ if (!nextchr && locinput >= PL_regeol)
sayNO;
- nextchar = UCHARAT(++locinput);
+ nextchr = UCHARAT(++locinput);
break;
case ALNUML:
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
/* FALL THROUGH */
case ALNUM:
- if (!nextchar)
+ if (!nextchr)
sayNO;
if (!(OP(scan) == ALNUM
- ? isALNUM(nextchar) : isALNUM_LC(nextchar)))
+ ? isALNUM(nextchr) : isALNUM_LC(nextchr)))
sayNO;
- nextchar = UCHARAT(++locinput);
+ nextchr = UCHARAT(++locinput);
break;
case NALNUML:
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
/* FALL THROUGH */
case NALNUM:
- if (!nextchar && locinput >= regeol)
+ if (!nextchr && locinput >= PL_regeol)
sayNO;
if (OP(scan) == NALNUM
- ? isALNUM(nextchar) : isALNUM_LC(nextchar))
+ ? isALNUM(nextchr) : isALNUM_LC(nextchr))
sayNO;
- nextchar = UCHARAT(++locinput);
+ nextchr = UCHARAT(++locinput);
break;
case BOUNDL:
case NBOUNDL:
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
/* FALL THROUGH */
case BOUND:
case NBOUND:
/* was last char in word? */
- ln = (locinput != regbol) ? UCHARAT(locinput - 1) : regprev;
+ ln = (locinput != PL_regbol) ? UCHARAT(locinput - 1) : PL_regprev;
if (OP(scan) == BOUND || OP(scan) == NBOUND) {
ln = isALNUM(ln);
- n = isALNUM(nextchar);
+ n = isALNUM(nextchr);
}
else {
ln = isALNUM_LC(ln);
- n = isALNUM_LC(nextchar);
+ n = isALNUM_LC(nextchr);
}
if (((!ln) == (!n)) == (OP(scan) == BOUND || OP(scan) == BOUNDL))
sayNO;
break;
case SPACEL:
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
/* FALL THROUGH */
case SPACE:
- if (!nextchar && locinput >= regeol)
+ if (!nextchr && locinput >= PL_regeol)
sayNO;
if (!(OP(scan) == SPACE
- ? isSPACE(nextchar) : isSPACE_LC(nextchar)))
+ ? isSPACE(nextchr) : isSPACE_LC(nextchr)))
sayNO;
- nextchar = UCHARAT(++locinput);
+ nextchr = UCHARAT(++locinput);
break;
case NSPACEL:
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
/* FALL THROUGH */
case NSPACE:
- if (!nextchar)
+ if (!nextchr)
sayNO;
if (OP(scan) == SPACE
- ? isSPACE(nextchar) : isSPACE_LC(nextchar))
+ ? isSPACE(nextchr) : isSPACE_LC(nextchr))
sayNO;
- nextchar = UCHARAT(++locinput);
+ nextchr = UCHARAT(++locinput);
break;
case DIGIT:
- if (!isDIGIT(nextchar))
+ if (!isDIGIT(nextchr))
sayNO;
- nextchar = UCHARAT(++locinput);
+ nextchr = UCHARAT(++locinput);
break;
case NDIGIT:
- if (!nextchar && locinput >= regeol)
+ if (!nextchr && locinput >= PL_regeol)
sayNO;
- if (isDIGIT(nextchar))
+ if (isDIGIT(nextchr))
sayNO;
- nextchar = UCHARAT(++locinput);
+ nextchr = UCHARAT(++locinput);
break;
case REFFL:
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
/* FALL THROUGH */
case REF:
case REFF:
n = ARG(scan); /* which paren pair */
- s = regstartp[n];
- if (*reglastparen < n || !s)
- break; /* Zero length always matches */
- if (s == regendp[n])
+ s = PL_regstartp[n];
+ if (*PL_reglastparen < n || !s)
+ sayNO; /* Do not match unless seen CLOSEn. */
+ if (s == PL_regendp[n])
break;
/* Inline the first character, for speed. */
- if (UCHARAT(s) != nextchar &&
+ if (UCHARAT(s) != nextchr &&
(OP(scan) == REF ||
(UCHARAT(s) != ((OP(scan) == REFF
- ? fold : fold_locale)[nextchar]))))
+ ? fold : fold_locale)[nextchr]))))
sayNO;
- ln = regendp[n] - s;
- if (locinput + ln > regeol)
+ ln = PL_regendp[n] - s;
+ if (locinput + ln > PL_regeol)
sayNO;
if (ln > 1 && (OP(scan) == REF
? memNE(s, locinput, ln)
: ibcmp_locale(s, locinput, ln))))
sayNO;
locinput += ln;
- nextchar = UCHARAT(locinput);
+ nextchr = UCHARAT(locinput);
break;
case NOTHING:
case EVAL:
{
dSP;
- OP_4tree *oop = op;
- COP *ocurcop = curcop;
- SV **ocurpad = curpad;
+ OP_4tree *oop = PL_op;
+ COP *ocurcop = PL_curcop;
+ SV **ocurpad = PL_curpad;
SV *ret;
n = ARG(scan);
- op = (OP_4tree*)data->data[n];
- DEBUG_r( PerlIO_printf(Perl_debug_log, " re_eval 0x%x\n", op) );
- curpad = AvARRAY((AV*)data->data[n + 1]);
- if (!reg_eval_set) {
- /* Preserve whatever is on stack now, otherwise
- OP_NEXTSTATE will overwrite it. */
- SAVEINT(reg_eval_set); /* Protect against unwinding. */
- reg_eval_set = 1;
- DEBUG_r(DEBUG_s(
- PerlIO_printf(Perl_debug_log, " setting stack tmpbase at %i\n", stack_sp - stack_base);
- ));
- SAVEINT(cxstack[cxstack_ix].blk_oldsp);
- cxstack[cxstack_ix].blk_oldsp = stack_sp - stack_base;
- /* Otherwise OP_NEXTSTATE will free whatever on stack now. */
- SAVETMPS;
- /* Apparently this is not needed, judging by wantarray. */
- /* SAVEINT(cxstack[cxstack_ix].blk_gimme);
- cxstack[cxstack_ix].blk_gimme = G_SCALAR; */
- }
+ PL_op = (OP_4tree*)PL_regdata->data[n];
+ DEBUG_r( PerlIO_printf(Perl_debug_log, " re_eval 0x%x\n", PL_op) );
+ PL_curpad = AvARRAY((AV*)PL_regdata->data[n + 1]);
- runops(); /* Scalar context. */
+ CALLRUNOPS(); /* Scalar context. */
SPAGAIN;
ret = POPs;
PUTBACK;
if (logical) {
logical = 0;
sw = SvTRUE(ret);
- }
- op = oop;
- curpad = ocurpad;
- curcop = ocurcop;
+ } else
+ sv_setsv(save_scalar(PL_replgv), ret);
+ PL_op = oop;
+ PL_curpad = ocurpad;
+ PL_curcop = ocurcop;
break;
}
case OPEN:
n = ARG(scan); /* which paren pair */
- reg_start_tmp[n] = locinput;
- if (n > regsize)
- regsize = n;
+ PL_reg_start_tmp[n] = locinput;
+ if (n > PL_regsize)
+ PL_regsize = n;
break;
case CLOSE:
n = ARG(scan); /* which paren pair */
- regstartp[n] = reg_start_tmp[n];
- regendp[n] = locinput;
- if (n > *reglastparen)
- *reglastparen = n;
+ PL_regstartp[n] = PL_reg_start_tmp[n];
+ PL_regendp[n] = locinput;
+ if (n > *PL_reglastparen)
+ *PL_reglastparen = n;
break;
case GROUPP:
n = ARG(scan); /* which paren pair */
- sw = (*reglastparen >= n && regendp[n] != NULL);
+ sw = (*PL_reglastparen >= n && PL_regendp[n] != NULL);
break;
case IFTHEN:
if (sw)
break;
case CURLYX: {
CURCUR cc;
- CHECKPOINT cp = savestack_ix;
+ CHECKPOINT cp = PL_savestack_ix;
if (OP(PREVOPER(next)) == NOTHING) /* LONGJMP */
next += ARG(next);
- cc.oldcc = regcc;
- regcc = &cc;
- cc.parenfloor = *reglastparen;
+ cc.oldcc = PL_regcc;
+ PL_regcc = &cc;
+ cc.parenfloor = *PL_reglastparen;
cc.cur = -1;
cc.min = ARG1(scan);
cc.max = ARG2(scan);
cc.next = next;
cc.minmod = minmod;
cc.lastloc = 0;
- reginput = locinput;
+ PL_reginput = locinput;
n = regmatch(PREVOPER(next)); /* start on the WHILEM */
regcpblow(cp);
- regcc = cc.oldcc;
+ PL_regcc = cc.oldcc;
saySAME(n);
}
/* NOT REACHED */
*/
CHECKPOINT cp, lastcp;
- CURCUR* cc = regcc;
+ CURCUR* cc = PL_regcc;
char *lastloc = cc->lastloc; /* Detection of 0-len. */
n = cc->cur + 1; /* how many we know we matched */
- reginput = locinput;
+ PL_reginput = locinput;
DEBUG_r(
PerlIO_printf(Perl_debug_log,
"%*s %ld out of %ld..%ld cc=%lx\n",
- REPORT_CODE_OFF+regindent*2, "",
+ REPORT_CODE_OFF+PL_regindent*2, "",
(long)n, (long)cc->min,
(long)cc->max, (long)cc)
);
/* If degenerate scan matches "", assume scan done. */
if (locinput == cc->lastloc && n >= cc->min) {
- regcc = cc->oldcc;
- ln = regcc->cur;
+ PL_regcc = cc->oldcc;
+ ln = PL_regcc->cur;
DEBUG_r(
- PerlIO_printf(Perl_debug_log, "%*s empty match detected, try continuation...\n", REPORT_CODE_OFF+regindent*2, "")
+ PerlIO_printf(Perl_debug_log,
+ "%*s empty match detected, try continuation...\n",
+ REPORT_CODE_OFF+PL_regindent*2, "")
);
if (regmatch(cc->next))
sayYES;
DEBUG_r(
- PerlIO_printf(Perl_debug_log, "%*s failed...\n", REPORT_CODE_OFF+regindent*2, "")
+ PerlIO_printf(Perl_debug_log,
+ "%*s failed...\n",
+ REPORT_CODE_OFF+PL_regindent*2, "")
);
- regcc->cur = ln;
- regcc = cc;
+ PL_regcc->cur = ln;
+ PL_regcc = cc;
sayNO;
}
cc->cur = n - 1;
cc->lastloc = lastloc;
DEBUG_r(
- PerlIO_printf(Perl_debug_log, "%*s failed...\n", REPORT_CODE_OFF+regindent*2, "")
+ PerlIO_printf(Perl_debug_log,
+ "%*s failed...\n",
+ REPORT_CODE_OFF+PL_regindent*2, "")
);
sayNO;
}
/* Prefer next over scan for minimal matching. */
if (cc->minmod) {
- regcc = cc->oldcc;
- ln = regcc->cur;
+ PL_regcc = cc->oldcc;
+ ln = PL_regcc->cur;
cp = regcppush(cc->parenfloor);
REGCP_SET;
if (regmatch(cc->next)) {
}
REGCP_UNWIND;
regcppop();
- regcc->cur = ln;
- regcc = cc;
+ PL_regcc->cur = ln;
+ PL_regcc = cc;
if (n >= cc->max) { /* Maximum greed exceeded? */
- if (dowarn && n >= REG_INFTY
- && !(reg_flags & RF_warned)) {
- reg_flags |= RF_warned;
- warn("count exceeded %d", REG_INFTY - 1);
+ if (PL_dowarn && n >= REG_INFTY
+ && !(PL_reg_flags & RF_warned)) {
+ PL_reg_flags |= RF_warned;
+ warn("%s limit (%d) exceeded",
+ "Complex regular subexpression recursion",
+ REG_INFTY - 1);
}
sayNO;
}
DEBUG_r(
- PerlIO_printf(Perl_debug_log, "%*s trying longer...\n", REPORT_CODE_OFF+regindent*2, "")
+ PerlIO_printf(Perl_debug_log,
+ "%*s trying longer...\n",
+ REPORT_CODE_OFF+PL_regindent*2, "")
);
/* Try scanning more and see if it helps. */
- reginput = locinput;
+ PL_reginput = locinput;
cc->cur = n;
cc->lastloc = locinput;
cp = regcppush(cc->parenfloor);
sayYES;
}
DEBUG_r(
- PerlIO_printf(Perl_debug_log, "%*s failed...\n", REPORT_CODE_OFF+regindent*2, "")
+ PerlIO_printf(Perl_debug_log,
+ "%*s failed...\n",
+ REPORT_CODE_OFF+PL_regindent*2, "")
);
REGCP_UNWIND;
regcppop();
}
REGCP_UNWIND;
regcppop(); /* Restore some previous $<digit>s? */
- reginput = locinput;
+ PL_reginput = locinput;
DEBUG_r(
- PerlIO_printf(Perl_debug_log, "%*s failed, try continuation...\n", REPORT_CODE_OFF+regindent*2, "")
+ PerlIO_printf(Perl_debug_log,
+ "%*s failed, try continuation...\n",
+ REPORT_CODE_OFF+PL_regindent*2, "")
);
}
- if (dowarn && n >= REG_INFTY && !(reg_flags & RF_warned)) {
- reg_flags |= RF_warned;
- warn("count exceeded %d", REG_INFTY - 1);
+ if (PL_dowarn && n >= REG_INFTY && !(PL_reg_flags & RF_warned)) {
+ PL_reg_flags |= RF_warned;
+ warn("%s limit (%d) exceeded",
+ "Complex regular subexpression recursion",
+ REG_INFTY - 1);
}
/* Failed deeper matches of scan, so see if this one works. */
- regcc = cc->oldcc;
- ln = regcc->cur;
+ PL_regcc = cc->oldcc;
+ ln = PL_regcc->cur;
if (regmatch(cc->next))
sayYES;
DEBUG_r(
- PerlIO_printf(Perl_debug_log, "%*s failed...\n", REPORT_CODE_OFF+regindent*2, "")
+ PerlIO_printf(Perl_debug_log, "%*s failed...\n",
+ REPORT_CODE_OFF+PL_regindent*2, "")
);
- regcc->cur = ln;
- regcc = cc;
+ PL_regcc->cur = ln;
+ PL_regcc = cc;
cc->cur = n - 1;
cc->lastloc = lastloc;
sayNO;
if (OP(next) != c1) /* No choice. */
next = inner; /* Avoid recursion. */
else {
- int lastparen = *reglastparen;
+ int lastparen = *PL_reglastparen;
REGCP_SET;
do {
- reginput = locinput;
+ PL_reginput = locinput;
if (regmatch(inner))
sayYES;
REGCP_UNWIND;
- for (n = *reglastparen; n > lastparen; n--)
- regendp[n] = 0;
- *reglastparen = n;
+ for (n = *PL_reglastparen; n > lastparen; n--)
+ PL_regendp[n] = 0;
+ *PL_reglastparen = n;
scan = next;
-#ifdef REGALIGN
/*SUPPRESS 560*/
if (n = (c1 == BRANCH ? NEXT_OFF(next) : ARG(next)))
next += n;
else
next = NULL;
-#else
- next = regnext(next);
-#endif
inner = NEXTOPER(scan);
if (c1 == BRANCHJ) {
inner = NEXTOPER(inner);
break;
case CURLYM:
{
- I32 l;
+ I32 l = 0;
CHECKPOINT lastcp;
/* We suppose that the next guy does not need
and has no parenths to influence future backrefs. */
ln = ARG1(scan); /* min to match */
n = ARG2(scan); /* max to match */
-#ifdef REGALIGN_STRUCT
paren = scan->flags;
if (paren) {
- if (paren > regsize)
- regsize = paren;
- if (paren > *reglastparen)
- *reglastparen = paren;
+ if (paren > PL_regsize)
+ PL_regsize = paren;
+ if (paren > *PL_reglastparen)
+ *PL_reglastparen = paren;
}
-#endif
- scan = NEXTOPER(scan) + 4/sizeof(regnode);
+ scan = NEXTOPER(scan) + NODE_STEP_REGNODE;
if (paren)
scan += NEXT_OFF(scan); /* Skip former OPEN. */
- reginput = locinput;
+ PL_reginput = locinput;
if (minmod) {
minmod = 0;
if (ln && regrepeat_hard(scan, ln, &l) < ln)
sayNO;
- if (l == 0 && n >= ln
+ if (ln && l == 0 && n >= ln
/* In fact, this is tricky. If paren, then the
fact that we did/didnot match may influence
future execution. */
&& !(paren && ln == 0))
ln = n;
- locinput = reginput;
+ locinput = PL_reginput;
if (regkind[(U8)OP(next)] == EXACT) {
c1 = UCHARAT(OPERAND(next) + 1);
if (OP(next) == EXACTF)
} else
c1 = c2 = -1000;
REGCP_SET;
+ /* This may be improved if l == 0. */
while (n >= ln || (n == REG_INFTY && ln > 0 && l)) { /* ln overflow ? */
/* If it could work, try it. */
if (c1 == -1000 ||
- UCHARAT(reginput) == c1 ||
- UCHARAT(reginput) == c2)
+ UCHARAT(PL_reginput) == c1 ||
+ UCHARAT(PL_reginput) == c2)
{
if (paren) {
if (n) {
- regstartp[paren] = reginput - l;
- regendp[paren] = reginput;
+ PL_regstartp[paren] = PL_reginput - l;
+ PL_regendp[paren] = PL_reginput;
} else
- regendp[paren] = NULL;
+ PL_regendp[paren] = NULL;
}
if (regmatch(next))
sayYES;
REGCP_UNWIND;
}
/* Couldn't or didn't -- move forward. */
- reginput = locinput;
+ PL_reginput = locinput;
if (regrepeat_hard(scan, 1, &l)) {
ln++;
- locinput = reginput;
+ locinput = PL_reginput;
}
else
sayNO;
future execution. */
&& !(paren && ln == 0))
ln = n;
- locinput = reginput;
+ locinput = PL_reginput;
DEBUG_r(
- PerlIO_printf(Perl_debug_log, "%*s matched %ld times, len=%ld...\n", REPORT_CODE_OFF+regindent*2, "", n, l)
+ PerlIO_printf(Perl_debug_log,
+ "%*s matched %ld times, len=%ld...\n",
+ REPORT_CODE_OFF+PL_regindent*2, "", n, l)
);
if (n >= ln) {
if (regkind[(U8)OP(next)] == EXACT) {
while (n >= ln) {
/* If it could work, try it. */
if (c1 == -1000 ||
- UCHARAT(reginput) == c1 ||
- UCHARAT(reginput) == c2)
+ UCHARAT(PL_reginput) == c1 ||
+ UCHARAT(PL_reginput) == c2)
{
DEBUG_r(
- PerlIO_printf(Perl_debug_log, "%*s trying tail with n=%ld...\n", REPORT_CODE_OFF+regindent*2, "", n)
+ PerlIO_printf(Perl_debug_log,
+ "%*s trying tail with n=%ld...\n",
+ REPORT_CODE_OFF+PL_regindent*2, "", n)
);
if (paren) {
if (n) {
- regstartp[paren] = reginput - l;
- regendp[paren] = reginput;
+ PL_regstartp[paren] = PL_reginput - l;
+ PL_regendp[paren] = PL_reginput;
} else
- regendp[paren] = NULL;
+ PL_regendp[paren] = NULL;
}
if (regmatch(next))
sayYES;
/* Couldn't or didn't -- back up. */
n--;
locinput -= l;
- reginput = locinput;
+ PL_reginput = locinput;
}
}
sayNO;
}
case CURLYN:
paren = scan->flags; /* Which paren to set */
- if (paren > regsize)
- regsize = paren;
- if (paren > *reglastparen)
- *reglastparen = paren;
+ if (paren > PL_regsize)
+ PL_regsize = paren;
+ if (paren > *PL_reglastparen)
+ *PL_reglastparen = paren;
ln = ARG1(scan); /* min to match */
n = ARG2(scan); /* max to match */
- scan = regnext(NEXTOPER(scan) + 4/sizeof(regnode));
+ scan = regnext(NEXTOPER(scan) + NODE_STEP_REGNODE);
goto repeat;
case CURLY:
paren = 0;
ln = ARG1(scan); /* min to match */
n = ARG2(scan); /* max to match */
- scan = NEXTOPER(scan) + 4/sizeof(regnode);
+ scan = NEXTOPER(scan) + NODE_STEP_REGNODE;
goto repeat;
case STAR:
ln = 0;
}
else
c1 = c2 = -1000;
- reginput = locinput;
+ PL_reginput = locinput;
if (minmod) {
CHECKPOINT lastcp;
minmod = 0;
while (n >= ln || (n == REG_INFTY && ln > 0)) { /* ln overflow ? */
/* If it could work, try it. */
if (c1 == -1000 ||
- UCHARAT(reginput) == c1 ||
- UCHARAT(reginput) == c2)
+ UCHARAT(PL_reginput) == c1 ||
+ UCHARAT(PL_reginput) == c2)
{
if (paren) {
if (n) {
- regstartp[paren] = reginput - 1;
- regendp[paren] = reginput;
+ PL_regstartp[paren] = PL_reginput - 1;
+ PL_regendp[paren] = PL_reginput;
} else
- regendp[paren] = NULL;
+ PL_regendp[paren] = NULL;
}
if (regmatch(next))
sayYES;
REGCP_UNWIND;
}
/* Couldn't or didn't -- move forward. */
- reginput = locinput + ln;
+ PL_reginput = locinput + ln;
if (regrepeat(scan, 1)) {
ln++;
- reginput = locinput + ln;
+ PL_reginput = locinput + ln;
} else
sayNO;
}
CHECKPOINT lastcp;
n = regrepeat(scan, n);
if (ln < n && regkind[(U8)OP(next)] == EOL &&
- (!multiline || OP(next) == SEOL))
+ (!PL_multiline || OP(next) == SEOL))
ln = n; /* why back off? */
REGCP_SET;
if (paren) {
while (n >= ln) {
/* If it could work, try it. */
if (c1 == -1000 ||
- UCHARAT(reginput) == c1 ||
- UCHARAT(reginput) == c2)
+ UCHARAT(PL_reginput) == c1 ||
+ UCHARAT(PL_reginput) == c2)
{
if (paren && n) {
if (n) {
- regstartp[paren] = reginput - 1;
- regendp[paren] = reginput;
+ PL_regstartp[paren] = PL_reginput - 1;
+ PL_regendp[paren] = PL_reginput;
} else
- regendp[paren] = NULL;
+ PL_regendp[paren] = NULL;
}
if (regmatch(next))
sayYES;
}
/* Couldn't or didn't -- back up. */
n--;
- reginput = locinput + n;
+ PL_reginput = locinput + n;
}
} else {
while (n >= ln) {
/* If it could work, try it. */
if (c1 == -1000 ||
- UCHARAT(reginput) == c1 ||
- UCHARAT(reginput) == c2)
+ UCHARAT(PL_reginput) == c1 ||
+ UCHARAT(PL_reginput) == c2)
{
if (regmatch(next))
sayYES;
}
/* Couldn't or didn't -- back up. */
n--;
- reginput = locinput + n;
+ PL_reginput = locinput + n;
}
}
}
sayNO;
break;
- case SUCCEED:
case END:
- reginput = locinput; /* put where regtry can find it */
+ if (locinput < PL_regtill)
+ sayNO; /* Cannot match: too short. */
+ /* Fall through */
+ case SUCCEED:
+ PL_reginput = locinput; /* put where regtry can find it */
sayYES; /* Success! */
case SUSPEND:
n = 1;
goto do_ifmatch;
case UNLESSM:
n = 0;
- if (locinput < bostr + scan->flags)
+ if (locinput < PL_bostr + scan->flags)
goto say_yes;
goto do_ifmatch;
case IFMATCH:
n = 1;
- if (locinput < bostr + scan->flags)
+ if (locinput < PL_bostr + scan->flags)
goto say_no;
do_ifmatch:
- reginput = locinput - scan->flags;
+ PL_reginput = locinput - scan->flags;
inner = NEXTOPER(NEXTOPER(scan));
if (regmatch(inner) != n) {
say_no:
sw = 1;
}
if (OP(scan) == SUSPEND) {
- locinput = reginput;
- nextchar = UCHARAT(locinput);
+ locinput = PL_reginput;
+ nextchr = UCHARAT(locinput);
}
/* FALL THROUGH. */
case LONGJMP:
yes:
#ifdef DEBUGGING
- regindent--;
+ PL_regindent--;
#endif
return 1;
no:
#ifdef DEBUGGING
- regindent--;
+ PL_regindent--;
#endif
return 0;
}
* That was true before, but now we assume scan - reginput is the count,
* rather than incrementing count on every character.]
*/
-static I32
+STATIC I32
regrepeat(regnode *p, I32 max)
{
+ dTHR;
register char *scan;
register char *opnd;
register I32 c;
- register char *loceol = regeol;
+ register char *loceol = PL_regeol;
- scan = reginput;
+ scan = PL_reginput;
if (max != REG_INFTY && max < loceol - scan)
loceol = scan + max;
opnd = (char *) OPERAND(p);
scan++;
break;
case EXACTFL: /* length of string is 1 */
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
c = UCHARAT(++opnd);
while (scan < loceol &&
(UCHARAT(scan) == c || UCHARAT(scan) == fold_locale[c]))
scan++;
break;
case ANYOF:
- while (scan < loceol && reginclass(opnd, *scan))
+ while (scan < loceol && REGINCLASS(opnd, *scan))
scan++;
break;
case ALNUM:
scan++;
break;
case ALNUML:
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
while (scan < loceol && isALNUM_LC(*scan))
scan++;
break;
scan++;
break;
case NALNUML:
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
while (scan < loceol && !isALNUM_LC(*scan))
scan++;
break;
scan++;
break;
case SPACEL:
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
while (scan < loceol && isSPACE_LC(*scan))
scan++;
break;
scan++;
break;
case NSPACEL:
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
while (scan < loceol && !isSPACE_LC(*scan))
scan++;
break;
break; /* So match right here or not at all. */
}
- c = scan - reginput;
- reginput = scan;
+ c = scan - PL_reginput;
+ PL_reginput = scan;
DEBUG_r(
{
* The repeater is supposed to have constant length.
*/
-static I32
+STATIC I32
regrepeat_hard(regnode *p, I32 max, I32 *lp)
{
+ dTHR;
register char *scan;
register char *start;
- register char *loceol = regeol;
+ register char *loceol = PL_regeol;
I32 l = -1;
- start = reginput;
- while (reginput < loceol && (scan = reginput, regmatch(p))) {
+ start = PL_reginput;
+ while (PL_reginput < loceol && (scan = PL_reginput, regmatch(p))) {
if (l == -1) {
- *lp = l = reginput - start;
+ *lp = l = PL_reginput - start;
if (max != REG_INFTY && l*max < loceol - scan)
loceol = scan + l*max;
if (l == 0) {
}
}
}
- if (reginput < loceol)
- reginput = scan;
+ if (PL_reginput < loceol)
+ PL_reginput = scan;
else
- scan = reginput;
+ scan = PL_reginput;
return (scan - start)/l;
}
- regclass - determine if a character falls into a character class
*/
-static bool
+STATIC bool
reginclass(register char *p, register I32 c)
{
+ dTHR;
char flags = *p;
bool match = FALSE;
c &= 0xFF;
- if (p[1 + (c >> 3)] & (1 << (c & 7)))
+ if (ANYOF_TEST(p, c))
match = TRUE;
else if (flags & ANYOF_FOLD) {
I32 cf;
if (flags & ANYOF_LOCALE) {
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
cf = fold_locale[c];
}
else
cf = fold[c];
- if (p[1 + (cf >> 3)] & (1 << (cf & 7)))
+ if (ANYOF_TEST(p, cf))
match = TRUE;
}
if (!match && (flags & ANYOF_ISA)) {
- reg_flags |= RF_tainted;
+ PL_reg_flags |= RF_tainted;
if (((flags & ANYOF_ALNUML) && isALNUM_LC(c)) ||
((flags & ANYOF_NALNUML) && !isALNUM_LC(c)) ||
}
}
- return match ^ ((flags & ANYOF_INVERT) != 0);
+ return (flags & ANYOF_INVERT) ? !match : match;
}