more jumpables, and hit-bit bug

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

diff --git a/regexec.c b/regexec.c
index 954e905..cad6a40 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -129,12 +129,20 @@
 #define LOAD_UTF8_CHARCLASS(a,b) STMT_START { if (!CAT2(PL_utf8_,a)) (void)CAT2(is_utf8_, a)((U8*)b); } STMT_END
 
 /* for use after a quantifier and before an EXACT-like node -- japhy */
-#define NEXT_IMPT(from_rn,to_rn) STMT_START { \
-    to_rn = from_rn; \
-    while (PL_regkind[(U8)OP(to_rn)] == OPEN || OP(to_rn) == EVAL) \
-       to_rn += NEXT_OFF(to_rn); \
+#define JUMPABLE(rn) ( \
+    OP(rn) == OPEN || OP(rn) == CLOSE || OP(rn) == EVAL || \
+    OP(rn) == SUSPEND || OP(rn) == IFMATCH \
+)
+
+#define NEAR_EXACT(rn) (PL_regkind[(U8)OP(rn)] == EXACT || JUMPABLE(rn))
+
+#define NEXT_IMPT(rn) STMT_START { \
+    while (JUMPABLE(rn)) \
+       if (OP(rn) == SUSPEND || OP(rn) == IFMATCH) \
+           rn = NEXTOPER(NEXTOPER(rn)); \
+       else rn += NEXT_OFF(rn); \
 } STMT_END 
- 
+
 static void restore_pos(pTHX_ void *arg);
 
 STATIC CHECKPOINT
@@ -3044,15 +3052,11 @@ S_regmatch(pTHX_ regnode *prog)
                if (ln && l == 0)
                    n = ln;     /* don't backtrack */
                locinput = PL_reginput;
-               if (
-                   PL_regkind[(U8)OP(next)] == EXACT ||
-                   PL_regkind[(U8)OP(next)] == OPEN ||
-                   OP(next) == EVAL
-               ) {
+               if (NEAR_EXACT(next)) {
                    regnode *text_node = next;
 
                    if (PL_regkind[(U8)OP(next)] != EXACT)
-                       NEXT_IMPT(next, text_node);
+                       NEXT_IMPT(text_node);
 
                    if (PL_regkind[(U8)OP(text_node)] != EXACT) {
                        c1 = c2 = -1000;
@@ -3117,15 +3121,11 @@ S_regmatch(pTHX_ regnode *prog)
                                  (IV) n, (IV)l)
                    );
                if (n >= ln) {
-                   if (
-                       PL_regkind[(U8)OP(next)] == EXACT ||
-                       PL_regkind[(U8)OP(next)] == OPEN ||
-                       OP(next) == EVAL
-                   ) {
+                   if (NEAR_EXACT(next)) {
                        regnode *text_node = next;
 
                        if (PL_regkind[(U8)OP(next)] != EXACT)
-                           NEXT_IMPT(next, text_node);
+                           NEXT_IMPT(text_node);
 
                        if (PL_regkind[(U8)OP(text_node)] != EXACT) {
                            c1 = c2 = -1000;
@@ -3215,16 +3215,12 @@ S_regmatch(pTHX_ regnode *prog)
            * of the quantifier and the EXACT-like node.  -- japhy
            */
 
-           if (
-               PL_regkind[(U8)OP(next)] == EXACT ||
-               PL_regkind[(U8)OP(next)] == OPEN ||
-               OP(next) == EVAL
-           ) {
+           if (NEAR_EXACT(next)) {
                U8 *s;
                regnode *text_node = next;
 
                if (PL_regkind[(U8)OP(next)] != EXACT)
-                   NEXT_IMPT(next, text_node);
+                   NEXT_IMPT(text_node);
 
                if (PL_regkind[(U8)OP(text_node)] != EXACT) {
                    c1 = c2 = -1000;
@@ -3286,7 +3282,7 @@ S_regmatch(pTHX_ regnode *prog)
                        /* Find place 'next' could work */
                        if (!do_utf8) {
                            if (c1 == c2) {
-                               while (locinput <= e && *locinput != c1)
+                               while (locinput <= e && (U8) *locinput != (U8) c1)
                                    locinput++;
                            } else {
                                while (locinput <= e