add missing file from change#1943

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

diff --git a/regexec.c b/regexec.c
index 0627e2b..840d9cc 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -107,6 +107,8 @@ static bool reginclass _((char *p, I32 c));
 static bool reginclassutf8 _((regnode *f, U8* p));
 static CHECKPOINT regcppush _((I32 parenfloor));
 static char * regcppop _((void));
+static char * regcp_set_to _((I32 ss));
+static void cache_re _((regexp *prog));
 #endif
 
 #define REGINCLASS(p,c)  (*(p) ? reginclass(p,c) : ANYOF_TEST(p,c))
@@ -206,11 +208,13 @@ regcppop(void)
 STATIC char *
 regcp_set_to(I32 ss)
 {
+    dTHR;
     I32 tmp = PL_savestack_ix;
 
     PL_savestack_ix = ss;
     regcppop();
     PL_savestack_ix = tmp;
+    return Nullch;
 }
 
 typedef struct re_cc_state
@@ -247,6 +251,7 @@ pregexec(register regexp *prog, char *stringarg, register char *strend,
 STATIC void
 cache_re(regexp *prog)
 {
+    dTHR;
     PL_regprecomp = prog->precomp;             /* Needed for FAIL. */
 #ifdef DEBUGGING
     PL_regprogram = prog->program;
@@ -386,11 +391,14 @@ regexec_flags(register regexp *prog, char *stringarg, register char *strend,
 
     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 ? "..." : ""))
        );
 
@@ -1101,15 +1109,21 @@ regmatch(regnode *prog)
            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|%3d:%*s%s\n",
+                         "%4i <%s%.*s%s%s%.*s%s%s%s%.*s%s>%*s|%3d:%*s%s\n",
                          locinput - PL_bostr, 
-                         PL_colors[2], pref_len, locinput - pref_len, PL_colors[3],
+                         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 ? "" : "> <"),
                          PL_colors[0], l, locinput, PL_colors[1],
                          15 - l - pref_len + 1,
@@ -1662,6 +1676,7 @@ regmatch(regnode *prog)
                    PL_reg_call_cc = state.prev;
                    PL_regcc = state.cc;
                    PL_reg_re = state.re;
+                   cache_re(PL_reg_re);
                    sayNO;
                }
                sw = SvTRUE(ret);
@@ -2236,6 +2251,7 @@ regmatch(regnode *prog)
            sayYES;                     /* Success! */
        case SUSPEND:
            n = 1;
+           PL_reginput = locinput;
            goto do_ifmatch;        
        case UNLESSM:
            n = 0;
@@ -2546,14 +2562,14 @@ regrepeat_hard(regnode *p, I32 max, I32 *lp)
     register char *start;
     register char *loceol = PL_regeol;
     I32 l = 0;
-    I32 count = 0;
+    I32 count = 0, res = 1;
 
     if (!max)
        return 0;
 
     start = PL_reginput;
     if (UTF) {
-       while (PL_reginput < loceol && (scan = PL_reginput, regmatch(p))) {
+       while (PL_reginput < loceol && (scan = PL_reginput, res = regmatch(p))) {
            if (!count++) {
                l = 0;
                while (start < PL_reginput) {
@@ -2569,7 +2585,7 @@ regrepeat_hard(regnode *p, I32 max, I32 *lp)
        }
     }
     else {
-       while (PL_reginput < loceol && (scan = PL_reginput, regmatch(p))) {
+       while (PL_reginput < loceol && (scan = PL_reginput, res = regmatch(p))) {
            if (!count++) {
                *lp = l = PL_reginput - start;
                if (max != REG_INFTY && l*max < loceol - scan)
@@ -2579,7 +2595,7 @@ regrepeat_hard(regnode *p, I32 max, I32 *lp)
            }
        }
     }
-    if (PL_reginput < loceol)
+    if (!res)
        PL_reginput = scan;
     
     return count;