This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
fix memory leaks and uninitialized memory accesses found by Purify
[perl5.git] / regexec.c
index 2246454..b6d2ca4 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -1,3 +1,10 @@
+/*    regexec.c
+ */
+
+/*
+ * "One Ring to rule them all, One Ring to find them..."
+ */
+
 /* NOTE: this is derived from Henry Spencer's regexp code, and should not
  * confused with the original package (see point 3 below).  Thanks, Henry!
  */
  * blame Henry for some of the lack of readability.
  */
 
-/* $Header: regexec.c,v 3.0 89/10/18 15:22:53 lwall Locked $
- *
- * $Log:       regexec.c,v $
- * Revision 3.0  89/10/18  15:22:53  lwall
- * 3.0 baseline
- * 
- */
+/* 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.
  *
  ****    Alterations to Henry's code are...
  ****
- ****    Copyright (c) 1989, Larry Wall
+ ****    Copyright (c) 1991-1997, Larry Wall
  ****
- ****    You may distribute under the terms of the GNU General Public License
- ****    as specified in the README file that comes with the perl 3.0 kit.
+ ****    You may distribute under the terms of either the GNU General Public
+ ****    License or the Artistic License, as specified in the README file.
  *
  * Beware that some of this code is subtly aware of the way operator
  * precedence is structured in regular expressions.  Serious changes in
 #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
-int regnarrate = 0;
-#endif
+#ifndef PERL_OBJECT
+typedef I32 CHECKPOINT;
 
 /*
- * regexec and friends
+ * Forwards.
  */
 
+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));
+
+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))
+
+STATIC CHECKPOINT
+regcppush(I32 parenfloor)
+{
+    dTHR;
+    int retval = savestack_ix;
+    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);
+    SSPUSHINT(*reglastparen);
+    SSPUSHPTR(reginput);
+    SSPUSHINT(i + 3);
+    SSPUSHINT(SAVEt_REGCONTEXT);
+    return retval;
+}
+
+/* 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;
+    char *tmps;
+    assert(i == SAVEt_REGCONTEXT);
+    i = SSPOPINT;
+    input = (char *) SSPOPPTR;
+    *reglastparen = SSPOPINT;
+    regsize = SSPOPINT;
+    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;
+       regendp[paren] = Nullch;
+    }
+    return input;
+}
+
+#define regcpblow(cp) LEAVE_SCOPE(cp)
+
 /*
- * Global work variables for regexec().
+ * pregexec and friends
  */
-static char *regprecomp;
-static char *reginput;         /* String-input pointer. */
-static char *regbol;           /* Beginning of input, for ^ check. */
-static char *regeol;           /* End of input, for $ check. */
-static char **regstartp;       /* Pointer to startp array. */
-static char **regendp;         /* Ditto for endp. */
-static char *reglastparen;     /* Similarly for lastparen. */
-static char *regtill;
-
-static char *regmystartp[10];  /* For remembering backreferences. */
-static char *regmyendp[10];
 
 /*
- * Forwards.
+ - pregexec - match a regexp against a string
  */
-STATIC int regtry();
-STATIC int regmatch();
-STATIC int regrepeat();
-
-extern int multiline;
-
+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
  */
-int
-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 */
-int minend;    /* end of match must be at least minend after stringarg */
-STR *screamer;
-int safebase;  /* no need to remember string in subbase */
+I32
+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 int i;
-       register char *c;
-       register char *string = stringarg;
-       register int tmp;
-       int minlen = 0;         /* must match at least this many chars */
-       int dontbother = 0;     /* how many characters not to try at end */
-       int beginning = (string == strbeg);     /* is ^ valid at stringarg? */
-
-       /* Be paranoid... */
-       if (prog == NULL || string == NULL) {
-               fatal("NULL regexp parameter");
-               return(0);
+    register char *s;
+    register regnode *c;
+    register char *startpos = stringarg;
+    register I32 tmp;
+    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;
+#endif
+
+    /* Be paranoid... */
+    if (prog == NULL || startpos == NULL) {
+       croak("NULL regexp parameter");
+       return 0;
+    }
+
+    minlen = prog->minlen;
+    if (strend - startpos < minlen) goto phooey;
+
+    if (startpos == strbeg)    /* is ^ valid at stringarg? */
+       regprev = '\n';
+    else {
+       regprev = stringarg[-1];
+       if (!multiline && regprev == '\n')
+           regprev = '\0';             /* force ^ to NOT match */
+    }
+
+    /* Check validity of program. */
+    if (UCHARAT(prog->program) != MAGIC) {
+       FAIL("corrupted regexp program");
+    }
+
+    regnpar = prog->nparens;
+    reg_flags = 0;
+    reg_eval_set = 0;
+
+    /* If there is a "must appear" string, look for it. */
+    s = startpos;
+    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)) )
+    {
+       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 + start_shift,
+                         (unsigned char*)strend - end_shift,
+               prog->check_substr);
+       if (!s) {
+           ++BmUSEFUL(prog->check_substr);     /* hooray */
+           goto phooey;        /* not present */
+       } 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;
+       } else s = startpos;
+    }
 
