win32 tweaks

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

diff --git a/regexec.c b/regexec.c
index f8c790b..47ece6a 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -820,7 +820,7 @@ regmatch(regnode *prog)
                : (PL_multiline && 
                   (nextchr || locinput < PL_regeol) && locinput[-1] == '\n') )
            {
-               /* regtill = regbol; */
+               /* PL_regtill = PL_regbol; */
                break;
            }
            sayNO;
@@ -1027,14 +1027,14 @@ regmatch(regnode *prog)
        case EVAL:
        {
            dSP;
-           OP_4tree *oop = op;
+           OP_4tree *oop = PL_op;
            COP *ocurcop = PL_curcop;
            SV **ocurpad = PL_curpad;
            SV *ret;
            
            n = ARG(scan);
-           op = (OP_4tree*)PL_regdata->data[n];
-           DEBUG_r( PerlIO_printf(Perl_debug_log, "  re_eval 0x%x\n", op) );
+           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]);
 
            CALLRUNOPS();                       /* Scalar context. */
@@ -1047,7 +1047,7 @@ regmatch(regnode *prog)
                sw = SvTRUE(ret);
            } else
                sv_setsv(save_scalar(PL_replgv), ret);
-           op = oop;
+           PL_op = oop;
            PL_curpad = ocurpad;
            PL_curcop = ocurcop;
            break;
@@ -1188,8 +1188,9 @@ regmatch(regnode *prog)
                        if (PL_dowarn && n >= REG_INFTY 
                            && !(PL_reg_flags & RF_warned)) {
                            PL_reg_flags |= RF_warned;
-                           warn("Complex regular subexpression recursion "
-                                "limit (%d) exceeded", REG_INFTY - 1);
+                           warn("%s limit (%d) exceeded",
+                                "Complex regular subexpression recursion",
+                                REG_INFTY - 1);
                        }
                        sayNO;
                    }