This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Anohter ptags improvement
[perl5.git] / regexec.c
index 4621990..77b9f2d 100644 (file)
--- a/regexec.c
+++ b/regexec.c
  * blame Henry for some of the lack of readability.
  */
 
+/* The names of the functions have been changed from regcomp and
+ * regexec to  pregcomp and pregexec in order to avoid conflicts
+ * with the POSIX routines of the same names.
+*/
+
 /*SUPPRESS 112*/
 /*
- * regcomp and regexec -- regsub and regerror are not used in perl
+ * pregcomp and pregexec -- regsub and regerror are not used in perl
  *
  *     Copyright (c) 1986 by University of Toronto.
  *     Written by Henry Spencer.  Not derived from licensed software.
@@ -37,7 +42,7 @@
  *
  ****    Alterations to Henry's code are...
  ****
- ****    Copyright (c) 1991-1994, Larry Wall
+ ****    Copyright (c) 1991-1997, 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.
 #include "perl.h"
 #include "regcomp.h"
 
+#define RF_tainted     1               /* tainted information used? */
+#define RF_warned      2               /* warned about big count? */
+#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 char* regprogram = 0;
-#endif
+#ifndef PERL_OBJECT
+typedef I32 CHECKPOINT;
 
-/* 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 */
-    char *     scan;           /* the thing to match */
-    char *     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;
+/*
+ * Forwards.
+ */
 
-typedef I32 CHECKPOINT;
+static I32 regmatch _((regnode *prog));
+static I32 regrepeat _((regnode *p, I32 max));
+static I32 regrepeat_hard _((regnode *p, I32 max, I32 *lp));
+static I32 regtry _((regexp *prog, char *startpos));
 
-CHECKPOINT regcppush _((I32 parenfloor));
-char * regcppop _((void));
+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))
 
-CHECKPOINT
-regcppush(parenfloor)
-I32 parenfloor;
+STATIC CHECKPOINT
+regcppush(I32 parenfloor)
 {
+    dTHR;
     int retval = savestack_ix;
-    int i = (regsize - parenfloor) * 3;
+    int i = (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]);
        SSPUSHINT(p);
     }
     SSPUSHINT(regsize);
@@ -102,9 +107,14 @@ I32 parenfloor;
     return retval;
 }
 
-char*
-regcppop()
+/* 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)
+
+STATIC char *
+regcppop(void)
 {
+    dTHR;
     I32 i = SSPOPINT;
     U32 paren = 0;
     char *input;
@@ -114,13 +124,27 @@ regcppop()
     input = (char *) SSPOPPTR;
     *reglastparen = SSPOPINT;
     regsize = SSPOPINT;
-    for (i -= 3; i > 0; i -= 3) {
+    for (i -= 3; i > 0; i -= 4) {
        paren = (U32)SSPOPINT;
+       reg_start_tmp[paren] = (char *) SSPOPPTR;
        regstartp[paren] = (char *) SSPOPPTR;
        tmps = (char*)SSPOPPTR;
        if (paren <= *reglastparen)
            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)" : ""));
+       );
     }
+    DEBUG_r(
+       if (*reglastparen + 1 <= regnpar) {
+           PerlIO_printf(Perl_debug_log, "     restoring \\%d..\\%d to undef\n",
+                         *reglastparen + 1, regnpar);
+       }
+    );
     for (paren = *reglastparen + 1; paren <= regnpar; paren++) {
        if (paren > regsize)
            regstartp[paren] = Nullch;
@@ -129,45 +153,57 @@ regcppop()
     return input;
 }
 
-#define regcpblow(cp) leave_scope(cp)
+#define regcpblow(cp) LEAVE_SCOPE(cp)
 
 /*
- * regexec and friends
+ * pregexec and friends
  */
 
 /*
- * Forwards.
+ - pregexec - match a regexp against a string
  */
-
-static I32 regmatch _((char *prog));
-static I32 regrepeat _((char *p, I32 max));
-static I32 regtry _((regexp *prog, char *startpos));
-
+I32
+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. */
+/* nosave: For optimizations. */
+{
+    return
+       regexec_flags(prog, stringarg, strend, strbeg, minend, screamer, NULL, 
+                     nosave ? 0 : REXEC_COPY_STR);
+}
+  
 /*
- - regexec - match a regexp against a string
+ - regexec_flags - match a regexp against a string
  */
 I32
-regexec(prog, stringarg, strend, strbeg, minend, screamer, safebase)
-register regexp *prog;
-char *stringarg;
-register char *strend; /* pointer to null at end of string */
-char *strbeg;  /* real beginning of string */
-I32 minend;    /* end of match must be at least minend after stringarg */
-SV *screamer;
-I32 safebase;  /* no need to remember string in subbase */
+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. */
 {
     register char *s;
-    register I32 i;
-    register char *c;
+    register regnode *c;
     register char *startpos = stringarg;
     register I32 tmp;
-    I32 minlen = 0;            /* must match at least this many chars */
+    I32 minlen;                /* must match at least this many chars */
     I32 dontbother = 0;        /* how many characters not to try at end */
     CURCUR cc;
+    I32 start_shift = 0;               /* Offset of the start to find
+                                        constant substr. */
+    I32 end_shift = 0;                 /* Same for the end. */
+    I32 scream_pos = -1;               /* Internal iterator of scream. */
+    char *scream_olds;
+    SV* oreplsv = GvSV(replgv);
 
     cc.cur = 0;
+    cc.oldcc = 0;
     regcc = &cc;
 
+    regprecomp = prog->precomp;                /* Needed for error messages. */
 #ifdef DEBUGGING
     regnarrate = debug & 512;
     regprogram = prog->program;
@@ -179,6 +215,9 @@ I32 safebase;       /* no need to remember string in subbase */
        return 0;
     }
 
+    minlen = prog->minlen;
+    if (strend - startpos < minlen) goto phooey;
+
     if (startpos == strbeg)    /* is ^ valid at stringarg? */
        regprev = '\n';
     else {
@@ -186,62 +225,59 @@ I32 safebase;     /* no need to remember string in subbase */
        if (!multiline && regprev == '\n')
            regprev = '\0';             /* force ^ to NOT match */
     }
-    regprecomp = prog->precomp;
-    regnpar = prog->nparens;
+
     /* Check validity of program. */
     if (UCHARAT(prog->program) != MAGIC) {
        FAIL("corrupted regexp program");
     }
 
-    if (prog->do_folding) {
-       i = strend - startpos;
-       New(1101,c,i+1,char);
-       Copy(startpos, c, i+1, char);
-       startpos = c;
-       strend = startpos + i;
-       for (s = startpos; s < strend; s++)
-           if (isUPPER(*s))
-               *s = toLOWER(*s);
-    }
+    regnpar = prog->nparens;
+    reg_flags = 0;
+    reg_eval_set = 0;
 
     /* If there is a "must appear" string, look for it. */
     s = startpos;
-    if (prog->regmust != Nullsv &&
-       (!(prog->reganch & ROPT_ANCH)
-        || (multiline && prog->regback >= 0)) )
+    if (!(flags & REXEC_CHECKED) 
+       && prog->check_substr != Nullsv &&
+       !(prog->reganch & ROPT_ANCH_GPOS) &&
+       (!(prog->reganch & (ROPT_ANCH_BOL | ROPT_ANCH_MBOL))
+        || (multiline && prog->check_substr == prog->anchored_substr)) )
     {
-       if (stringarg == strbeg && screamer) {
-           if (screamfirst[BmRARE(prog->regmust)] >= 0)
-                   s = screaminstr(screamer,prog->regmust);
+       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)
+                   s = screaminstr(screamer, prog->check_substr, 
+                                   start_shift + (stringarg - strbeg),
+                                   end_shift, &scream_pos, 0);
            else
                    s = Nullch;
+           scream_olds = s;
        }
        else