-       regprecomp = prog->precomp;
-       /* Check validity of program. */
-       if (UCHARAT(prog->program) != MAGIC) {
-               FAIL("corrupted regexp program");
+    /* Mark beginning of line for ^ and lookbehind. */
+    regbol = startpos;
+    bostr  = strbeg;
+
+    /* Mark end of line for $ (and such) */
+    regeol = strend;
+
+    /* 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 only anchor is BOL and multiline is set] */
+    if (prog->reganch & ROPT_ANCH) {
+       if (regtry(prog, startpos))
+           goto got_it;
+       else if (!(prog->reganch & ROPT_ANCH_GPOS) &&
+                (multiline || (prog->reganch & ROPT_IMPLICIT)
+                 || (prog->reganch & ROPT_ANCH_MBOL)))
+       {
+           if (minlen)
+               dontbother = minlen - 1;
+           strend -= dontbother;
+           /* for multiline we only have to try after newlines */
+           if (s > startpos)
+               s--;
+           while (s < strend) {
+               if (*s++ == '\n') {
+                   if (s < strend && regtry(prog, s))
+                       goto got_it;
+               }
+           }
        }
+       goto phooey;
+    }
 
-       if (prog->do_folding) {
-               safebase = FALSE;
-               i = strend - string;
-               New(1101,c,i+1,char);
-               (void)bcopy(string, c, i+1);
-               string = c;
-               strend = string + i;
-               for (s = string; s < strend; s++)
-                       if (isupper(*s))
-                               *s = tolower(*s);
+    /* Messy cases:  unanchored match. */
+    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++;
        }
+    }
+    /*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 */
 
