X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/17feb5d536e7c1a1b75d6e8e85a12d67b3d41c04..06bf62c76633176572262d33d1b4072ea6d227a8:/regcomp.c diff --git a/regcomp.c b/regcomp.c index 583e14c..2755d61 100644 --- a/regcomp.c +++ b/regcomp.c @@ -39,6 +39,7 @@ # define Perl_pregfree my_regfree # define Perl_regnext my_regnext # define Perl_save_re_context my_save_re_context +# define Perl_reginitcolors my_reginitcolors #endif /*SUPPRESS 112*/ @@ -65,7 +66,7 @@ * **** Alterations to Henry's code are... **** - **** Copyright (c) 1991-1998, Larry Wall + **** Copyright (c) 1991-1999, Larry Wall **** **** You may distribute under the terms of either the GNU General Public **** License or the Artistic License, as specified in the README file. @@ -145,6 +146,8 @@ static void regtail _((regnode *, regnode *)); static char* regwhite _((char *, char *)); static char* nextchar _((void)); static void re_croak2 _((const char* pat1,const char* pat2,...)) __attribute__((noreturn)); +static char* regpposixcc _((I32 value)); +static void clear_re _((void *r)); #endif /* Length of a variant. */ @@ -169,7 +172,8 @@ typedef struct { } scan_data_t; #endif -static scan_data_t zero_scan_data = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +static scan_data_t zero_scan_data = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0 }; #define SF_BEFORE_EOL (SF_BEFORE_SEOL|SF_BEFORE_MEOL) #define SF_BEFORE_SEOL 0x1 @@ -205,6 +209,12 @@ static scan_data_t zero_scan_data = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; #define CHR_DIST(a,b) (UTF ? utf8_distance(a,b) : a - b) STATIC void +clear_re(void *r) +{ + ReREFCNT_dec((regexp *)r); +} + +STATIC void scan_commit(scan_data_t *data) { dTHR; @@ -259,7 +269,7 @@ study_chunk(regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32 while (scan && OP(scan) != END && scan < last) { /* Peephole optimizer: */ - if (regkind[(U8)OP(scan)] == EXACT) { + if (PL_regkind[(U8)OP(scan)] == EXACT) { regnode *n = regnext(scan); U32 stringok = 1; #ifdef DEBUGGING @@ -269,13 +279,13 @@ study_chunk(regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32 next = scan + (*OPERAND(scan) + 2 - 1)/sizeof(regnode) + 2; /* Skip NOTHING, merge EXACT*. */ while (n && - ( regkind[(U8)OP(n)] == NOTHING || + ( PL_regkind[(U8)OP(n)] == NOTHING || (stringok && (OP(n) == OP(scan)))) && NEXT_OFF(n) && NEXT_OFF(scan) + NEXT_OFF(n) < I16_MAX) { if (OP(n) == TAIL || n > next) stringok = 0; - if (regkind[(U8)OP(n)] == NOTHING) { + if (PL_regkind[(U8)OP(n)] == NOTHING) { NEXT_OFF(scan) += NEXT_OFF(n); next = n + NODE_STEP_REGNODE; #ifdef DEBUGGING @@ -311,7 +321,7 @@ study_chunk(regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32 * don't initialize the OP() slot of a node when that node * is occupied by just the trailing null of the string in * an EXACT node */ - if (regkind[(U8)OP(n)] != NOTHING || OP(n) == NOTHING) { + if (PL_regkind[(U8)OP(n)] != NOTHING || OP(n) == NOTHING) { OP(n) = OPTIMIZED; NEXT_OFF(n) = 0; } @@ -331,7 +341,7 @@ study_chunk(regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32 /* Skip NOTHING and LONGJMP. */ while ((n = regnext(n)) - && ((regkind[(U8)OP(n)] == NOTHING && (noff = NEXT_OFF(n))) + && ((PL_regkind[(U8)OP(n)] == NOTHING && (noff = NEXT_OFF(n))) || ((OP(n) == LONGJMP) && (noff = ARG(n)))) && off + noff < max) off += noff; @@ -420,7 +430,7 @@ study_chunk(regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32 data->flags &= ~SF_BEFORE_EOL; } } - else if (regkind[(U8)OP(scan)] == EXACT) { + else if (PL_regkind[(U8)OP(scan)] == EXACT) { I32 l = *OPERAND(scan); if (flags & SCF_DO_SUBSTR) scan_commit(data); @@ -438,11 +448,11 @@ study_chunk(regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32 if (data && (flags & SCF_DO_SUBSTR)) data->pos_min += l; } - else if (strchr(varies,OP(scan))) { + else if (strchr(PL_varies,OP(scan))) { I32 mincount, maxcount, minnext, deltanext, pos_before, fl; regnode *oscan = scan; - switch (regkind[(U8)OP(scan)]) { + switch (PL_regkind[(U8)OP(scan)]) { case WHILEM: scan = NEXTOPER(scan); goto finish; @@ -513,8 +523,8 @@ study_chunk(regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32 /* Skip open. */ nxt = regnext(nxt); - if (!strchr(simple,OP(nxt)) - && !(regkind[(U8)OP(nxt)] == EXACT + if (!strchr(PL_simple,OP(nxt)) + && !(PL_regkind[(U8)OP(nxt)] == EXACT && *OPERAND(nxt) == 1)) goto nogo; nxt2 = nxt; @@ -606,7 +616,7 @@ study_chunk(regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32 l -= old; /* Get the added string: */ - last_str = newSVpv(s + old, l); + last_str = newSVpvn(s + old, l); if (deltanext == 0 && pos_before == b) { /* What was added is a constant string */ if (mincount > 1) { @@ -646,7 +656,7 @@ study_chunk(regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32 data->flags |= SF_HAS_EVAL; optimize_curly_tail: if (OP(oscan) != CURLYX) { - while (regkind[(U8)OP(next = regnext(oscan))] == NOTHING + while (PL_regkind[(U8)OP(next = regnext(oscan))] == NOTHING && NEXT_OFF(next)) NEXT_OFF(oscan) += NEXT_OFF(next); } @@ -660,19 +670,19 @@ study_chunk(regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32 break; } } - else if (strchr(simple,OP(scan)) || regkind[(U8)OP(scan)] == ANYUTF8) { + else if (strchr(PL_simple,OP(scan)) || PL_regkind[(U8)OP(scan)] == ANYUTF8) { if (flags & SCF_DO_SUBSTR) { scan_commit(data); data->pos_min++; } min++; } - else if (regkind[(U8)OP(scan)] == EOL && flags & SCF_DO_SUBSTR) { + else if (PL_regkind[(U8)OP(scan)] == EOL && flags & SCF_DO_SUBSTR) { data->flags |= (OP(scan) == MEOL ? SF_BEFORE_MEOL : SF_BEFORE_SEOL); } - else if (regkind[(U8)OP(scan)] == BRANCHJ + else if (PL_regkind[(U8)OP(scan)] == BRANCHJ && (scan->flags || data) && (OP(scan) == IFMATCH || OP(scan) == UNLESSM)) { I32 deltanext, minnext; @@ -759,6 +769,31 @@ add_data(I32 n, char *s) return PL_regcomp_rx->data->count - n; } +void +reginitcolors(void) +{ + dTHR; + int i = 0; + char *s = PerlEnv_getenv("PERL_RE_COLORS"); + + if (s) { + PL_colors[0] = s = savepv(s); + while (++i < 6) { + s = strchr(s, '\t'); + if (s) { + *s = '\0'; + PL_colors[i] = ++s; + } + else + PL_colors[i] = s = ""; + } + } else { + while (i < 6) + PL_colors[i++] = ""; + } + PL_colorset = 1; +} + /* - pregcomp - compile a regular expression into internal code * @@ -792,38 +827,16 @@ pregcomp(char *exp, char *xend, PMOP *pm) if (exp == NULL) FAIL("NULL regexp argument"); - if (PL_curcop == &compiling ? (PL_hints & HINT_UTF8) : IN_UTF8) + if (PL_curcop == &PL_compiling ? (PL_hints & HINT_UTF8) : IN_UTF8) PL_reg_flags |= RF_utf8; else PL_reg_flags = 0; PL_regprecomp = savepvn(exp, xend - exp); - DEBUG_r( - if (!PL_colorset) { - int i = 0; - char *s = PerlEnv_getenv("PERL_RE_COLORS"); - - if (s) { - PL_colors[0] = s = savepv(s); - while (++i < 6) { - s = strchr(s, '\t'); - if (s) { - *s = '\0'; - PL_colors[i] = ++s; - } - else - PL_colors[i] = ""; - } - } else { - while (i < 6) - PL_colors[i++] = ""; - } - PL_colorset = 1; - } - ); + DEBUG_r(if (!PL_colorset) reginitcolors()); DEBUG_r(PerlIO_printf(Perl_debug_log, "%sCompiling%s RE `%s%*s%s'\n", - PL_colors[4],PL_colors[5],PL_colors[0], - xend - exp, PL_regprecomp, PL_colors[1])); + PL_colors[4],PL_colors[5],PL_colors[0], + xend - exp, PL_regprecomp, PL_colors[1])); PL_regflags = pm->op_pmflags; PL_regsawback = 0; @@ -839,7 +852,7 @@ pregcomp(char *exp, char *xend, PMOP *pm) PL_regnpar = 1; PL_regsize = 0L; PL_regcode = &PL_regdummy; - regc((U8)MAGIC, (char*)PL_regcode); + regc((U8)REG_MAGIC, (char*)PL_regcode); if (reg(0, &flags) == NULL) { Safefree(PL_regprecomp); PL_regprecomp = Nullch; @@ -863,7 +876,12 @@ pregcomp(char *exp, char *xend, PMOP *pm) r->prelen = xend - exp; r->precomp = PL_regprecomp; r->subbeg = r->subbase = NULL; - r->nparens = PL_regnpar - 1; /* set early to validate backrefs */ + r->nparens = PL_regnpar - 1; /* set early to validate backrefs */ + + r->substrs = 0; /* Useful during FAIL. */ + r->startp = 0; /* Useful during FAIL. */ + r->endp = 0; /* Useful during FAIL. */ + PL_regcomp_rx = r; /* Second pass: emit code. */ @@ -874,7 +892,7 @@ pregcomp(char *exp, char *xend, PMOP *pm) PL_regcode = r->program; /* Store the count of eval-groups for security checks: */ PL_regcode->next_off = ((PL_seen_evals > U16_MAX) ? U16_MAX : PL_seen_evals); - regc((U8)MAGIC, (char*) PL_regcode++); + regc((U8)REG_MAGIC, (char*) PL_regcode++); r->data = 0; if (reg(0, &flags) == NULL) return(NULL); @@ -905,7 +923,7 @@ pregcomp(char *exp, char *xend, PMOP *pm) (OP(first) == BRANCH && OP(regnext(first)) != BRANCH) || (OP(first) == PLUS) || (OP(first) == MINMOD) || - (regkind[(U8)OP(first)] == CURLY && ARG1(first) > 0) ) { + (PL_regkind[(U8)OP(first)] == CURLY && ARG1(first) > 0) ) { if (OP(first) == PLUS) sawplus = 1; else @@ -916,12 +934,12 @@ pregcomp(char *exp, char *xend, PMOP *pm) /* Starting-point info. */ again: if (OP(first) == EXACT); /* Empty, get anchored substr later. */ - else if (strchr(simple+4,OP(first))) + else if (strchr(PL_simple+4,OP(first))) r->regstclass = first; - else if (regkind[(U8)OP(first)] == BOUND || - regkind[(U8)OP(first)] == NBOUND) + else if (PL_regkind[(U8)OP(first)] == BOUND || + PL_regkind[(U8)OP(first)] == NBOUND) r->regstclass = first; - else if (regkind[(U8)OP(first)] == BOL) { + else if (PL_regkind[(U8)OP(first)] == BOL) { r->reganch |= (OP(first) == MBOL ? ROPT_ANCH_MBOL: ROPT_ANCH_BOL); first = NEXTOPER(first); goto again; @@ -932,7 +950,7 @@ pregcomp(char *exp, char *xend, PMOP *pm) goto again; } else if ((OP(first) == STAR && - regkind[(U8)OP(NEXTOPER(first))] == ANY) && + PL_regkind[(U8)OP(NEXTOPER(first))] == REG_ANY) && !(r->reganch & ROPT_ANCH) ) { /* turn .* into ^.* with an implied $*=1 */ @@ -959,9 +977,9 @@ pregcomp(char *exp, char *xend, PMOP *pm) */ minlen = 0; - data.longest_fixed = newSVpv("",0); - data.longest_float = newSVpv("",0); - data.last_found = newSVpv("",0); + data.longest_fixed = newSVpvn("",0); + data.longest_float = newSVpvn("",0); + data.last_found = newSVpvn("",0); data.longest = &(data.longest_fixed); first = scan; @@ -1148,20 +1166,21 @@ reg(I32 paren, I32 *flagp) AV *av; if (PL_regcomp_parse - 1 - s) - sv = newSVpv(s, PL_regcomp_parse - 1 - s); + sv = newSVpvn(s, PL_regcomp_parse - 1 - s); else - sv = newSVpv("", 0); + sv = newSVpvn("", 0); rop = sv_compile_2op(sv, &sop, "re", &av); - n = add_data(3, "nso"); + n = add_data(3, "nop"); PL_regcomp_rx->data->data[n] = (void*)rop; - PL_regcomp_rx->data->data[n+1] = (void*)av; - PL_regcomp_rx->data->data[n+2] = (void*)sop; + PL_regcomp_rx->data->data[n+1] = (void*)sop; + PL_regcomp_rx->data->data[n+2] = (void*)av; SvREFCNT_dec(sv); } - else { /* First pass */ - if (PL_reginterp_cnt < ++PL_seen_evals && PL_curcop != &compiling) + else { /* First pass */ + if (PL_reginterp_cnt < ++PL_seen_evals + && PL_curcop != &PL_compiling) /* No compiled RE interpolated, has runtime components ===> unsafe. */ FAIL("Eval-group not allowed at runtime, use re 'eval'"); @@ -1372,8 +1391,11 @@ reg(I32 paren, I32 *flagp) } /* Check for proper termination. */ - if (paren && (PL_regcomp_parse >= PL_regxend || *nextchar() != ')')) { - FAIL("unmatched () in regexp"); + if (paren) { + PL_regflags = oregflags; + if (PL_regcomp_parse >= PL_regxend || *nextchar() != ')') { + FAIL("unmatched () in regexp"); + } } else if (!paren && PL_regcomp_parse < PL_regxend) { if (*PL_regcomp_parse == ')') { @@ -1383,9 +1405,6 @@ reg(I32 paren, I32 *flagp) FAIL("junk on end of regexp"); /* "Can't happen". */ /* NOTREACHED */ } - if (paren != 0) { - PL_regflags = oregflags; - } return(ret); } @@ -1657,7 +1676,7 @@ tryagain: if (PL_regflags & PMf_SINGLELINE) ret = reg_node(SANY); else - ret = reg_node(ANY); + ret = reg_node(REG_ANY); *flagp |= HASWIDTH|SIMPLE; } PL_regnaughty++; @@ -1759,6 +1778,7 @@ tryagain: break; case 'b': PL_seen_zerolen++; + PL_regseen |= REG_SEEN_LOOKBEHIND; ret = reg_node( UTF ? (LOC ? BOUNDLUTF8 : BOUNDUTF8) @@ -1770,6 +1790,7 @@ tryagain: break; case 'B': PL_seen_zerolen++; + PL_regseen |= REG_SEEN_LOOKBEHIND; ret = reg_node( UTF ? (LOC ? NBOUNDLUTF8 : NBOUNDUTF8) @@ -1873,6 +1894,8 @@ tryagain: FAIL("trailing \\ in regexp"); /* FALL THROUGH */ default: + /* Do not generate `unrecognized' warnings here, we fall + back into the quick-grab loop below */ goto defchar; } break; @@ -2003,6 +2026,11 @@ tryagain: FAIL("trailing \\ in regexp"); /* FALL THROUGH */ default: + if (!SIZE_ONLY && ckWARN(WARN_UNSAFE) && isALPHA(*p)) + warner(WARN_UNSAFE, + "/%.127s/: Unrecognized escape \\%c passed through", + PL_regprecomp, + *p); goto normal_default; } break; @@ -2088,6 +2116,45 @@ regwhite(char *p, char *e) return p; } +/* parse POSIX character classes like [[:foo:]] */ +STATIC char* +regpposixcc(I32 value) +{ + dTHR; + char *posixcc = 0; + + if (value == '[' && PL_regcomp_parse + 1 < PL_regxend && + /* I smell either [: or [= or [. -- POSIX has been here, right? */ + (*PL_regcomp_parse == ':' || + *PL_regcomp_parse == '=' || + *PL_regcomp_parse == '.')) { + char c = *PL_regcomp_parse; + char* s = PL_regcomp_parse++; + + while (PL_regcomp_parse < PL_regxend && *PL_regcomp_parse != c) + PL_regcomp_parse++; + if (PL_regcomp_parse == PL_regxend) + /* Grandfather lone [:, [=, [. */ + PL_regcomp_parse = s; + else { + PL_regcomp_parse++; /* skip over the c */ + if (*PL_regcomp_parse == ']') { + /* Not Implemented Yet. + * (POSIX Extended Character Classes, that is) + * The text between e.g. [: and :] would start + * at s + 1 and stop at regcomp_parse - 2. */ + if (ckWARN(WARN_UNSAFE) && !SIZE_ONLY) + warner(WARN_UNSAFE, + "Character class syntax [%c %c] is reserved for future extensions", c, c); + PL_regcomp_parse++; /* skip over the ending ] */ + posixcc = s + 1; + } + } + } + + return posixcc; +} + STATIC regnode * regclass(void) { @@ -2125,32 +2192,9 @@ regclass(void) while (PL_regcomp_parse < PL_regxend && *PL_regcomp_parse != ']') { skipcond: value = UCHARAT(PL_regcomp_parse++); - if (value == '[' && PL_regcomp_parse + 1 < PL_regxend && - /* I smell either [: or [= or [. -- POSIX has been here, right? */ - (*PL_regcomp_parse == ':' || *PL_regcomp_parse == '=' || *PL_regcomp_parse == '.')) { - char posixccc = *PL_regcomp_parse; - char* posixccs = PL_regcomp_parse++; - - while (PL_regcomp_parse < PL_regxend && *PL_regcomp_parse != posixccc) - PL_regcomp_parse++; - if (PL_regcomp_parse == PL_regxend) - /* Grandfather lone [:, [=, [. */ - PL_regcomp_parse = posixccs; - else { - PL_regcomp_parse++; /* skip over the posixccc */ - if (*PL_regcomp_parse == ']') { - /* Not Implemented Yet. - * (POSIX Extended Character Classes, that is) - * The text between e.g. [: and :] would start - * at posixccs + 1 and stop at regcomp_parse - 2. */ - if (ckWARN(WARN_UNSAFE) && !SIZE_ONLY) - warner(WARN_UNSAFE, - "Character class syntax [%c %c] is reserved for future extensions", posixccc, posixccc); - PL_regcomp_parse++; /* skip over the ending ] */ - } - } - } - if (value == '\\') { + if (value == '[') + (void)regpposixcc(value); /* ignore the return value for now */ + else if (value == '\\') { value = UCHARAT(PL_regcomp_parse++); switch (value) { case 'w': @@ -2270,7 +2314,9 @@ regclass(void) if (!SIZE_ONLY) { #ifndef ASCIIish if ((isLOWER(lastvalue) && isLOWER(value)) || - (isUPPER(lastvalue) && isUPPER(value))) { + (isUPPER(lastvalue) && isUPPER(value))) + { + I32 i; if (isLOWER(lastvalue)) { for (i = lastvalue; i <= value; i++) if (isLOWER(i)) @@ -2292,7 +2338,7 @@ regclass(void) if (!SIZE_ONLY && (*opnd & (0xFF ^ ANYOF_INVERT)) == ANYOF_FOLD) { for (value = 0; value < 256; ++value) { if (ANYOF_TEST(opnd, value)) { - I32 cf = fold[value]; + I32 cf = PL_fold[value]; ANYOF_SET(opnd, cf); } } @@ -2332,7 +2378,7 @@ regclassutf8(void) flags |= ANYOF_FOLD; if (LOC) flags |= ANYOF_LOCALE; - listsv = newSVpv("# comment\n",0); + listsv = newSVpvn("# comment\n",10); } if (*PL_regcomp_parse == ']' || *PL_regcomp_parse == '-') @@ -2343,33 +2389,9 @@ regclassutf8(void) value = utf8_to_uv((U8*)PL_regcomp_parse, &numlen); PL_regcomp_parse += numlen; - if (value == '[' && PL_regcomp_parse + 1 < PL_regxend && - /* I smell either [: or [= or [. -- POSIX has been here, right? */ - (*PL_regcomp_parse == ':' || *PL_regcomp_parse == '=' || *PL_regcomp_parse == '.')) { - char posixccc = *PL_regcomp_parse; - char* posixccs = PL_regcomp_parse++; - - while (PL_regcomp_parse < PL_regxend && *PL_regcomp_parse != posixccc) - PL_regcomp_parse++; - if (PL_regcomp_parse == PL_regxend) - /* Grandfather lone [:, [=, [. */ - PL_regcomp_parse = posixccs; - else { - PL_regcomp_parse++; /* skip over the posixccc */ - if (*PL_regcomp_parse == ']') { - /* Not Implemented Yet. - * (POSIX Extended Character Classes, that is) - * The text between e.g. [: and :] would start - * at posixccs + 1 and stop at regcomp_parse - 2. */ - if (ckWARN(WARN_UNSAFE) && !SIZE_ONLY) - warner(WARN_UNSAFE, - "Character class syntax [%c %c] is reserved for future extensions", posixccc, posixccc); - PL_regcomp_parse++; /* skip over the ending ] */ - } - } - } - - if (value == '\\') { + if (value == '[') + (void)regpposixcc(value); /* ignore the return value for now */ + else if (value == '\\') { value = utf8_to_uv((U8*)PL_regcomp_parse, &numlen); PL_regcomp_parse += numlen; switch (value) { @@ -2476,7 +2498,7 @@ regclassutf8(void) e = strchr(PL_regcomp_parse++, '}'); if (!e) FAIL("Missing right brace on \\x{}"); - value = scan_hex(PL_regcomp_parse + 1, e - PL_regcomp_parse, &numlen); + value = scan_hex(PL_regcomp_parse, e - PL_regcomp_parse, &numlen); PL_regcomp_parse = e + 1; } else { @@ -2651,7 +2673,7 @@ reginsert(U8 op, regnode *opnd) register regnode *place; register int offset = regarglen[(U8)op]; -/* (regkind[(U8)op] == CURLY ? EXTRA_STEP_2ARGS : 0); */ +/* (PL_regkind[(U8)op] == CURLY ? EXTRA_STEP_2ARGS : 0); */ if (SIZE_ONLY) { PL_regsize += NODE_STEP_REGNODE + offset; @@ -2711,10 +2733,10 @@ regoptail(regnode *p, regnode *val) /* "Operandless" and "op != BRANCH" are synonymous in practice. */ if (p == NULL || SIZE_ONLY) return; - if (regkind[(U8)OP(p)] == BRANCH) { + if (PL_regkind[(U8)OP(p)] == BRANCH) { regtail(NEXTOPER(p), val); } - else if ( regkind[(U8)OP(p)] == BRANCHJ) { + else if ( PL_regkind[(U8)OP(p)] == BRANCHJ) { regtail(NEXTOPER(NEXTOPER(p)), val); } else @@ -2770,7 +2792,7 @@ dumpuntil(regnode *start, regnode *node, regnode *last, SV* sv, I32 l) PerlIO_printf(Perl_debug_log, "(%d)", next - start); (void)PerlIO_putc(Perl_debug_log, '\n'); after_print: - if (regkind[(U8)op] == BRANCHJ) { + if (PL_regkind[(U8)op] == BRANCHJ) { register regnode *nnode = (OP(next) == LONGJMP ? regnext(next) : next); @@ -2778,14 +2800,14 @@ dumpuntil(regnode *start, regnode *node, regnode *last, SV* sv, I32 l) nnode = last; node = dumpuntil(start, NEXTOPER(NEXTOPER(node)), nnode, sv, l + 1); } - else if (regkind[(U8)op] == BRANCH) { + else if (PL_regkind[(U8)op] == BRANCH) { node = dumpuntil(start, NEXTOPER(node), next, sv, l + 1); } else if ( op == CURLY) { /* `next' might be very big: optimizer */ node = dumpuntil(start, NEXTOPER(node) + EXTRA_STEP_2ARGS, NEXTOPER(node) + EXTRA_STEP_2ARGS + 1, sv, l + 1); } - else if (regkind[(U8)op] == CURLY && op != CURLYX) { + else if (PL_regkind[(U8)op] == CURLY && op != CURLYX) { node = dumpuntil(start, NEXTOPER(node) + EXTRA_STEP_2ARGS, next, sv, l + 1); } @@ -2796,7 +2818,7 @@ dumpuntil(regnode *start, regnode *node, regnode *last, SV* sv, I32 l) node = NEXTOPER(node); node += ANY_SKIP; } - else if (regkind[(U8)op] == EXACT) { + else if (PL_regkind[(U8)op] == EXACT) { /* Literal string, where present. */ node += ((*OPERAND(node)) + 2 + sizeof(regnode) - 1) / sizeof(regnode); node = NEXTOPER(node); @@ -2912,7 +2934,7 @@ regprop(SV *sv, regnode *o) case SEOL: p = "SEOL"; break; - case ANY: + case REG_ANY: p = "ANY"; break; case SANY: @@ -3102,13 +3124,30 @@ pregfree(struct regexp *r) } if (r->data) { int n = r->data->count; + AV* new_comppad = NULL; + AV* old_comppad; + SV** old_curpad; + while (--n >= 0) { switch (r->data->what[n]) { case 's': SvREFCNT_dec((SV*)r->data->data[n]); break; + case 'p': + new_comppad = (AV*)r->data->data[n]; + break; case 'o': + if (new_comppad == NULL) + croak("panic: pregfree comppad"); + old_comppad = PL_comppad; + old_curpad = PL_curpad; + PL_comppad = new_comppad; + PL_curpad = AvARRAY(new_comppad); op_free((OP_4tree*)r->data->data[n]); + PL_comppad = old_comppad; + PL_curpad = old_curpad; + SvREFCNT_dec((SV*)new_comppad); + new_comppad = NULL; break; case 'n': break; @@ -3153,6 +3192,7 @@ re_croak2(const char* pat1,const char* pat2,...) STRLEN l1 = strlen(pat1); STRLEN l2 = strlen(pat2); char buf[512]; + SV *msv; char *message; if (l1 > 510) @@ -3164,9 +3204,9 @@ re_croak2(const char* pat1,const char* pat2,...) buf[l1 + l2] = '\n'; buf[l1 + l2 + 1] = '\0'; va_start(args, pat2); - message = mess(buf, &args); + msv = mess(buf, &args); va_end(args); - l1 = strlen(message); + message = SvPV(msv,l1); if (l1 > 512) l1 = 512; Copy(message, buf, l1 , char); @@ -3213,4 +3253,15 @@ save_re_context(void) SAVESPTR(PL_regcode); /* Code-emit pointer; ®dummy = don't */ SAVEPPTR(PL_regxend); /* End of input for compile */ SAVEPPTR(PL_regcomp_parse); /* Input-scan pointer. */ + SAVESPTR(PL_reg_call_cc); /* from regexec.c */ + SAVESPTR(PL_reg_re); /* from regexec.c */ + SAVEPPTR(PL_reg_ganch); /* from regexec.c */ + SAVESPTR(PL_reg_sv); /* from regexec.c */ + SAVESPTR(PL_reg_magic); /* from regexec.c */ + SAVEI32(PL_reg_oldpos); /* from regexec.c */ + SAVESPTR(PL_reg_oldcurpm); /* from regexec.c */ + SAVESPTR(PL_reg_curpm); /* from regexec.c */ +#ifdef DEBUGGING + SAVEPPTR(PL_reg_starttry); /* from regexec.c */ +#endif }