-           s = fbm_instr((unsigned char*)s, (unsigned char*)strend,
-               prog->regmust);
+           s = fbm_instr((unsigned char*)s + start_shift,
+                         (unsigned char*)strend - end_shift,
+               prog->check_substr, 0);
        if (!s) {
-           ++BmUSEFUL(prog->regmust);  /* hooray */
+           ++BmUSEFUL(prog->check_substr);     /* hooray */
            goto phooey;        /* not present */
-       }
-       else if (prog->regback >= 0) {
-           s -= prog->regback;
-           if (s < startpos)
-               s = startpos;
-           minlen = prog->regback + SvCUR(prog->regmust);
-       }
-       else if (!prog->naughty && --BmUSEFUL(prog->regmust) < 0) { /* boo */
-           SvREFCNT_dec(prog->regmust);
-           prog->regmust = Nullsv;     /* disable regmust */
-           s = startpos;
-       }
-       else {
+       } else if ((s - stringarg) > prog->check_offset_max) {
+           ++BmUSEFUL(prog->check_substr);     /* hooray/2 */
+           s -= prog->check_offset_max;
+       } else if (!prog->naughty 
+                  && --BmUSEFUL(prog->check_substr) < 0
+                  && prog->check_substr == prog->float_substr) { /* boo */
+           SvREFCNT_dec(prog->check_substr);
+           prog->check_substr = Nullsv;        /* disable */
+           prog->float_substr = Nullsv;        /* clear */
            s = startpos;
-           minlen = SvCUR(prog->regmust);
-       }
+       } else s = startpos;
     }
 
-    /* Mark beginning of line for ^ . */
+    /* Mark beginning of line for ^ and lookbehind. */
     regbol = startpos;
+    bostr  = strbeg;
 
     /* Mark end of line for $ (and such) */
     regeol = strend;
@@ -249,12 +285,25 @@ I32 safebase;     /* no need to remember string in subbase */
     /* see how far we have to get to not match where we matched before */
     regtill = startpos+minend;
 
+    DEBUG_r(
+       PerlIO_printf(Perl_debug_log, 
+                     "Matching `%.60s%s' against `%.*s%s'\n",
+                     prog->precomp, 
+                     (strlen(prog->precomp) > 60 ? "..." : ""),
+                     (strend - startpos > 60 ? 60 : strend - startpos),
+                     startpos, 
+                     (strend - startpos > 60 ? "..." : ""))
+       );
+
     /* Simplest case:  anchored match need be tried only once. */
