Change 30461 was wrong. As ext/re (re)builds the regexp engine with

[perl5.git] / regnodes.h

diff --git a/regnodes.h b/regnodes.h
index bbb49db..6f6e0b2 100644 (file)
--- a/regnodes.h
+++ b/regnodes.h
@@ -6,8 +6,8 @@
 
 /* Regops and State definitions */
 
 
 /* Regops and State definitions */
 

-#define REGNODE_MAX            83
-#define REGMATCH_STATE_MAX     121
+#define REGNODE_MAX            84
+#define REGMATCH_STATE_MAX     124

 
 #define        END                     0       /* 0000 End of program. */
 #define        SUCCEED                 1       /* 0x01 Return from a subroutine, basically. */
 
 #define        END                     0       /* 0000 End of program. */
 #define        SUCCEED                 1       /* 0x01 Return from a subroutine, basically. */


@@ -91,8 +91,9 @@
 #define        SKIP                    79      /* 0x4f On failure skip forward (to the mark) before retrying */
 #define        COMMIT                  80      /* 0x50 Pattern fails outright if backtracking through this */
 #define        CUTGROUP                81      /* 0x51 On failure go to the next alternation in the group */
 #define        SKIP                    79      /* 0x4f On failure skip forward (to the mark) before retrying */
 #define        COMMIT                  80      /* 0x50 Pattern fails outright if backtracking through this */
 #define        CUTGROUP                81      /* 0x51 On failure go to the next alternation in the group */

-#define        OPTIMIZED               82      /* 0x52 Placeholder for dump. */
-#define        PSEUDO                  83      /* 0x53 Pseudo opcode for internal use. */
+#define        KEEPS                   82      /* 0x52 $& begins here. */
+#define        OPTIMIZED               83      /* 0x53 Placeholder for dump. */
+#define        PSEUDO                  84      /* 0x54 Pseudo opcode for internal use. */

        /* ------------ States ------------- */
 #define        TRIE_next               (REGNODE_MAX + 1)       /* state for TRIE */
 #define        TRIE_next_fail          (REGNODE_MAX + 2)       /* state for TRIE */
        /* ------------ States ------------- */
 #define        TRIE_next               (REGNODE_MAX + 1)       /* state for TRIE */
 #define        TRIE_next_fail          (REGNODE_MAX + 2)       /* state for TRIE */


@@ -132,6 +133,8 @@
 #define        SKIP_next_fail          (REGNODE_MAX + 36)      /* state for SKIP */
 #define        CUTGROUP_next           (REGNODE_MAX + 37)      /* state for CUTGROUP */
 #define        CUTGROUP_next_fail      (REGNODE_MAX + 38)      /* state for CUTGROUP */
 #define        SKIP_next_fail          (REGNODE_MAX + 36)      /* state for SKIP */
 #define        CUTGROUP_next           (REGNODE_MAX + 37)      /* state for CUTGROUP */
 #define        CUTGROUP_next_fail      (REGNODE_MAX + 38)      /* state for CUTGROUP */

+#define        KEEPS_next              (REGNODE_MAX + 39)      /* state for KEEPS */
+#define        KEEPS_next_fail         (REGNODE_MAX + 40)      /* state for KEEPS */

 
 /* PL_regkind[] What type of regop or state is this. */
 
 
 /* PL_regkind[] What type of regop or state is this. */
 