-       /* If there is a "must appear" string, look for it. */
-       s = string;
-       if (prog->regmust != Nullstr) {
-               if (beginning && screamer) {
-                       if (screamfirst[prog->regmust->str_rare] >= 0)
-                               s = screaminstr(screamer,prog->regmust);
-                       else
-                               s = Nullch;
+       /* 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))) ) {
+           if (s - back_max > last1) {
+               last1 = s - back_min;
+               s = s - back_max;
+           } else {
+               char *t = last1 + 1;            
+
+               last1 = s - back_min;
+               s = t;          
+           }
+           while (s <= last1) {
+               if (regtry(prog, s))
+                   goto got_it;
+               s++;
+           }
+       }
+       goto phooey;
+    } else if (c = prog->regstclass) {
+       I32 doevery = (prog->reganch & ROPT_SKIP) == 0;
+       char *Class;
+
+       if (minlen)
+           dontbother = minlen - 1;
+       strend -= dontbother;   /* don't bother with what can't match */
+       tmp = 1;
+       /* We know what class it must start with. */
+       switch (OP(c)) {
+       case ANYOF:
+           Class = (char *) OPERAND(c);
+           while (s < strend) {
+               if (REGINCLASS(Class, *s)) {
+                   if (tmp && regtry(prog, s))
+                       goto got_it;
+                   else
+                       tmp = doevery;
                }
-#ifndef lint
                else
-                       s = fbminstr((unsigned char*)s, (unsigned char*)strend,
-                           prog->regmust);
-#endif
-               if (!s) {
-                       ++prog->regmust->str_u.str_useful;      /* hooray */
-                       goto phooey;    /* not present */
+                   tmp = 1;
+               s++;
+           }
+           break;
+       case BOUNDL:
+           reg_flags |= RF_tainted;
+           /* FALL THROUGH */
+       case BOUND:
+           if (minlen)
+               dontbother++,strend--;
+           tmp = (s != startpos) ? UCHARAT(s - 1) : regprev;
+           tmp = ((OP(c) == BOUND ? isALNUM(tmp) : isALNUM_LC(tmp)) != 0);
+           while (s < strend) {
+               if (tmp == !(OP(c) == BOUND ? isALNUM(*s) : isALNUM_LC(*s))) {
+                   tmp = !tmp;
+                   if (regtry(prog, s))
+                       goto got_it;
                }
-               else if (prog->regback >= 0) {
-                       s -= prog->regback;
-                       if (s < string)
-                           s = string;
-                       minlen = prog->regback + prog->regmust->str_cur;
+               s++;
+           }
+           if ((minlen || tmp) && regtry(prog,s))
+               goto got_it;
+           break;
+       case NBOUNDL:
+           reg_flags |= RF_tainted;
+           /* FALL THROUGH */
+       case NBOUND:
+           if (minlen)
+               dontbother++,strend--;
+           tmp = (s != startpos) ? UCHARAT(s - 1) : regprev;
+           tmp = ((OP(c) == NBOUND ? isALNUM(tmp) : isALNUM_LC(tmp)) != 0);
+           while (s < strend) {
+               if (tmp == !(OP(c) == NBOUND ? isALNUM(*s) : isALNUM_LC(*s)))
+                   tmp = !tmp;
+               else if (regtry(prog, s))
+                   goto got_it;
+               s++;
+           }
+           if ((minlen || !tmp) && regtry(prog,s))
+               goto got_it;
+           break;
+       case ALNUM:
+           while (s < strend) {
+               if (isALNUM(*s)) {
+                   if (tmp && regtry(prog, s))
+                       goto got_it;
+                   else
+                       tmp = doevery;
                }
-               else if (--prog->regmust->str_u.str_useful < 0) { /* boo */
-                       str_free(prog->regmust);
-                       prog->regmust = Nullstr;        /* disable regmust */
-                       s = string;
+               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
+                       tmp = doevery;
                }
-               else {
-                       s = string;
-                       minlen = prog->regmust->str_cur;
+               else
+                   tmp = 1;
+               s++;
+           }
+           break;
+       case NALNUM:
+           while (s < strend) {
+               if (!isALNUM(*s)) {
+                   if (tmp && regtry(prog, s))
+                       goto got_it;
+                   else
+                       tmp = doevery;
                }
-       }
-
-       /* Mark beginning of line for ^ . */
-       if (beginning)
-               regbol = string;
-       else
-               regbol = NULL;
-
-       /* Mark end of line for $ (and such) */
-       regeol = strend;
-
-       /* see how far we have to get to not match where we matched before */
-       regtill = string+minend;
-
-       /* Simplest case:  anchored match need be tried only once. */
-       /*  [unless multiline is set] */
-       if (prog->reganch) {
-               if (regtry(prog, string))
+               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 if (multiline) {
-                       if (minlen)
-                           dontbother = minlen - 1;
-                       strend -= dontbother;
-                       /* for multiline we only have to try after newlines */
-                       if (s > string)
-                           s--;
-                       for (; s < strend; s++) {
-                           if (*s == '\n') {
-                               if (++s < strend && regtry(prog, s))
-                                   goto got_it;
-                           }
-                       }
+                   else
+                       tmp = doevery;
                }
-               goto phooey;
-       }
-
-       /* Messy cases:  unanchored match. */
-       if (prog->regstart) {
-               /* We know what string it must start with. */
-               if (prog->regstart->str_pok == 3) {
-#ifndef lint
-                   while ((s = fbminstr((unsigned char*)s,
-                     (unsigned char*)strend, prog->regstart)) != NULL)
-#else
-                   while (s = Nullch)
-#endif
-                   {
-                           if (regtry(prog, s))
-                                   goto got_it;
-                           s++;
-                   }
+               else
+                   tmp = 1;
+               s++;
+           }
+           break;
+       case SPACE:
+           while (s < strend) {
+               if (isSPACE(*s)) {
+                   if (tmp && regtry(prog, s))
+                       goto got_it;
+                   else
+                       tmp = doevery;
                }
-               else {
-                   c = prog->regstart->str_ptr;
-                   while ((s = ninstr(s, strend,
-                     c, c + prog->regstart->str_cur )) != NULL) {
-                           if (regtry(prog, s))
-                                   goto got_it;
-                           s++;
-                   }
+               else
+                   tmp = 1;
+               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;
                }
-               goto phooey;
-       }
-       if (c = prog->regstclass) {
-               if (minlen)
-                   dontbother = minlen - 1;
-               strend -= dontbother;   /* don't bother with what can't match */
-               /* We know what class it must start with. */
-               switch (OP(c)) {
-               case ANYOF: case ANYBUT:
-                   c = OPERAND(c);
-                   while (s < strend) {
-                           i = *s;
-                           if (!(c[i >> 3] & (1 << (i&7))))
-                                   if (regtry(prog, s))
-                                           goto got_it;
-                           s++;
-                   }
-                   break;
-               case BOUND:
-                   if (minlen)
-                       dontbother++,strend--;
-                   if (s != string) {
-                       i = s[-1];
-                       tmp = (isalpha(i) || isdigit(i) || i == '_');
-                   }
+               else
+                   tmp = 1;
+               s++;
+           }
+           break;
+       case NSPACE:
+           while (s < strend) {
+               if (!isSPACE(*s)) {
+                   if (tmp && regtry(prog, s))
+                       goto got_it;
                    else
-                       tmp = 0;        /* assume not alphanumeric */
-                   while (s < strend) {
-                           i = *s;
-                           if (tmp != (isalpha(i) || isdigit(i) || i == '_')) {
-                                   tmp = !tmp;
-                                   if (regtry(prog, s))
-                                           goto got_it;
-                           }
-                           s++;
-                   }
-                   if (tmp && regtry(prog,s))
-                           goto got_it;
-                   break;
-               case NBOUND:
-                   if (minlen)
-                       dontbother++,strend--;
-                   if (s != string) {
-                       i = s[-1];
-                       tmp = (isalpha(i) || isdigit(i) || i == '_');
-                   }
+                       tmp = doevery;
+               }
+               else
+                   tmp = 1;
+               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 = 0;        /* assume not alphanumeric */
-                   while (s < strend) {
-                           i = *s;
-                           if (tmp != (isalpha(i) || isdigit(i) || i == '_'))
-                                   tmp = !tmp;
-                           else if (regtry(prog, s))
-                                   goto got_it;
-                           s++;
-                   }
-                   if (!tmp && regtry(prog,s))
-                           goto got_it;
-                   break;
-               case ALNUM:
-                   while (s < strend) {
-                           i = *s;
-                           if (isalpha(i) || isdigit(i) || i == '_')
-                                   if (regtry(prog, s))
-                                           goto got_it;
-                           s++;
-                   }
-                   break;
-               case NALNUM:
-                   while (s < strend) {
-                           i = *s;
-                           if (!isalpha(i) && !isdigit(i) && i != '_')
-                                   if (regtry(prog, s))
-                                           goto got_it;
-                           s++;
-                   }
-                   break;
-               case SPACE:
-                   while (s < strend) {
-                           if (isspace(*s))
-                                   if (regtry(prog, s))
-                                           goto got_it;
-                           s++;
-                   }
-                   break;
-               case NSPACE:
-                   while (s < strend) {
-                           if (!isspace(*s))
-                                   if (regtry(prog, s))
-                                           goto got_it;
-                           s++;
-                   }
-                   break;
-               case DIGIT:
-                   while (s < strend) {
-                           if (isdigit(*s))
-                                   if (regtry(prog, s))
-                                           goto got_it;
-                           s++;
-                   }
-                   break;
-               case NDIGIT:
-                   while (s < strend) {
-                           if (!isdigit(*s))
-                                   if (regtry(prog, s))
-                                           goto got_it;
-                           s++;
-                   }
-                   break;
+                       tmp = doevery;
                }
+               else
+                   tmp = 1;
+               s++;
+           }
+           break;
+       case DIGIT:
+           while (s < strend) {
+               if (isDIGIT(*s)) {
+                   if (tmp && regtry(prog, s))
+                       goto got_it;
+                   else
+                       tmp = doevery;
+               }
+               else
+                   tmp = 1;
+               s++;
+           }
+           break;
+       case NDIGIT:
+           while (s < strend) {
+               if (!isDIGIT(*s)) {
+                   if (tmp && regtry(prog, s))
+                       goto got_it;
+                   else
+                       tmp = doevery;
+               }
+               else
+                   tmp = 1;
+               s++;
+           }
+           break;
        }
-       else {
-               dontbother = minend;
-               strend -= dontbother;
-               /* We don't know much -- general case. */
-               do {
-                       if (regtry(prog, s))
-                               goto got_it;
-               } while (s++ < strend);
+    }
+    else {
+       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. */
+       do {
+           if (regtry(prog, s))
+               goto got_it;
+       } while (s++ < strend);
+    }
 
-       /* Failure. */
-       goto phooey;
+    /* Failure. */
+    goto phooey;
 
-    got_it:
-       if ((!safebase && (prog->nparens || sawampersand)) || prog->do_folding){
-               strend += dontbother;   /* uncheat */
-               if (safebase)                   /* no need for $digit later */
-                   s = strbeg;
-               else if (strbeg != prog->subbase) {
-                   i = strend - string + (stringarg - strbeg);
-                   s = nsavestr(strbeg,i);     /* so $digit will work later */
-                   if (prog->subbase)
-                           Safefree(prog->subbase);
-                   prog->subbase = s;
-               }
-               else
-                   s = prog->subbase;
-               s += (stringarg - strbeg);
-               for (i = 0; i <= prog->nparens; i++) {
-                       if (prog->endp[i]) {
-                           prog->startp[i] = s + (prog->startp[i] - string);
-                           prog->endp[i] = s + (prog->endp[i] - string);
-                       }
+got_it:
+    strend += dontbother;      /* uncheat */
+    prog->subbeg = strbeg;
+    prog->subend = strend;
+    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->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);
                }
-               if (prog->do_folding)
-                       Safefree(string);
+           }
        }
-       return(1);
+    }
+    /* 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(string);
-       return(0);
+phooey:
+    return 0;
 }
 
 /*
  - regtry - try match at specific point
  */
-static int                     /* 0 failure, 1 success */
-regtry(prog, string)
-regexp *prog;
-char *string;
+STATIC I32                     /* 0 failure, 1 success */
+regtry(regexp *prog, char *startpos)
 {
-       register int i;
-       register char **sp;
-       register char **ep;
-
-       reginput = string;
-       regstartp = prog->startp;
-       regendp = prog->endp;
-       reglastparen = &prog->lastparen;
-       prog->lastparen = 0;
-
-       sp = prog->startp;
-       ep = prog->endp;
-       if (prog->nparens) {
-               for (i = NSUBEXP; i > 0; i--) {
-                       *sp++ = NULL;
-                       *ep++ = NULL;
-               }
+    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) {
-               prog->startp[0] = string;
-               prog->endp[0] = reginput;
-               return(1);
-       } else
-               return(0);
+    }
+    REGCP_SET;
+    if (regmatch(prog->program + 1) && reginput >= regtill) {
+       prog->startp[0] = startpos;
+       prog->endp[0] = reginput;
+       return 1;
+    }
+    REGCP_UNWIND;
+    return 0;
 }
 
 /*
@@ -430,291 +720,861 @@ char *string;
  * 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 int                     /* 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 int nextchar;
-       register int n;         /* no or next */
-       register int ln;        /* len or last */
-       register char *s;       /* operand or save */
-       register char *locinput = reginput;
-
-       nextchar = *locinput;
-       scan = prog;
-#ifdef DEBUGGING
-       if (scan != NULL && regnarrate)
-               fprintf(stderr, "%s(\n", regprop(scan));
-#endif
-       while (scan != NULL) {
+    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;
+    register I32 c1, c2, paren;        /* case fold search, parenth */
+    int minmod = 0, sw = 0, logical = 0;
 #ifdef DEBUGGING
-               if (regnarrate)
-                       fprintf(stderr, "%s...\n", regprop(scan));
+    regindent++;
 #endif
 
-#ifdef REGALIGN
-               next = scan + NEXT(scan);
-               if (next == scan)
-                   next = NULL;
+    nextchr = UCHARAT(locinput);
+    scan = prog;
+    while (scan != NULL) {
+#define sayNO_L (logical ? (logical = 0, sw = 0, goto cont) : sayNO)
+#ifdef DEBUGGING
+#  define sayYES goto yes
+#  define sayNO goto no
+#  define saySAME(x) if (x) goto yes; else goto no
+#  define REPORT_CODE_OFF 24
 #else
-               next = regnext(scan);
+#  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);
 
-               switch (OP(scan)) {
-               case BOL:
-                       if (locinput == regbol ||
-                           ((nextchar || locinput < regeol) &&
-                             locinput[-1] == '\n') )
-                       {
-                               regtill--;
-                               break;
+           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;
+
+       switch (OP(scan)) {
+       case BOL:
+           if (locinput == regbol
+               ? regprev == '\n'
+               : (multiline && 
+                  (nextchr || locinput < regeol) && locinput[-1] == '\n') )
+           {
+               /* regtill = regbol; */
+               break;
+           }
+           sayNO;
+       case MBOL:
+           if (locinput == regbol
+               ? regprev == '\n'
+               : ((nextchr || locinput < regeol) && locinput[-1] == '\n') )
+           {
+               break;
+           }
+           sayNO;
+       case SBOL:
+           if (locinput == regbol && regprev == '\n')
+               break;
+           sayNO;
+       case GPOS:
+           if (locinput == regbol)
+               break;
+           sayNO;
+       case EOL:
+           if (multiline)
+               goto meol;
+           else
+               goto seol;
+       case MEOL:
+         meol:
+           if ((nextchr || locinput < regeol) && nextchr != '\n')
+               sayNO;
+           break;
+       case SEOL:
+         seol:
+           if ((nextchr || locinput < regeol) && nextchr != '\n')
+               sayNO;
+           if (regeol - locinput > 1)
+               sayNO;
+           break;
+       case SANY:
+           if (!nextchr && locinput >= regeol)
+               sayNO;
+           nextchr = UCHARAT(++locinput);
+           break;
+       case ANY:
+           if (!nextchr && locinput >= regeol || nextchr == '\n')
+               sayNO;
+           nextchr = UCHARAT(++locinput);
+           break;
+       case EXACT:
+           s = (char *) OPERAND(scan);
+           ln = UCHARAT(s++);
+           /* Inline the first character, for speed. */
+           if (UCHARAT(s) != nextchr)
+               sayNO;
+           if (regeol - locinput < ln)
+               sayNO;
+           if (ln > 1 && memNE(s, locinput, ln))
+               sayNO;
+           locinput += ln;
+           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 = (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 (!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 (!nextchr && locinput >= regeol)
+               sayNO;
+           if (OP(scan) == NALNUM
+               ? isALNUM(nextchr) : isALNUM_LC(nextchr))
+               sayNO;
+           nextchr = UCHARAT(++locinput);
+           break;
+       case BOUNDL:
+       case NBOUNDL:
+           reg_flags |= RF_tainted;
+           /* FALL THROUGH */
+       case BOUND:
+       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 (!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 (!nextchr)
+               sayNO;
+           if (OP(scan) == SPACE
+               ? isSPACE(nextchr) : isSPACE_LC(nextchr))
+               sayNO;
+           nextchr = UCHARAT(++locinput);
+           break;
+       case DIGIT:
+           if (!isDIGIT(nextchr))
+               sayNO;
+           nextchr = UCHARAT(++locinput);
+           break;
+       case NDIGIT:
+           if (!nextchr && locinput >= regeol)
+               sayNO;
+           if (isDIGIT(nextchr))
+               sayNO;
+           nextchr = UCHARAT(++locinput);
+           break;
+       case REFFL:
+           reg_flags |= RF_tainted;
+           /* FALL THROUGH */
+        case REF:
+       case REFF:
+           n = ARG(scan);  /* which paren pair */
+           s = regstartp[n];
+           if (*reglastparen < n || !s)
+               sayNO;                  /* Do not match unless seen CLOSEn. */
+           if (s == regendp[n])
+               break;
+           /* Inline the first character, for speed. */
+           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)
+               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;
+           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 = ARG(scan);  /* which paren pair */
+           reg_start_tmp[n] = locinput;
+           if (n > regsize)
+               regsize = n;
+           break;
+       case CLOSE:
+           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) + EXTRA_STEP_2ARGS;
+               cc.next = next;
+               cc.minmod = minmod;
+               cc.lastloc = 0;
+               reginput = locinput;
+               n = regmatch(PREVOPER(next));   /* start on the WHILEM */
+               regcpblow(cp);
+               regcc = cc.oldcc;
+               saySAME(n);
+           }
+           /* NOT REACHED */
+       case WHILEM: {
+               /*
+                * This is really hard to understand, because after we match
+                * what we're trying to match, we must make sure the rest of
+                * the RE is going to match for sure, and to do that we have
+                * to go back UP the parse tree by recursing ever deeper.  And
+                * if it fails, we have to reset our parent's current state
+                * that we can try again after backing off.
+                */
+
+               CHECKPOINT cp, lastcp;
+               CURCUR* cc = regcc;
+               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 && 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))
+                       sayYES;
+                   DEBUG_r(
+                       PerlIO_printf(Perl_debug_log, "%*s  failed...\n", REPORT_CODE_OFF+regindent*2, "")
+                       );
+                   regcc->cur = ln;
+                   regcc = cc;
+                   sayNO;
+               }
+
+               /* First just match a string of min scans. */
+
+               if (n < cc->min) {
+                   cc->cur = n;
+                   cc->lastloc = locinput;
+                   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. */
+
+               if (cc->minmod) {
+                   regcc = cc->oldcc;
+                   ln = regcc->cur;
+                   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? */
+                       if (dowarn && n >= REG_INFTY 
+                           && !(reg_flags & RF_warned)) {
+                           reg_flags |= RF_warned;
+                           warn("count exceeded %d", REG_INFTY - 1);
                        }
-                       return(0);
-               case EOL:
-                       if ((nextchar || locinput < regeol) && nextchar != '\n')
-                               return(0);
-                       regtill--;
-                       break;
-               case ANY:
-                       if ((nextchar == '\0' && locinput >= regeol) ||
-                         nextchar == '\n')
-                               return(0);
-                       nextchar = *++locinput;
-                       break;
-               case EXACTLY:
-                       s = OPERAND(scan);
-                       ln = *s++;
-                       /* Inline the first character, for speed. */
-                       if (*s != nextchar)
-                               return(0);
-                       if (locinput + ln > regeol)
-                               return 0;
-                       if (ln > 1 && bcmp(s, locinput, ln) != 0)
-                               return(0);
-                       locinput += ln;
-                       nextchar = *locinput;
-                       break;
-               case ANYOF:
-               case ANYBUT:
-                       s = OPERAND(scan);
-                       if (nextchar < 0)
-                               nextchar = UCHARAT(locinput);
-                       if (s[nextchar >> 3] & (1 << (nextchar&7)))
-                               return(0);
-                       nextchar = *++locinput;
-                       if (!nextchar && locinput > regeol)
-                               return 0;
-                       break;
-               case ALNUM:
-                       if (!nextchar)
-                               return(0);
-                       if (!isalpha(nextchar) && !isdigit(nextchar) &&
-                         nextchar != '_')
-                               return(0);
-                       nextchar = *++locinput;
-                       break;
-               case NALNUM:
-                       if (!nextchar && locinput >= regeol)
-                               return(0);
-                       if (isalpha(nextchar) || isdigit(nextchar) ||
-                         nextchar == '_')
-                               return(0);
-                       nextchar = *++locinput;
-                       break;
-               case NBOUND:
-               case BOUND:
-                       if (locinput == regbol) /* was last char in word? */
-                               ln = 0;
-                       else 
-                               ln = (isalpha(locinput[-1]) ||
-                                    isdigit(locinput[-1]) ||
-                                    locinput[-1] == '_' );
-                       n = (isalpha(nextchar) || isdigit(nextchar) ||
-                           nextchar == '_' );  /* is next char in word? */
-                       if ((ln == n) == (OP(scan) == BOUND))
-                               return(0);
-                       break;
-               case SPACE:
-                       if (!nextchar && locinput >= regeol)
-                               return(0);
-                       if (!isspace(nextchar))
-                               return(0);
-                       nextchar = *++locinput;
-                       break;
-               case NSPACE:
-                       if (!nextchar)
-                               return(0);
-                       if (isspace(nextchar))
-                               return(0);
-                       nextchar = *++locinput;
-                       break;
-               case DIGIT:
-                       if (!isdigit(nextchar))
-                               return(0);
-                       nextchar = *++locinput;
-                       break;
-               case NDIGIT:
-                       if (!nextchar && locinput >= regeol)
-                               return(0);
-                       if (isdigit(nextchar))
-                               return(0);
-                       nextchar = *++locinput;
-                       break;
-               case REF:
-               case REF+1:
-               case REF+2:
-               case REF+3:
-               case REF+4:
-               case REF+5:
-               case REF+6:
-               case REF+7:
-               case REF+8:
-               case REF+9:
-                       n = OP(scan) - REF;
-                       s = regmystartp[n];
-                       if (!s)
-                           return(0);
-                       if (!regmyendp[n])
-                           return(0);
-                       if (s == regmyendp[n])
-                           break;
-                       /* Inline the first character, for speed. */
-                       if (*s != nextchar)
-                               return(0);
-                       ln = regmyendp[n] - s;
-                       if (locinput + ln > regeol)
-                               return 0;
-                       if (ln > 1 && bcmp(s, locinput, ln) != 0)
-                               return(0);
-                       locinput += ln;
-                       nextchar = *locinput;
-                       break;
-
-               case NOTHING:
-                       break;
-               case BACK:
-                       break;
-               case OPEN+1:
-               case OPEN+2:
-               case OPEN+3:
-               case OPEN+4:
-               case OPEN+5:
-               case OPEN+6:
-               case OPEN+7:
-               case OPEN+8:
-               case OPEN+9:
-                       n = OP(scan) - OPEN;
-                       reginput = locinput;
+                       sayNO;
+                   }
 
-                       regmystartp[n] = locinput;      /* for REF */
-                       if (regmatch(next)) {
-                               /*
-                                * Don't set startp if some later
-                                * invocation of the same parentheses
-                                * already has.
-                                */
-                               if (regstartp[n] == NULL)
-                                       regstartp[n] = locinput;
-                               return(1);
-                       } else
-                               return(0);
-                       /* NOTREACHED */
-               case CLOSE+1:
-               case CLOSE+2:
-               case CLOSE+3:
-               case CLOSE+4:
-               case CLOSE+5:
-               case CLOSE+6:
-               case CLOSE+7:
-               case CLOSE+8:
-               case CLOSE+9: {
-                               n = OP(scan) - CLOSE;
-                               reginput = locinput;
-
-                               regmyendp[n] = locinput;        /* for REF */
-                               if (regmatch(next)) {
-                                       /*
-                                        * Don't set endp if some later
-                                        * invocation of the same parentheses
-                                        * already has.
-                                        */
-                                       if (regendp[n] == NULL) {
-                                               regendp[n] = locinput;
-                                               if (n > *reglastparen)
-                                                   *reglastparen = n;
-                                       }
-                                       return(1);
-                               } else
-                                       return(0);
+                   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;
+                   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? */
+                   cp = regcppush(cc->parenfloor);
+                   cc->cur = n;
+                   cc->lastloc = locinput;
+                   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))
+                   sayYES;
+               DEBUG_r(
+                   PerlIO_printf(Perl_debug_log, "%*s  failed...\n", REPORT_CODE_OFF+regindent*2, "")
+                   );
+               regcc->cur = ln;
+               regcc = cc;
+               cc->cur = n - 1;
+               cc->lastloc = lastloc;
+               sayNO;
+           }
+           /* NOT REACHED */
+       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(inner))
+                           sayYES;
+                       REGCP_UNWIND;
+                       for (n = *reglastparen; n > lastparen; n--)
+                           regendp[n] = 0;
+                       *reglastparen = n;
+                       scan = next;
+                       /*SUPPRESS 560*/
+                       if (n = (c1 == BRANCH ? NEXT_OFF(next) : ARG(next)))
+                           next += n;
+                       else
+                           next = NULL;
+                       inner = NEXTOPER(scan);
+                       if (c1 == BRANCHJ) {
+                           inner = NEXTOPER(inner);
                        }
-                       /*NOTREACHED*/
-               case BRANCH: {
-                               if (OP(next) != BRANCH)         /* No choice. */
-                                       next = NEXTOPER(scan);  /* Avoid recursion. */
-                               else {
-                                       do {
-                                               reginput = locinput;
-                                               if (regmatch(NEXTOPER(scan)))
-                                                       return(1);
-#ifdef REGALIGN
-                                               if (n = NEXT(scan))
-                                                   scan += n;
-                                               else
-                                                   scan = NULL;
-#else
-                                               scan = regnext(scan);
-#endif
-                                       } while (scan != NULL && OP(scan) == BRANCH);
-                                       return(0);
-                                       /* NOTREACHED */
-                               }
+                   } while (scan != NULL && OP(scan) == c1);
+                   sayNO;
+                   /* NOTREACHED */
+               }
+           }
+           break;
+       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;
                        }
