Repost of fork() debugger patch

[p5sagit/p5-mst-13.2.git] / regexec.c

diff --git a/regexec.c b/regexec.c
index 57000cf..19fdbfa 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -134,6 +134,30 @@ regcppop()
     return input;
 }
 
+static void
+regcppartblow()
+{
+    I32 i = SSPOPINT;
+    U32 paren = 0;
+    char *input;
+    char *startp;
+    char *endp;
+    int lastparen;
+    int size;
+    assert(i == SAVEt_REGCONTEXT);
+    i = SSPOPINT;
+    input = (char *) SSPOPPTR;
+    lastparen = SSPOPINT;
+    size = SSPOPINT;
+    for (i -= 3; i > 0; i -= 3) {
+       paren = (U32)SSPOPINT;
+       startp = (char *) SSPOPPTR;
+       endp = (char *) SSPOPPTR;
+       if (paren <= *reglastparen && regendp[paren] == endp)
+           regstartp[paren] = startp;
+    }
+}
+
 #define regcpblow(cp) leave_scope(cp)
 
 /*
@@ -529,18 +553,26 @@ got_it:
     prog->exec_tainted = regtainted;
 
     /* make sure $`, $&, $', and $digit will work later */
-    if (!safebase && (strbeg != prog->subbase)) {
-       I32 i = strend - startpos + (stringarg - strbeg);
-       s = savepvn(strbeg, i);
-       Safefree(prog->subbase);
-       prog->subbase = s;
-       prog->subbeg = prog->subbase;
-       prog->subend = prog->subbase + i;
-       s = prog->subbase + (stringarg - strbeg);
-       for (i = 0; i <= prog->nparens; i++) {
-           if (prog->endp[i]) {
-               prog->startp[i] = s + (prog->startp[i] - startpos);
-               prog->endp[i] = s + (prog->endp[i] - startpos);
+    if (strbeg != prog->subbase) {
+       if (safebase) {
+           if (prog->subbase) {
+               Safefree(prog->subbase);
+               prog->subbase = Nullch;
+           }
+       }
+       else {
+           I32 i = strend - startpos + (stringarg - strbeg);
+           s = savepvn(strbeg, i);
+           Safefree(prog->subbase);
+           prog->subbase = s;
+           prog->subbeg = prog->subbase;
+           prog->subend = prog->subbase + i;
+           s = prog->subbase + (stringarg - strbeg);
+           for (i = 0; i <= prog->nparens; i++) {
+               if (prog->endp[i]) {
+                   prog->startp[i] = s + (prog->startp[i] - startpos);
+                   prog->endp[i] = s + (prog->endp[i] - startpos);
+               }
            }
        }
     }
@@ -626,8 +658,11 @@ char *prog;
 #define sayNO goto no
 #define saySAME(x) if (x) goto yes; else goto no
        if (regnarrate) {
-           PerlIO_printf(Perl_debug_log, "%*s%2d%-8.8s\t<%.10s>\n", regindent*2, "",
-               scan - regprogram, regprop(scan), locinput);
+           SV *prop = sv_newmortal();
+           regprop(prop, scan);
+           PerlIO_printf(Perl_debug_log, "%*s%2d%-8.8s\t<%.10s>\n",
+                         regindent*2, "", scan - regprogram,
+                         SvPVX(prop), locinput);
        }
 #else
 #define sayYES return 1
@@ -814,7 +849,11 @@ char *prog;
                sayNO;
            nextchar = UCHARAT(++locinput);
            break;
+       case REFFL:
+           regtainted = TRUE;
+           /* FALL THROUGH */
        case REF:
+       case REFF:
            n = ARG1(scan);  /* which paren pair */
            s = regstartp[n];
            if (!s)
@@ -824,12 +863,19 @@ char *prog;
            if (s == regendp[n])
                break;
            /* Inline the first character, for speed. */
-           if (UCHARAT(s) != nextchar)
+           if (UCHARAT(s) != nextchar &&
+               (OP(scan) == REF ||
+                (UCHARAT(s) != ((OP(scan) == REFF
+                                ? fold : fold_locale)[nextchar]))))
                sayNO;
            ln = regendp[n] - s;
            if (locinput + ln > regeol)
                sayNO;
-           if (ln > 1 && memNE(s, locinput, ln))
+           if (ln > 1 && (OP(scan) == REF
+                          ? memNE(s, locinput, ln)
+                          : (OP(scan) == REFF
+                             ? ibcmp(s, locinput, ln)
+                             : ibcmp_locale(s, locinput, ln))))
                sayNO;
            locinput += ln;
            nextchar = UCHARAT(locinput);
@@ -842,6 +888,7 @@ char *prog;
        case OPEN:
            n = ARG1(scan);  /* which paren pair */
            regstartp[n] = locinput;
+           regendp[n] = 0;
            if (n > regsize)
                regsize = n;
            break;
@@ -922,7 +969,7 @@ char *prog;
                    ln = regcc->cur;
                    cp = regcppush(cc->parenfloor);
                    if (regmatch(cc->next)) {
-                       regcpblow(cp);
+                       regcppartblow(cp);
                        sayYES; /* All done. */
                    }
                    regcppop();
@@ -938,7 +985,7 @@ char *prog;
                    cc->lastloc = locinput;
                    cp = regcppush(cc->parenfloor);
                    if (regmatch(cc->scan)) {
-                       regcpblow(cp);
+                       regcppartblow(cp);
                        sayYES;
                    }
                    regcppop();
@@ -953,7 +1000,7 @@ char *prog;
                    cc->cur = n;
                    cc->lastloc = locinput;
                    if (regmatch(cc->scan)) {
-                       regcpblow(cp);
+                       regcppartblow(cp);
                        sayYES;
                    }
                    regcppop();         /* Restore some previous $<digit>s? */