-    /*  [unless multiline is set] */
+    /*  [unless only anchor is BOL and multiline is set] */
     if (prog->reganch & ROPT_ANCH) {
        if (regtry(prog, startpos))
            goto got_it;
-       else if (multiline || (prog->reganch & ROPT_IMPLICIT)) {
+       else if (!(prog->reganch & ROPT_ANCH_GPOS) &&
+                (multiline || (prog->reganch & ROPT_IMPLICIT)
+                 || (prog->reganch & ROPT_ANCH_MBOL)))
+       {
            if (minlen)
                dontbother = minlen - 1;
            strend -= dontbother;
@@ -272,45 +321,64 @@ I32 safebase;     /* no need to remember string in subbase */
     }
 
     /* Messy cases:  unanchored match. */
-    if (prog->regstart) {
-       if (prog->reganch & ROPT_SKIP) {  /* we have /x+whatever/ */
-           /* it must be a one character string */
-           i = SvPVX(prog->regstart)[0];
-           while (s < strend) {
-               if (*s == i) {
-                   if (regtry(prog, s))
-                       goto got_it;
-                   s++;
-                   while (s < strend && *s == i)
-                       s++;
-               }
+    if (prog->anchored_substr && prog->reganch & ROPT_SKIP) { 
+       /* we have /x+whatever/ */
+       /* it must be a one character string */
+       char ch = SvPVX(prog->anchored_substr)[0];
+       while (s < strend) {
+           if (*s == ch) {
+               if (regtry(prog, s)) goto got_it;
                s++;
+               while (s < strend && *s == ch)
+                   s++;
            }
+           s++;
        }
-       else if (SvPOK(prog->regstart) == 3) {
-           /* We know what string it must start with. */
-           while ((s = fbm_instr((unsigned char*)s,
-             (unsigned char*)strend, prog->regstart)) != NULL)
-           {
-               if (regtry(prog, s))
-                   goto got_it;
-               s++;
+    }
+    /*SUPPRESS 560*/
+    else if (prog->anchored_substr != Nullsv
+            || (prog->float_substr != Nullsv 
+                && prog->float_max_offset < strend - s)) {
+       SV *must = prog->anchored_substr 
+           ? prog->anchored_substr : prog->float_substr;
+       I32 back_max = 
+           prog->anchored_substr ? prog->anchored_offset : prog->float_max_offset;
+       I32 back_min = 
+           prog->anchored_substr ? prog->anchored_offset : prog->float_min_offset;
+       I32 delta = back_max - back_min;
+       char *last = strend - SvCUR(must) - back_min; /* Cannot start after this */
+       char *last1 = s - 1;            /* Last position checked before */
+
+       /* XXXX check_substr already used to find `s', can optimize if
+          check_substr==must. */
+       scream_pos = -1;
+       dontbother = end_shift;
+       strend -= dontbother;
+       while ( (s <= last) &&
+               (screamer 
+                ? (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, 0))) ) {
+           if (s - back_max > last1) {
+               last1 = s - back_min;
+               s = s - back_max;
+           } else {
+               char *t = last1 + 1;            
+
+               last1 = s - back_min;
+               s = t;          
            }
-       }
-       else {
-           c = SvPVX(prog->regstart);
-           while ((s = ninstr(s, strend, c, c + SvCUR(prog->regstart))) != NULL)
-           {
+           while (s <= last1) {
                if (regtry(prog, s))
                    goto got_it;
                s++;
            }
        }
        goto phooey;
-    }
-    /*SUPPRESS 560*/
-    if (c = prog->regstclass) {
+    } else if (c = prog->regstclass) {
        I32 doevery = (prog->reganch & ROPT_SKIP) == 0;
+       char *Class;
 
        if (minlen)
            dontbother = minlen - 1;
@@ -319,10 +387,9 @@ I32 safebase;      /* no need to remember string in subbase */
        /* We know what class it must start with. */
        switch (OP(c)) {
        case ANYOF:
-           c = OPERAND(c);
+           Class = (char *) OPERAND(c);
            while (s < strend) {
-               i = UCHARAT(s);
-               if (!(c[i >> 3] & (1 << (i&7)))) {
+               if (REGINCLASS(Class, *s)) {
                    if (tmp && regtry(prog, s))
                        goto got_it;
                    else
@@ -333,18 +400,16 @@ I32 safebase;     /* no need to remember string in subbase */
                s++;
            }
            break;
+       case BOUNDL:
+           reg_flags |= RF_tainted;
+           /* FALL THROUGH */
        case BOUND:
            if (minlen)
                dontbother++,strend--;
-           if (s != startpos) {
-               i = s[-1];
-               tmp = isALNUM(i);
-           }
-           else
-               tmp = isALNUM(regprev); /* assume not alphanumeric */
+           tmp = (s != startpos) ? UCHARAT(s - 1) : regprev;
+           tmp = ((OP(c) == BOUND ? isALNUM(tmp) : isALNUM_LC(tmp)) != 0);
            while (s < strend) {
-               i = *s;
-               if (tmp != isALNUM(i)) {
+               if (tmp == !(OP(c) == BOUND ? isALNUM(*s) : isALNUM_LC(*s))) {
                    tmp = !tmp;
                    if (regtry(prog, s))
                        goto got_it;
@@ -354,18 +419,16 @@ I32 safebase;     /* no need to remember string in subbase */
            if ((minlen || tmp) && regtry(prog,s))
                goto got_it;
            break;
+       case NBOUNDL:
+           reg_flags |= RF_tainted;
+           /* FALL THROUGH */
        case NBOUND:
            if (minlen)
                dontbother++,strend--;
-           if (s != startpos) {
-               i = s[-1];
-               tmp = isALNUM(i);
-           }
-           else
-               tmp = isALNUM(regprev); /* assume not alphanumeric */
+           tmp = (s != startpos) ? UCHARAT(s - 1) : regprev;
+           tmp = ((OP(c) == NBOUND ? isALNUM(tmp) : isALNUM_LC(tmp)) != 0);
            while (s < strend) {
-               i = *s;
-               if (tmp != isALNUM(i))
+               if (tmp == !(OP(c) == NBOUND ? isALNUM(*s) : isALNUM_LC(*s)))
                    tmp = !tmp;
                else if (regtry(prog, s))
                    goto got_it;
@@ -376,8 +439,21 @@ I32 safebase;      /* no need to remember string in subbase */
            break;
        case ALNUM:
            while (s < strend) {
-               i = *s;
-               if (isALNUM(i)) {
+               if (isALNUM(*s)) {
+                   if (tmp && regtry(prog, s))
+                       goto got_it;
+                   else
+                       tmp = doevery;
+               }
+               else
+                   tmp = 1;
+               s++;
+           }
+           break;
+       case ALNUML:
+           reg_flags |= RF_tainted;
+           while (s < strend) {
+               if (isALNUM_LC(*s)) {
                    if (tmp && regtry(prog, s))
                        goto got_it;
                    else
@@ -390,8 +466,21 @@ I32 safebase;      /* no need to remember string in subbase */
            break;
        case NALNUM:
            while (s < strend) {
-               i = *s;
-               if (!isALNUM(i)) {
+               if (!isALNUM(*s)) {
+                   if (tmp && regtry(prog, s))
+                       goto got_it;
+                   else
+                       tmp = doevery;
+               }
+               else
+                   tmp = 1;
+               s++;
+           }
+           break;
+       case NALNUML:
+           reg_flags |= RF_tainted;
+           while (s < strend) {
+               if (!isALNUM_LC(*s)) {
                    if (tmp && regtry(prog, s))
                        goto got_it;
                    else
@@ -415,6 +504,20 @@ I32 safebase;      /* no need to remember string in subbase */
                s++;
            }
            break;
+       case SPACEL:
+           reg_flags |= RF_tainted;
+           while (s < strend) {
+               if (isSPACE_LC(*s)) {
+                   if (tmp && regtry(prog, s))
+                       goto got_it;
+                   else
+                       tmp = doevery;
+               }
+               else
+                   tmp = 1;
+               s++;
+           }
+           break;
        case NSPACE:
            while (s < strend) {
                if (!isSPACE(*s)) {
@@ -428,6 +531,20 @@ I32 safebase;      /* no need to remember string in subbase */
                s++;
            }
            break;
+       case NSPACEL:
+           reg_flags |= RF_tainted;
+           while (s < strend) {
+               if (!isSPACE_LC(*s)) {
+                   if (tmp && regtry(prog, s))
+                       goto got_it;
+                   else
+                       tmp = doevery;
+               }
+               else
+                   tmp = 1;
+               s++;
+           }
+           break;
        case DIGIT:
            while (s < strend) {
                if (isDIGIT(*s)) {
@@ -457,7 +574,26 @@ I32 safebase;      /* no need to remember string in subbase */
        }
     }
     else {
-       if (minlen)
+       dontbother = 0;
+       if (prog->float_substr != Nullsv) {     /* Trim the end. */
+           char *last;
+           I32 oldpos = scream_pos;
+
+           if (screamer) {
+               last = screaminstr(screamer, prog->float_substr, s - strbeg,
+                                  end_shift, &scream_pos, 1); /* last one */
+               if (!last) {
+                   last = scream_olds; /* Only one occurence. */
+               }
+           } else {
+               STRLEN len;
+               char *little = SvPV(prog->float_substr, len);
+               last = rninstr(s, strend, little, little + len);
+           }
+           if (last == NULL) goto phooey; /* Should not happen! */
+           dontbother = strend - last - 1;
+       }
+       if (minlen && (dontbother < minlen))
            dontbother = minlen - 1;
        strend -= dontbother;
        /* We don't know much -- general case. */
@@ -474,75 +610,100 @@ got_it:
     strend += dontbother;      /* uncheat */
     prog->subbeg = strbeg;
     prog->subend = strend;
-    if ((!safebase && (prog->nparens || sawampersand)) || prog->do_folding) {
-       i = strend - startpos + (stringarg - strbeg);
-       if (safebase) {                 /* no need for $digit later */
-           s = strbeg;
-           prog->subend = s+i;
-       }
-       else if (strbeg != prog->subbase) {
-           s = savepvn(strbeg,i);      /* so $digit will work later */
-           if (prog->subbase)
+    RX_MATCH_TAINTED_set(prog, reg_flags & RF_tainted);
+
+    /* make sure $`, $&, $', and $digit will work later */
+    if (strbeg != prog->subbase) {     /* second+ //g match.  */
+       if (!(flags & REXEC_COPY_STR)) {
+           if (prog->subbase) {
                Safefree(prog->subbase);
-           prog->subbeg = prog->subbase = s;
-           prog->subend = s+i;
+               prog->subbase = Nullch;
+           }
        }
        else {
-           prog->subbeg = s = prog->subbase;
-           prog->subend = s+i;
-       }
-       s += (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);
+           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 (prog->do_folding)
-           Safefree(startpos);
+    }
+    /* Preserve the current value of $^R */
+    if (oreplsv != GvSV(replgv)) {
+       sv_setsv(oreplsv, GvSV(replgv));/* So that when GvSV(replgv) is
+                                          restored, the value remains
+                                          the same. */
     }
     return 1;
 
 phooey:
-    if (prog->do_folding)
-       Safefree(startpos);
     return 0;
 }
 
 /*
  - regtry - try match at specific point
  */
-static I32                     /* 0 failure, 1 success */
-regtry(prog, startpos)
-regexp *prog;
-char *startpos;
+STATIC I32                     /* 0 failure, 1 success */
+regtry(regexp *prog, char *startpos)
 {
+    dTHR;
     register I32 i;
     register char **sp;
     register char **ep;
+    CHECKPOINT lastcp;
 
+    if ((prog->reganch & ROPT_EVAL_SEEN) && !reg_eval_set) {
+       reg_eval_set = RS_init;
+       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; */
+    }
     reginput = startpos;
     regstartp = prog->startp;
     regendp = prog->endp;
     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*);
+        else
+            New(22,reg_start_tmp, reg_start_tmpl, char*);
+    }
 
     sp = prog->startp;
     ep = prog->endp;
+    regdata = prog->data;
     if (prog->nparens) {
        for (i = prog->nparens; i >= 0; i--) {
            *sp++ = NULL;
            *ep++ = NULL;
        }
     }
-    if (regmatch(prog->program + 1) && reginput >= regtill) {
+    REGCP_SET;
+    if (regmatch(prog->program + 1)) {
        prog->startp[0] = startpos;
        prog->endp[0] = reginput;
        return 1;
     }
-    else
-       return 0;
+    REGCP_UNWIND;
+    return 0;
 }
 
 /*
@@ -559,62 +720,93 @@ char *startpos;
  * 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 */
-regmatch(prog)
-char *prog;
+STATIC I32                     /* 0 failure, 1 success */
+regmatch(regnode *prog)
 {
-    register char *scan;       /* Current node. */
-    char *next;                        /* Next node. */
-    register I32 nextchar;
+    dTHR;
+    register regnode *scan;    /* Current node. */
+    regnode *next;             /* Next node. */
+    regnode *inner;            /* Next node in internal branch. */
+    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;
-    int minmod = 0;
+    register I32 c1, c2, paren;        /* case fold search, parenth */
+    int minmod = 0, sw = 0, logical = 0;
+#ifdef DEBUGGING
+    regindent++;
+#endif
 
-    nextchar = *locinput;
+    nextchr = UCHARAT(locinput);
     scan = prog;
     while (scan != NULL) {
+#define sayNO_L (logical ? (logical = 0, sw = 0, goto cont) : sayNO)
 #ifdef DEBUGGING
-       if (regnarrate)
-           fprintf(stderr, "%2d%-8.8s\t<%.10s>\n",
-               scan - regprogram, regprop(scan), locinput);
+#  define sayYES goto yes
+#  define sayNO goto no
+#  define saySAME(x) if (x) goto yes; else goto no
+#  define REPORT_CODE_OFF 24
+#else
+#  define sayYES return 1
+#  define sayNO return 0
+#  define saySAME(x) return x
 #endif
+       DEBUG_r( {
+           SV *prop = sv_newmortal();
+           int docolor = *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);
 
-#ifdef REGALIGN
-       next = scan + NEXT(scan);
+           if (l + pref_len < (5 + taill) && l < regeol - locinput)
+               l = ( regeol - locinput > (5 + taill) - pref_len 
+                     ? (5 + taill) - pref_len : regeol - locinput);
+           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],
+                         (docolor ? "" : "> <"),
+                         colors[0], l, locinput, colors[1],
+                         15 - l - pref_len + 1,
+                         "",
+                         regindent*2, "", scan - regprogram,
+                         SvPVX(prop));
+       } );
+
+       next = scan + NEXT_OFF(scan);
        if (next == scan)
            next = NULL;
-#else
-       next = regnext(scan);
-#endif
 
        switch (OP(scan)) {
        case BOL:
-           if (locinput == regbol
+           if (locinput == bostr
                ? regprev == '\n'
-               : ((nextchar || locinput < regeol) && locinput[-1] == '\n') )
+               : (multiline && 
+                  (nextchr || locinput < regeol) && locinput[-1] == '\n') )
            {
                /* regtill = regbol; */
                break;
            }
-           return 0;
+           sayNO;
        case MBOL:
-           if (locinput == regbol
+           if (locinput == bostr
                ? regprev == '\n'
-               : ((nextchar || locinput < regeol) && locinput[-1] == '\n') )
+               : ((nextchr || locinput < regeol) && locinput[-1] == '\n') )
            {
                break;
            }
-           return 0;
+           sayNO;
        case SBOL:
            if (locinput == regbol && regprev == '\n')
                break;
-           return 0;
-       case GBOL:
+           sayNO;
+       case GPOS:
            if (locinput == regbol)
                break;
-           return 0;
+           sayNO;
        case EOL:
            if (multiline)
                goto meol;
@@ -622,146 +814,253 @@ char *prog;
                goto seol;
        case MEOL:
          meol:
-           if ((nextchar || locinput < regeol) && nextchar != '\n')
-               return 0;
+           if ((nextchr || locinput < regeol) && nextchr != '\n')
+               sayNO;
            break;
        case SEOL:
          seol:
-           if ((nextchar || locinput < regeol) && nextchar != '\n')
-               return 0;
+           if ((nextchr || locinput < regeol) && nextchr != '\n')
+               sayNO;
            if (regeol - locinput > 1)
-               return 0;
+               sayNO;
+           break;
+       case EOS:
+           if (regeol != locinput)
+               sayNO;
            break;
        case SANY:
-           if (!nextchar && locinput >= regeol)
-               return 0;
-           nextchar = *++locinput;
+           if (!nextchr && locinput >= regeol)
+               sayNO;
+           nextchr = UCHARAT(++locinput);
            break;
        case ANY:
-           if (!nextchar && locinput >= regeol || nextchar == '\n')
-               return 0;
-           nextchar = *++locinput;
+           if (!nextchr && locinput >= regeol || nextchr == '\n')
+               sayNO;
+           nextchr = UCHARAT(++locinput);
            break;
-       case EXACTLY:
-           s = OPERAND(scan);
-           ln = *s++;
+       case EXACT:
+           s = (char *) OPERAND(scan);
+           ln = UCHARAT(s++);
            /* Inline the first character, for speed. */
-           if (*s != nextchar)
-               return 0;
+           if (UCHARAT(s) != nextchr)
+               sayNO;
            if (regeol - locinput < ln)
-               return 0;
-           if (ln > 1 && bcmp(s, locinput, ln) != 0)
-               return 0;
+               sayNO;
+           if (ln > 1 && memNE(s, locinput, ln))
+               sayNO;
            locinput += ln;
-           nextchar = *locinput;
+           nextchr = UCHARAT(locinput);
+           break;
+       case EXACTFL:
+           reg_flags |= RF_tainted;
+           /* FALL THROUGH */
+       case EXACTF:
+           s = (char *) OPERAND(scan);
+           ln = UCHARAT(s++);
+           /* Inline the first character, for speed. */
+           if (UCHARAT(s) != nextchr &&
+               UCHARAT(s) != ((OP(scan) == EXACTF)
+                              ? fold : fold_locale)[nextchr])
+               sayNO;
+           if (regeol - locinput < ln)
+               sayNO;
+           if (ln > 1 && (OP(scan) == EXACTF
+                          ? ibcmp(s, locinput, ln)
+                          : ibcmp_locale(s, locinput, ln)))
+               sayNO;
+           locinput += ln;
+           nextchr = UCHARAT(locinput);
            break;
        case ANYOF:
-           s = OPERAND(scan);
-           if (nextchar < 0)
-               nextchar = UCHARAT(locinput);
-           if (s[nextchar >> 3] & (1 << (nextchar&7)))
-               return 0;
-           if (!nextchar && locinput >= regeol)
-               return 0;
-           nextchar = *++locinput;
+           s = (char *) OPERAND(scan);
+           if (nextchr < 0)
+               nextchr = UCHARAT(locinput);
+           if (!REGINCLASS(s, nextchr))
+               sayNO;
+           if (!nextchr && locinput >= regeol)
+               sayNO;
+           nextchr = UCHARAT(++locinput);
            break;
+       case ALNUML:
+           reg_flags |= RF_tainted;
+           /* FALL THROUGH */
        case ALNUM:
-           if (!nextchar)
-               return 0;
-           if (!isALNUM(nextchar))
-               return 0;
-           nextchar = *++locinput;
+           if (!nextchr)
+               sayNO;
+           if (!(OP(scan) == ALNUM
+                 ? isALNUM(nextchr) : isALNUM_LC(nextchr)))
+               sayNO;
+           nextchr = UCHARAT(++locinput);
            break;
+       case NALNUML:
+           reg_flags |= RF_tainted;
+           /* FALL THROUGH */
        case NALNUM:
-           if (!nextchar && locinput >= regeol)
-               return 0;
-           if (isALNUM(nextchar))
-               return 0;
-           nextchar = *++locinput;
+           if (!nextchr && locinput >= regeol)
+               sayNO;
+           if (OP(scan) == NALNUM
+               ? isALNUM(nextchr) : isALNUM_LC(nextchr))
+               sayNO;
+           nextchr = UCHARAT(++locinput);
            break;
-       case NBOUND:
+       case BOUNDL:
+       case NBOUNDL:
+           reg_flags |= RF_tainted;
+           /* FALL THROUGH */
        case BOUND:
-           if (locinput == regbol)     /* was last char in word? */
-               ln = isALNUM(regprev);
-           else 
-               ln = isALNUM(locinput[-1]);
-           n = isALNUM(nextchar); /* is next char in word? */
-           if ((ln == n) == (OP(scan) == BOUND))
-               return 0;
+       case NBOUND:
+           /* was last char in word? */
+           ln = (locinput != regbol) ? UCHARAT(locinput - 1) : regprev;
+           if (OP(scan) == BOUND || OP(scan) == NBOUND) {
+               ln = isALNUM(ln);
+               n = isALNUM(nextchr);
+           }
+           else {
+               ln = isALNUM_LC(ln);
+               n = isALNUM_LC(nextchr);
+           }
+           if (((!ln) == (!n)) == (OP(scan) == BOUND || OP(scan) == BOUNDL))
+               sayNO;
            break;
+       case SPACEL:
+           reg_flags |= RF_tainted;
+           /* FALL THROUGH */
        case SPACE:
-           if (!nextchar && locinput >= regeol)
-               return 0;
-           if (!isSPACE(nextchar))
-               return 0;
-           nextchar = *++locinput;
+           if (!nextchr && locinput >= regeol)
+               sayNO;
+           if (!(OP(scan) == SPACE
+                 ? isSPACE(nextchr) : isSPACE_LC(nextchr)))
+               sayNO;
+           nextchr = UCHARAT(++locinput);
            break;
+       case NSPACEL:
+           reg_flags |= RF_tainted;
+           /* FALL THROUGH */
        case NSPACE:
-           if (!nextchar)
-               return 0;
-           if (isSPACE(nextchar))
-               return 0;
-           nextchar = *++locinput;
+           if (!nextchr)
+               sayNO;
+           if (OP(scan) == SPACE
+               ? isSPACE(nextchr) : isSPACE_LC(nextchr))
+               sayNO;
+           nextchr = UCHARAT(++locinput);
            break;
        case DIGIT:
-           if (!isDIGIT(nextchar))
-               return 0;
-           nextchar = *++locinput;
+           if (!isDIGIT(nextchr))
+               sayNO;
+           nextchr = UCHARAT(++locinput);
            break;
        case NDIGIT:
-           if (!nextchar && locinput >= regeol)
-               return 0;
-           if (isDIGIT(nextchar))
-               return 0;
-           nextchar = *++locinput;
+           if (!nextchr && locinput >= regeol)
+               sayNO;
+           if (isDIGIT(nextchr))
+               sayNO;
+           nextchr = UCHARAT(++locinput);
            break;
-       case REF:
-           n = ARG1(scan);  /* which paren pair */
+       case REFFL:
+           reg_flags |= RF_tainted;
+           /* FALL THROUGH */
+        case REF:
+       case REFF:
+           n = ARG(scan);  /* which paren pair */
            s = regstartp[n];
-           if (!s)
-               return 0;
-           if (!regendp[n])
-               return 0;
+           if (*reglastparen < n || !s)
+               sayNO;                  /* Do not match unless seen CLOSEn. */
            if (s == regendp[n])
                break;
            /* Inline the first character, for speed. */
-           if (*s != nextchar)
-               return 0;
+           if (UCHARAT(s) != nextchr &&
+               (OP(scan) == REF ||
+                (UCHARAT(s) != ((OP(scan) == REFF
+                                 ? fold : fold_locale)[nextchr]))))
+               sayNO;
            ln = regendp[n] - s;
            if (locinput + ln > regeol)
-               return 0;
-           if (ln > 1 && bcmp(s, locinput, ln) != 0)
-               return 0;
+               sayNO;
+           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 = *locinput;
+           nextchr = UCHARAT(locinput);
            break;
 
        case NOTHING:
+       case TAIL:
            break;
        case BACK:
            break;
+       case EVAL:
+       {
+           dSP;
+           OP_4tree *oop = op;
+           COP *ocurcop = curcop;
+           SV **ocurpad = curpad;
+           SV *ret;
+           
+           n = ARG(scan);
+           op = (OP_4tree*)regdata->data[n];
+           DEBUG_r( PerlIO_printf(Perl_debug_log, "  re_eval 0x%x\n", op) );
+           curpad = AvARRAY((AV*)regdata->data[n + 1]);
+
+           CALLRUNOPS();                       /* Scalar context. */
+           SPAGAIN;
+           ret = POPs;
+           PUTBACK;
+           
+           if (logical) {
+               logical = 0;
+               sw = SvTRUE(ret);
+           } else
+               sv_setsv(save_scalar(replgv), ret);
+           op = oop;
+           curpad = ocurpad;
+           curcop = ocurcop;
+           break;
+       }
        case OPEN:
-           n = ARG1(scan);  /* which paren pair */
-           regstartp[n] = locinput;
+           n = ARG(scan);  /* which paren pair */
+           reg_start_tmp[n] = locinput;
            if (n > regsize)
                regsize = n;
            break;
        case CLOSE:
-           n = ARG1(scan);  /* which paren pair */
+           n = ARG(scan);  /* which paren pair */
+           regstartp[n] = reg_start_tmp[n];
            regendp[n] = locinput;
            if (n > *reglastparen)
                *reglastparen = n;
            break;
+       case GROUPP:
+           n = ARG(scan);  /* which paren pair */
+           sw = (*reglastparen >= n && regendp[n] != NULL);
+           break;
+       case IFTHEN:
+           if (sw)
+               next = NEXTOPER(NEXTOPER(scan));
+           else {
+               next = scan + ARG(scan);
+               if (OP(next) == IFTHEN) /* Fake one. */
+                   next = NEXTOPER(NEXTOPER(next));
+           }
+           break;
+       case LOGICAL:
+           logical = 1;
+           break;
        case CURLYX: {
                CURCUR cc;
                CHECKPOINT cp = savestack_ix;
+
+               if (OP(PREVOPER(next)) == NOTHING) /* LONGJMP */
+                   next += ARG(next);
                cc.oldcc = regcc;
                regcc = &cc;
                cc.parenfloor = *reglastparen;
                cc.cur = -1;
                cc.min = ARG1(scan);
                cc.max  = ARG2(scan);
-               cc.scan = NEXTOPER(scan) + 4;
+               cc.scan = NEXTOPER(scan) + EXTRA_STEP_2ARGS;
                cc.next = next;
                cc.minmod = minmod;
                cc.lastloc = 0;
@@ -769,7 +1068,7 @@ char *prog;
                n = regmatch(PREVOPER(next));   /* start on the WHILEM */
                regcpblow(cp);
                regcc = cc.oldcc;
-               return n;
+               saySAME(n);
            }
            /* NOT REACHED */
        case WHILEM: {
@@ -782,20 +1081,37 @@ char *prog;
                 * that we can try again after backing off.
                 */
 
+               CHECKPOINT cp, lastcp;
                CURCUR* cc = regcc;
-               n = cc->cur + 1;
+               char *lastloc = cc->lastloc; /* Detection of 0-len. */
+               
+               n = cc->cur + 1;        /* how many we know we matched */
                reginput = locinput;
 
+               DEBUG_r(
+                   PerlIO_printf(Perl_debug_log, 
+                                 "%*s  %ld out of %ld..%ld  cc=%lx\n", 
+                                 REPORT_CODE_OFF+regindent*2, "",
+                                 (long)n, (long)cc->min, 
+                                 (long)cc->max, (long)cc)
+                   );
+
                /* If degenerate scan matches "", assume scan done. */
 
-               if (locinput == cc->lastloc) {
+               if (locinput == cc->lastloc && n >= cc->min) {
                    regcc = cc->oldcc;
                    ln = regcc->cur;
+                   DEBUG_r(
+                       PerlIO_printf(Perl_debug_log, "%*s  empty match detected, try continuation...\n", REPORT_CODE_OFF+regindent*2, "")
+                       );
                    if (regmatch(cc->next))
-                       return TRUE;
+                       sayYES;
+                   DEBUG_r(
+                       PerlIO_printf(Perl_debug_log, "%*s  failed...\n", REPORT_CODE_OFF+regindent*2, "")
+                       );
                    regcc->cur = ln;
                    regcc = cc;
-                   return FALSE;
+                   sayNO;
                }
 
                /* First just match a string of min scans. */
@@ -803,7 +1119,14 @@ char *prog;
                if (n < cc->min) {
                    cc->cur = n;
                    cc->lastloc = locinput;
-                   return regmatch(cc->scan);
+                   if (regmatch(cc->scan))
+                       sayYES;
+                   cc->cur = n - 1;
+                   cc->lastloc = lastloc;
+                   DEBUG_r(
+                       PerlIO_printf(Perl_debug_log, "%*s  failed...\n", REPORT_CODE_OFF+regindent*2, "")
+                       );
+                   sayNO;
                }
 
                /* Prefer next over scan for minimal matching. */
@@ -811,67 +1134,125 @@ char *prog;
                if (cc->minmod) {
                    regcc = cc->oldcc;
                    ln = regcc->cur;
-                   if (regmatch(cc->next))
-                       return TRUE;    /* All done. */
+                   cp = regcppush(cc->parenfloor);
+                   REGCP_SET;
+                   if (regmatch(cc->next)) {
+                       regcpblow(cp);
+                       sayYES; /* All done. */
+                   }
+                   REGCP_UNWIND;
+                   regcppop();
                    regcc->cur = ln;
                    regcc = cc;
 
-                   if (n >= cc->max)   /* Maximum greed exceeded? */
-                       return FALSE;
+                   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);
+                       }
+                       sayNO;
+                   }
 
+                   DEBUG_r(
+                       PerlIO_printf(Perl_debug_log, "%*s  trying longer...\n", REPORT_CODE_OFF+regindent*2, "")
+                       );
                    /* Try scanning more and see if it helps. */
                    reginput = locinput;
                    cc->cur = n;
                    cc->lastloc = locinput;
-                   return regmatch(cc->scan);
+                   cp = regcppush(cc->parenfloor);
+                   REGCP_SET;
+                   if (regmatch(cc->scan)) {
+                       regcpblow(cp);
+                       sayYES;
+                   }
+                   DEBUG_r(
+                       PerlIO_printf(Perl_debug_log, "%*s  failed...\n", REPORT_CODE_OFF+regindent*2, "")
+                       );
+                   REGCP_UNWIND;
+                   regcppop();
+                   cc->cur = n - 1;
+                   cc->lastloc = lastloc;
+                   sayNO;
                }
 
                /* Prefer scan over next for maximal matching. */
 
                if (n < cc->max) {      /* More greed allowed? */
-                   regcppush(cc->parenfloor);
+                   cp = regcppush(cc->parenfloor);
                    cc->cur = n;
                    cc->lastloc = locinput;
-                   if (regmatch(cc->scan))
-                       return TRUE;
+                   REGCP_SET;
+                   if (regmatch(cc->scan)) {
+                       regcpblow(cp);
+                       sayYES;
+                   }
+                   REGCP_UNWIND;
                    regcppop();         /* Restore some previous $<digit>s? */
                    reginput = locinput;
+                   DEBUG_r(
+                       PerlIO_printf(Perl_debug_log, "%*s  failed, try continuation...\n", REPORT_CODE_OFF+regindent*2, "")
+                       );
+               }
+               if (dowarn && n >= REG_INFTY && !(reg_flags & RF_warned)) {
+                   reg_flags |= RF_warned;
+                   warn("count exceeded %d", REG_INFTY - 1);
                }
 
                /* Failed deeper matches of scan, so see if this one works. */
                regcc = cc->oldcc;
                ln = regcc->cur;
                if (regmatch(cc->next))
-                   return TRUE;
+                   sayYES;
+               DEBUG_r(
+                   PerlIO_printf(Perl_debug_log, "%*s  failed...\n", REPORT_CODE_OFF+regindent*2, "")
+                   );
                regcc->cur = ln;
                regcc = cc;
-               return FALSE;
+               cc->cur = n - 1;
+               cc->lastloc = lastloc;
+               sayNO;
            }
            /* NOT REACHED */
-       case BRANCH: {
-               if (OP(next) != BRANCH)   /* No choice. */
-                   next = NEXTOPER(scan);/* Avoid recursion. */
+       case BRANCHJ: 
+           next = scan + ARG(scan);
+           if (next == scan)
+               next = NULL;
+           inner = NEXTOPER(NEXTOPER(scan));
+           goto do_branch;
+       case BRANCH: 
+           inner = NEXTOPER(scan);
+         do_branch:
+           {
+               CHECKPOINT lastcp;
+               c1 = OP(scan);
+               if (OP(next) != c1)     /* No choice. */
+                   next = inner;       /* Avoid recursion. */
                else {
                    int lastparen = *reglastparen;
+
+                   REGCP_SET;
                    do {
                        reginput = locinput;
-                       if (regmatch(NEXTOPER(scan)))
-                           return 1;
+                       if (regmatch(inner))
+                           sayYES;
+                       REGCP_UNWIND;
                        for (n = *reglastparen; n > lastparen; n--)
                            regendp[n] = 0;
                        *reglastparen = n;
-                           
-#ifdef REGALIGN
+                       scan = next;
                        /*SUPPRESS 560*/
-                       if (n = NEXT(scan))
-                           scan += n;
+                       if (n = (c1 == BRANCH ? NEXT_OFF(next) : ARG(next)))
+                           next += n;
                        else
-                           scan = NULL;
-#else
-                       scan = regnext(scan);
-#endif
-                   } while (scan != NULL && OP(scan) == BRANCH);
-                   return 0;
+                           next = NULL;
+                       inner = NEXTOPER(scan);
+                       if (c1 == BRANCHJ) {
+                           inner = NEXTOPER(inner);
+                       }
+                   } while (scan != NULL && OP(scan) == c1);
+                   sayNO;
                    /* NOTREACHED */
                }
            }
@@ -879,83 +1260,304 @@ char *prog;
        case MINMOD:
            minmod = 1;
            break;
+       case CURLYM:
+       {
+           I32 l = 0;
+           CHECKPOINT lastcp;
+           
+           /* We suppose that the next guy does not need
+              backtracking: in particular, it is of constant length,
+              and has no parenths to influence future backrefs. */
+           ln = ARG1(scan);  /* min to match */
+           n  = ARG2(scan);  /* max to match */
+           paren = scan->flags;
+           if (paren) {
+               if (paren > regsize)
+                   regsize = paren;
+               if (paren > *reglastparen)
+                   *reglastparen = paren;
+           }
+           scan = NEXTOPER(scan) + NODE_STEP_REGNODE;
+           if (paren)
+               scan += NEXT_OFF(scan); /* Skip former OPEN. */
+           reginput = locinput;
+           if (minmod) {
+               minmod = 0;
+               if (ln && regrepeat_hard(scan, ln, &l) < ln)
+                   sayNO;
+               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;
+               if (regkind[(U8)OP(next)] == EXACT) {
+                   c1 = UCHARAT(OPERAND(next) + 1);
+                   if (OP(next) == EXACTF)
+                       c2 = fold[c1];
+                   else if (OP(next) == EXACTFL)
+                       c2 = fold_locale[c1];
+                   else
+                       c2 = c1;
+               } 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)
+                   {
+                       if (paren) {
+                           if (n) {
+                               regstartp[paren] = reginput - l;
+                               regendp[paren] = reginput;
+                           } else
+                               regendp[paren] = NULL;
+                       }
+                       if (regmatch(next))
+                           sayYES;
+                       REGCP_UNWIND;
+                   }
+                   /* Couldn't or didn't -- move forward. */
+                   reginput = locinput;
+                   if (regrepeat_hard(scan, 1, &l)) {
+                       ln++;
+                       locinput = reginput;
+                   }
+                   else
+                       sayNO;
+               }
+           } else {
+               n = regrepeat_hard(scan, n, &l);
+               if (n != 0 && l == 0
+                   /* 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;
+               DEBUG_r(
+                   PerlIO_printf(Perl_debug_log, "%*s  matched %ld times, len=%ld...\n", REPORT_CODE_OFF+regindent*2, "", n, l)
+                   );
+               if (n >= ln) {
+                   if (regkind[(U8)OP(next)] == EXACT) {
+                       c1 = UCHARAT(OPERAND(next) + 1);
+                       if (OP(next) == EXACTF)
+                           c2 = fold[c1];
+                       else if (OP(next) == EXACTFL)
+                           c2 = fold_locale[c1];
+                       else
+                           c2 = c1;
+                   } else
+                       c1 = c2 = -1000;
+               }
+               REGCP_SET;
+               while (n >= ln) {
+                   /* If it could work, try it. */
+                   if (c1 == -1000 ||
+                       UCHARAT(reginput) == c1 ||
+                       UCHARAT(reginput) == c2)
+                       {
+                           DEBUG_r(
+                               PerlIO_printf(Perl_debug_log, "%*s  trying tail with n=%ld...\n", REPORT_CODE_OFF+regindent*2, "", n)
+                               );
+                           if (paren) {
+                               if (n) {
+                                   regstartp[paren] = reginput - l;
+                                   regendp[paren] = reginput;
+                               } else
+                                   regendp[paren] = NULL;
+                           }
+                           if (regmatch(next))
+                               sayYES;
+                           REGCP_UNWIND;
+                       }
+                   /* Couldn't or didn't -- back up. */
+                   n--;
+                   locinput -= l;
+                   reginput = locinput;
+               }
+           }
+           sayNO;
+           break;
+       }
+       case CURLYN:
+           paren = scan->flags;        /* Which paren to set */
+           if (paren > regsize)
+               regsize = paren;
+           if (paren > *reglastparen)
+               *reglastparen = paren;
+           ln = ARG1(scan);  /* min to match */
+           n  = ARG2(scan);  /* max to match */
+            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;
+           scan = NEXTOPER(scan) + NODE_STEP_REGNODE;
            goto repeat;
        case STAR:
            ln = 0;
-           n = 32767;
+           n = REG_INFTY;
            scan = NEXTOPER(scan);
+           paren = 0;
            goto repeat;
        case PLUS:
+           ln = 1;
+           n = REG_INFTY;
+           scan = NEXTOPER(scan);
+           paren = 0;
+         repeat:
            /*
            * Lookahead to avoid useless match attempts
            * when we know what character comes next.
            */
-           ln = 1;
-           n = 32767;
-           scan = NEXTOPER(scan);
-         repeat:
-           if (OP(next) == EXACTLY)
-               nextchar = *(OPERAND(next)+1);
+           if (regkind[(U8)OP(next)] == EXACT) {
+               c1 = UCHARAT(OPERAND(next) + 1);
+               if (OP(next) == EXACTF)
+                   c2 = fold[c1];
+               else if (OP(next) == EXACTFL)
+                   c2 = fold_locale[c1];
+               else
+                   c2 = c1;
+           }
            else
-               nextchar = -1000;
+               c1 = c2 = -1000;
            reginput = locinput;
            if (minmod) {
+               CHECKPOINT lastcp;
                minmod = 0;
                if (ln && regrepeat(scan, ln) < ln)
-                   return 0;
-               while (n >= ln) {
+                   sayNO;
+               REGCP_SET;
+               while (n >= ln || (n == REG_INFTY && ln > 0)) { /* ln overflow ? */
                    /* If it could work, try it. */
-                   if (nextchar == -1000 || *reginput == nextchar)
+                   if (c1 == -1000 ||
+                       UCHARAT(reginput) == c1 ||
+                       UCHARAT(reginput) == c2)
+                   {
+                       if (paren) {
+                           if (n) {
+                               regstartp[paren] = reginput - 1;
+                               regendp[paren] = reginput;
+                           } else
+                               regendp[paren] = NULL;
+                       }
                        if (regmatch(next))
-                           return 1;
-                   /* Couldn't or didn't -- back up. */
+                           sayYES;
+                       REGCP_UNWIND;
+                   }
+                   /* Couldn't or didn't -- move forward. */
                    reginput = locinput + ln;
                    if (regrepeat(scan, 1)) {
                        ln++;
                        reginput = locinput + ln;
-                   }
-                   else
-                       return 0;
+                   } else
+                       sayNO;
                }
            }
            else {
+               CHECKPOINT lastcp;
                n = regrepeat(scan, n);
                if (ln < n && regkind[(U8)OP(next)] == EOL &&
-                   (!multiline || OP(next) == SEOL))
+                   (!multiline  || OP(next) == SEOL))
                    ln = n;                     /* why back off? */
-               while (n >= ln) {
-                   /* If it could work, try it. */
-                   if (nextchar == -1000 || *reginput == nextchar)
-                       if (regmatch(next))
-                           return 1;
-                   /* Couldn't or didn't -- back up. */
-                   n--;
-                   reginput = locinput + n;
+               REGCP_SET;
+               if (paren) {
+                   while (n >= ln) {
+                       /* If it could work, try it. */
+                       if (c1 == -1000 ||
+                           UCHARAT(reginput) == c1 ||
+                           UCHARAT(reginput) == c2)
+                           {
+                               if (paren && n) {
+                                   if (n) {
+                                       regstartp[paren] = reginput - 1;
+                                       regendp[paren] = reginput;
+                                   } else
+                                       regendp[paren] = NULL;
+                               }
+                               if (regmatch(next))
+                                   sayYES;
+                               REGCP_UNWIND;
+                           }
+                       /* Couldn't or didn't -- back up. */
+                       n--;
+                       reginput = locinput + n;
+                   }
+               } else {
+                   while (n >= ln) {
+                       /* If it could work, try it. */
+                       if (c1 == -1000 ||
+                           UCHARAT(reginput) == c1 ||
+                           UCHARAT(reginput) == c2)
+                           {
+                               if (regmatch(next))
+                                   sayYES;
+                               REGCP_UNWIND;
+                           }
+                       /* Couldn't or didn't -- back up. */
+                       n--;
+                       reginput = locinput + n;
+                   }
                }
            }
-           return 0;
-       case SUCCEED:
+           sayNO;
+           break;
        case END:
+           if (locinput < regtill)
+               sayNO;                  /* Cannot match: too short. */
+           /* Fall through */
+       case SUCCEED:
            reginput = locinput;        /* put where regtry can find it */
-           return 1;                   /* Success! */
-       case IFMATCH:
-           reginput = locinput;
-           scan = NEXTOPER(scan);
-           if (!regmatch(scan))
-               return 0;
-           break;
+           sayYES;                     /* Success! */
+       case SUSPEND:
+           n = 1;
+           goto do_ifmatch;        
        case UNLESSM:
-           reginput = locinput;
-           scan = NEXTOPER(scan);
-           if (regmatch(scan))
-               return 0;
+           n = 0;
+           if (locinput < bostr + scan->flags) 
+               goto say_yes;
+           goto do_ifmatch;
+       case IFMATCH:
+           n = 1;
+           if (locinput < bostr + scan->flags) 
+               goto say_no;
+         do_ifmatch:
+           reginput = locinput - scan->flags;
+           inner = NEXTOPER(NEXTOPER(scan));
+           if (regmatch(inner) != n) {
+             say_no:
+               if (logical) {
+                   logical = 0;
+                   sw = 0;
+                   goto do_longjump;
+               } else
+                   sayNO;
+           }
+         say_yes:
+           if (logical) {
+               logical = 0;
+               sw = 1;
+           }
+           if (OP(scan) == SUSPEND) {
+               locinput = reginput;
+               nextchr = UCHARAT(locinput);
+           }
+           /* FALL THROUGH. */
+       case LONGJMP:
+         do_longjump:
+           next = scan + ARG(scan);
+           if (next == scan)
+               next = NULL;
            break;
        default:
-           fprintf(stderr, "%x %d\n",(unsigned)scan,scan[1]);
+           PerlIO_printf(PerlIO_stderr(), "%lx %d\n",
+                         (unsigned long)scan, OP(scan));
            FAIL("regexp memory corruption");
        }
        scan = next;
@@ -967,6 +1569,18 @@ char *prog;
     */
     FAIL("corrupted regexp pointers");
     /*NOTREACHED*/
+    sayNO;
+
+yes:
+#ifdef DEBUGGING
+    regindent--;
+#endif
+    return 1;
+
+no:
+#ifdef DEBUGGING
+    regindent--;
+#endif
     return 0;
 }
 
@@ -978,10 +1592,8 @@ char *prog;
  * That was true before, but now we assume scan - reginput is the count,
  * rather than incrementing count on every character.]
  */
-static I32
-regrepeat(p, max)
-char *p;
-I32 max;
+STATIC I32
+regrepeat(regnode *p, I32 max)
 {
     register char *scan;
     register char *opnd;
@@ -989,9 +1601,9 @@ I32 max;
     register char *loceol = regeol;
 
     scan = reginput;
-    if (max != 32767 && max < loceol - scan)
+    if (max != REG_INFTY && max < loceol - scan)
       loceol = scan + max;
-    opnd = OPERAND(p);
+    opnd = (char *) OPERAND(p);
     switch (OP(p)) {
     case ANY:
        while (scan < loceol && *scan != '\n')
@@ -1000,34 +1612,64 @@ I32 max;
     case SANY:
        scan = loceol;
        break;
-    case EXACTLY:              /* length of string is 1 */
-       opnd++;
-       while (scan < loceol && *opnd == *scan)
+    case EXACT:                /* length of string is 1 */
+       c = UCHARAT(++opnd);
+       while (scan < loceol && UCHARAT(scan) == c)
+           scan++;
+       break;
+    case EXACTF:       /* length of string is 1 */
+       c = UCHARAT(++opnd);
+       while (scan < loceol &&
+              (UCHARAT(scan) == c || UCHARAT(scan) == fold[c]))
+           scan++;
+       break;
+    case EXACTFL:      /* length of string is 1 */
+       reg_flags |= RF_tainted;
+       c = UCHARAT(++opnd);
+       while (scan < loceol &&
+              (UCHARAT(scan) == c || UCHARAT(scan) == fold_locale[c]))
            scan++;
        break;
     case ANYOF:
-       c = UCHARAT(scan);
-       while (scan < loceol && !(opnd[c >> 3] & (1 << (c & 7)))) {
+       while (scan < loceol && REGINCLASS(opnd, *scan))
            scan++;
-           c = UCHARAT(scan);
-       }
        break;
     case ALNUM:
        while (scan < loceol && isALNUM(*scan))
            scan++;
        break;
+    case ALNUML:
+       reg_flags |= RF_tainted;
+       while (scan < loceol && isALNUM_LC(*scan))
+           scan++;
+       break;
     case NALNUM:
        while (scan < loceol && !isALNUM(*scan))
            scan++;
        break;
+    case NALNUML:
+       reg_flags |= RF_tainted;
+       while (scan < loceol && !isALNUM_LC(*scan))
+           scan++;
+       break;
     case SPACE:
        while (scan < loceol && isSPACE(*scan))
            scan++;
        break;
+    case SPACEL:
+       reg_flags |= RF_tainted;
+       while (scan < loceol && isSPACE_LC(*scan))
+           scan++;
+       break;
     case NSPACE:
        while (scan < loceol && !isSPACE(*scan))
            scan++;
        break;
+    case NSPACEL:
+       reg_flags |= RF_tainted;
+       while (scan < loceol && !isSPACE_LC(*scan))
+           scan++;
+       break;
     case DIGIT:
        while (scan < loceol && isDIGIT(*scan))
            scan++;
@@ -1043,34 +1685,91 @@ I32 max;
     c = scan - reginput;
     reginput = scan;
 
+    DEBUG_r( 
+       {
+               SV *prop = sv_newmortal();
+
+               regprop(prop, p);
+               PerlIO_printf(Perl_debug_log, 
+                             "%*s  %s can match %ld times out of %ld...\n", 
+                             REPORT_CODE_OFF+1, "", SvPVX(prop),c,max);
+       });
+    
     return(c);
 }
 
 /*
- - regnext - dig the "next" pointer out of a node
- *
- * [Note, when REGALIGN is defined there are two places in regmatch()
- * that bypass this code for speed.]
+ - regrepeat_hard - repeatedly match something, report total lenth and length
+ * 
+ * The repeater is supposed to have constant length.
  */
-char *
-regnext(p)
-register char *p;
+
+STATIC I32
+regrepeat_hard(regnode *p, I32 max, I32 *lp)
 {
-    register I32 offset;
+    register char *scan;
+    register char *start;
+    register char *loceol = regeol;
+    I32 l = -1;
 
-    if (p == &regdummy)
-       return(NULL);
+    start = reginput;
+    while (reginput < loceol && (scan = reginput, regmatch(p))) {
+       if (l == -1) {
+           *lp = l = reginput - start;
+           if (max != REG_INFTY && l*max < loceol - scan)
+               loceol = scan + l*max;
+           if (l == 0) {
+               return max;
+           }
+       }
+    }
+    if (reginput < loceol)
+       reginput = scan;
+    else
+       scan = reginput;
+    
+    return (scan - start)/l;
+}
 
-    offset = NEXT(p);
-    if (offset == 0)
-       return(NULL);
+/*
+ - regclass - determine if a character falls into a character class
+ */
 
-#ifdef REGALIGN
-    return(p+offset);
-#else
-    if (OP(p) == BACK)
-       return(p-offset);
-    else
-       return(p+offset);
-#endif
+STATIC bool
+reginclass(register char *p, register I32 c)
+{
+    char flags = *p;
+    bool match = FALSE;
+
+    c &= 0xFF;
+    if (ANYOF_TEST(p, c))
+       match = TRUE;
+    else if (flags & ANYOF_FOLD) {
+       I32 cf;
+       if (flags & ANYOF_LOCALE) {
+           reg_flags |= RF_tainted;
+           cf = fold_locale[c];
+       }
+       else
+           cf = fold[c];
+       if (ANYOF_TEST(p, cf))
+           match = TRUE;
+    }
+
+    if (!match && (flags & ANYOF_ISA)) {
+       reg_flags |= RF_tainted;
+
+       if (((flags & ANYOF_ALNUML)  && isALNUM_LC(c))  ||
+           ((flags & ANYOF_NALNUML) && !isALNUM_LC(c)) ||
+           ((flags & ANYOF_SPACEL)  && isSPACE_LC(c))  ||
+           ((flags & ANYOF_NSPACEL) && !isSPACE_LC(c)))
+       {
+           match = TRUE;
+       }
+    }
+
+    return (flags & ANYOF_INVERT) ? !match : match;
 }
+
+
+