-                       break;
-               case STAR:
-               case PLUS:
-                       /*
-                        * Lookahead to avoid useless match attempts
-                        * when we know what character comes next.
-                        */
-                       if (OP(next) == EXACTLY)
-                               nextchar = *(OPERAND(next)+1);
+                       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
-                               nextchar = -1000;
-                       ln = (OP(scan) == STAR) ? 0 : 1;
-                       reginput = locinput;
-                       n = regrepeat(NEXTOPER(scan));
-                       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;
+                           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;
                        }
-                       return(0);
-               case END:
-                       reginput = locinput; /* put where regtry can find it */
-                       return(1);      /* Success! */
-               default:
-                       printf("%x %d\n",scan,scan[1]);
-                       FAIL("regexp memory corruption");
+                   /* Couldn't or didn't -- back up. */
+                   n--;
+                   locinput -= l;
+                   reginput = locinput;
                }
-
-               scan = next;
+           }
+           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) + NODE_STEP_REGNODE;
+           goto repeat;
+       case STAR:
+           ln = 0;
+           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.
+           */
+           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;
+           reginput = locinput;
+           if (minmod) {
+               CHECKPOINT lastcp;
+               minmod = 0;
+               if (ln && regrepeat(scan, ln) < ln)
+                   sayNO;
+               REGCP_SET;
+               while (n >= ln || (n == REG_INFTY && ln > 0)) { /* ln overflow ? */
+                   /* If it could work, try it. */
+                   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))
+                           sayYES;
+                       REGCP_UNWIND;
+                   }
+                   /* Couldn't or didn't -- move forward. */
+                   reginput = locinput + ln;
+                   if (regrepeat(scan, 1)) {
+                       ln++;
+                       reginput = locinput + ln;
+                   } else
+                       sayNO;
+               }
+           }
+           else {
+               CHECKPOINT lastcp;
+               n = regrepeat(scan, n);
+               if (ln < n && regkind[(U8)OP(next)] == EOL &&
+                   (!multiline  || OP(next) == SEOL))
+                   ln = n;                     /* why back off? */
+               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;
+                   }
+               }
+           }
+           sayNO;
+           break;
+       case SUCCEED:
+       case END:
+           reginput = locinput;        /* put where regtry can find it */
+           sayYES;                     /* Success! */
+       case SUSPEND:
+           n = 1;
+           goto do_ifmatch;        
+       case UNLESSM:
+           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:
+           PerlIO_printf(PerlIO_stderr(), "%lx %d\n",
+                         (unsigned long)scan, OP(scan));
+           FAIL("regexp memory corruption");
        }