@@ -206,9 +209,9 @@ EXTCONST U8 PL_regkind[] = {
        TRIE,           /* AHOCORASICKC           */
        GOSUB,          /* GOSUB                  */
        GOSTART,        /* GOSTART                */
        TRIE,           /* AHOCORASICKC           */
        GOSUB,          /* GOSUB                  */
        GOSTART,        /* GOSTART                */

-       NREF,           /* NREF                   */
-       NREF,           /* NREFF                  */
-       NREF,           /* NREFFL                 */
+       REF,            /* NREF                   */
+       REF,            /* NREFF                  */
+       REF,            /* NREFFL                 */

        NGROUPP,        /* NGROUPP                */
        INSUBP,         /* INSUBP                 */
        DEFINEP,        /* DEFINEP                */
        NGROUPP,        /* NGROUPP                */
        INSUBP,         /* INSUBP                 */
        DEFINEP,        /* DEFINEP                */


@@ -221,6 +224,7 @@ EXTCONST U8 PL_regkind[] = {
        VERB,           /* SKIP                   */
        VERB,           /* COMMIT                 */
        VERB,           /* CUTGROUP               */
        VERB,           /* SKIP                   */
        VERB,           /* COMMIT                 */
        VERB,           /* CUTGROUP               */

+       KEEPS,          /* KEEPS                  */

        NOTHING,        /* OPTIMIZED              */
        PSEUDO,         /* PSEUDO                 */
        /* ------------ States ------------- */
        NOTHING,        /* OPTIMIZED              */
        PSEUDO,         /* PSEUDO                 */
        /* ------------ States ------------- */


@@ -262,6 +266,8 @@ EXTCONST U8 PL_regkind[] = {
        SKIP,           /* SKIP_next_fail         */
        CUTGROUP,       /* CUTGROUP_next          */
        CUTGROUP,       /* CUTGROUP_next_fail     */
        SKIP,           /* SKIP_next_fail         */
        CUTGROUP,       /* CUTGROUP_next          */
        CUTGROUP,       /* CUTGROUP_next_fail     */

+       KEEPS,          /* KEEPS_next             */
+       KEEPS,          /* KEEPS_next_fail        */

 };
 #endif
 
 };
 #endif
 


@@ -351,6 +357,7 @@ static const U8 regarglen[] = {
        EXTRA_SIZE(struct regnode_1),           /* SKIP         */
        EXTRA_SIZE(struct regnode_1),           /* COMMIT       */
        EXTRA_SIZE(struct regnode_1),           /* CUTGROUP     */
        EXTRA_SIZE(struct regnode_1),           /* SKIP         */
        EXTRA_SIZE(struct regnode_1),           /* COMMIT       */
        EXTRA_SIZE(struct regnode_1),           /* CUTGROUP     */

+       0,                                      /* KEEPS        */

        0,                                      /* OPTIMIZED    */
        0,                                      /* PSEUDO       */
 };
        0,                                      /* OPTIMIZED    */
        0,                                      /* PSEUDO       */
 };


@@ -440,14 +447,19 @@ static const char reg_off_by_arg[] = {
        0,      /* SKIP         */
        0,      /* COMMIT       */
        0,      /* CUTGROUP     */
        0,      /* SKIP         */
        0,      /* COMMIT       */
        0,      /* CUTGROUP     */

+       0,      /* KEEPS        */

        0,      /* OPTIMIZED    */
        0,      /* PSEUDO       */
 };
 
        0,      /* OPTIMIZED    */
        0,      /* PSEUDO       */
 };
 

+#endif /* REG_COMP_C */
+

 /* reg_name[] - Opcode/state names in string form, for debugging */
 
 /* reg_name[] - Opcode/state names in string form, for debugging */
 

-#ifdef DEBUGGING
-const char * reg_name[] = {
+#ifndef DOINIT
+EXTCONST char * PL_reg_name[];
+#else
+EXTCONST char * PL_reg_name[] = {

        "END",                          /* 0000 */
        "SUCCEED",                      /* 0x01 */
        "BOL",                          /* 0x02 */
        "END",                          /* 0000 */
        "SUCCEED",                      /* 0x01 */
        "BOL",                          /* 0x02 */


@@ -530,8 +542,9 @@ const char * reg_name[] = {
        "SKIP",                         /* 0x4f */
        "COMMIT",                       /* 0x50 */
        "CUTGROUP",                     /* 0x51 */
        "SKIP",                         /* 0x4f */
        "COMMIT",                       /* 0x50 */
        "CUTGROUP",                     /* 0x51 */

-       "OPTIMIZED",                    /* 0x52 */
-       "PSEUDO",                       /* 0x53 */
+       "KEEPS",                        /* 0x52 */
+       "OPTIMIZED",                    /* 0x53 */
+       "PSEUDO",                       /* 0x54 */

        /* ------------ States ------------- */
        "TRIE_next",                    /* REGNODE_MAX +0x01 */
        "TRIE_next_fail",               /* REGNODE_MAX +0x02 */
        /* ------------ States ------------- */
        "TRIE_next",                    /* REGNODE_MAX +0x01 */
        "TRIE_next_fail",               /* REGNODE_MAX +0x02 */


@@ -571,12 +584,9 @@ const char * reg_name[] = {
        "SKIP_next_fail",               /* REGNODE_MAX +0x24 */
        "CUTGROUP_next",                /* REGNODE_MAX +0x25 */
        "CUTGROUP_next_fail",           /* REGNODE_MAX +0x26 */
        "SKIP_next_fail",               /* REGNODE_MAX +0x24 */
        "CUTGROUP_next",                /* REGNODE_MAX +0x25 */
        "CUTGROUP_next_fail",           /* REGNODE_MAX +0x26 */

+       "KEEPS_next",                   /* REGNODE_MAX +0x27 */
+       "KEEPS_next_fail",              /* REGNODE_MAX +0x28 */

 };
 };

-#endif /* DEBUGGING */
-#else
-#ifdef DEBUGGING
-extern const char * reg_name[];
-#endif
-#endif /* REG_COMP_C */
+#endif /* DOINIT */

 
 /* ex: set ro: */
 
 /* ex: set ro: */