+       scan = next;
+    }
 
-       /*
-        * We get here only if there's trouble -- normally "case END" is
-        * the terminating point.
-        */
-       FAIL("corrupted regexp pointers");
-       /*NOTREACHED*/
-#ifdef lint
-       return 0;
+    /*
+    * We get here only if there's trouble -- normally "case END" is
+    * the terminating point.
+    */
+    FAIL("corrupted regexp pointers");
+    /*NOTREACHED*/
+    sayNO;
+
+yes:
+#ifdef DEBUGGING
+    regindent--;
+#endif
+    return 1;
+
+no:
+#ifdef DEBUGGING
+    regindent--;
 #endif
+    return 0;
 }
 
 /*
@@ -725,96 +1585,184 @@ char *prog;
  * That was true before, but now we assume scan - reginput is the count,
  * rather than incrementing count on every character.]
  */
-static int
-regrepeat(p)
-char *p;
+STATIC I32
+regrepeat(regnode *p, I32 max)
 {
-       register char *scan;
-       register char *opnd;
-       register int c;
-       register char *loceol = regeol;
+    register char *scan;
+    register char *opnd;
+    register I32 c;
+    register char *loceol = regeol;
 
-       scan = reginput;
-       opnd = OPERAND(p);
-       switch (OP(p)) {
-       case ANY:
-               while (scan < loceol && *scan != '\n')
-                       scan++;
-               break;
-       case EXACTLY:           /* length of string is 1 */
-               opnd++;
-               while (scan < loceol && *opnd == *scan)
-                       scan++;
-               break;
-       case ANYOF:
-       case ANYBUT:
-               c = UCHARAT(scan);
-               while (scan < loceol && !(opnd[c >> 3] & (1 << (c & 7)))) {
-                       scan++;
-                       c = UCHARAT(scan);
-               }
-               break;
-       case ALNUM:
-               while (isalpha(*scan) || isdigit(*scan) || *scan == '_')
-                       scan++;
-               break;
-       case NALNUM:
-               while (scan < loceol && (!isalpha(*scan) && !isdigit(*scan) &&
-                 *scan != '_'))
-                       scan++;
-               break;
-       case SPACE:
-               while (scan < loceol && isspace(*scan))
-                       scan++;
-               break;
-       case NSPACE:
-               while (scan < loceol && !isspace(*scan))
-                       scan++;
-               break;
-       case DIGIT:
-               while (isdigit(*scan))
-                       scan++;
-               break;
-       case NDIGIT:
-               while (scan < loceol && !isdigit(*scan))
-                       scan++;
-               break;
-       default:                /* Oh dear.  Called inappropriately. */
-               FAIL("internal regexp foulup");
-               /* NOTREACHED */
-       }
+    scan = reginput;
+    if (max != REG_INFTY && max < loceol - scan)
+      loceol = scan + max;
+    opnd = (char *) OPERAND(p);
+    switch (OP(p)) {
+    case ANY:
+       while (scan < loceol && *scan != '\n')
+           scan++;
+       break;
+    case SANY:
+       scan = loceol;
+       break;
+    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:
+       while (scan < loceol && REGINCLASS(opnd, *scan))
+           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++;
+       break;
+    case NDIGIT:
+       while (scan < loceol && !isDIGIT(*scan))
+           scan++;
+       break;
+    default:           /* Called on something of 0 width. */
+       break;          /* So match right here or not at all. */
+    }
 
-       c = scan - reginput;
-       reginput = scan;
+    c = scan - reginput;
+    reginput = scan;
 
-       return(c);
+    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 int 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;
+}
+
+/*
+ - regclass - determine if a character falls into a character class
+ */
 
-       offset = NEXT(p);
-       if (offset == 0)
-               return(NULL);
+STATIC bool
+reginclass(register char *p, register I32 c)
+{
+    char flags = *p;
+    bool match = FALSE;
 
-#ifdef REGALIGN
-       return(p+offset);
-#else
-       if (OP(p) == BACK)
-               return(p-offset);
+    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
-               return(p+offset);
-#endif
+           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;
 }
+
+
+