This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Add ANYOFD regex node
authorKarl Williamson <khw@cpan.org>
Fri, 21 Aug 2015 19:06:53 +0000 (13:06 -0600)
committerKarl Williamson <khw@cpan.org>
Mon, 24 Aug 2015 18:11:33 +0000 (12:11 -0600)
This is like an ANYOF node, but just for when /d is in effect.  It will
be used in future commits

pod/perldebguts.pod
regcomp.c
regcomp.sym
regexec.c
regnodes.h

index b7a3c5d..eb0a6ca 100644 (file)
@@ -594,6 +594,7 @@ will be lost.
  SANY            no         Match any one character.
  ANYOF           sv 1       Match character in (or not in) this class,
                             single char match only
+ ANYOFD          sv 1       Like ANYOF, but /d is in effect
  ANYOFL          sv 1       Like ANYOF, but /l is in effect
 
  # POSIX Character Classes:
index 4264274..5c5cda9 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -5097,6 +5097,7 @@ PerlIO_printf(Perl_debug_log, "LHS=%"UVuf" RHS=%"UVuf"\n",
                    }
                    break;
 
+                case ANYOFD:
                 case ANYOFL:
                 case ANYOF:
                    if (flags & SCF_DO_STCLASS_AND)
@@ -14262,7 +14263,9 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth,
     ret = reganode(pRExC_state,
                    (LOC)
                     ? ANYOFL
-                    : ANYOF,
+                    : (DEPENDS_SEMANTICS)
+                      ? ANYOFD
+                      : ANYOF,
                    0);
 
     if (SIZE_ONLY) {
index f385dc6..201c65e 100644 (file)
@@ -57,6 +57,7 @@ NBOUNDA     NBOUND,     no        ; Match "" betweeen any \w\w or \W\W, where \w
 REG_ANY     REG_ANY,    no 0 S    ; Match any one character (except newline).
 SANY        REG_ANY,    no 0 S    ; Match any one character.
 ANYOF       ANYOF,      sv 1 S    ; Match character in (or not in) this class, single char match only
+ANYOFD      ANYOF,      sv 1 S    ; Like ANYOF, but /d is in effect
 ANYOFL      ANYOF,      sv 1 S    ; Like ANYOF, but /l is in effect
 
 #* POSIX Character Classes:
index f2517e5..4aa80fb 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -1823,6 +1823,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s,
     case ANYOFL:
         _CHECK_AND_WARN_PROBLEMATIC_LOCALE;
         /* FALLTHROUGH */
+    case ANYOFD:
     case ANYOF:
         if (utf8_target) {
             REXEC_FBC_UTF8_CLASS_SCAN(
@@ -5730,6 +5731,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
        case ANYOFL:  /*  /[abc]/l      */
             _CHECK_AND_WARN_PROBLEMATIC_LOCALE;
             /* FALLTHROUGH */
+       case ANYOFD:  /*   /[abc]/d       */
        case ANYOF:  /*   /[abc]/       */
             if (NEXTCHR_IS_EOS)
                 sayNO;
@@ -8244,6 +8246,7 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p,
     case ANYOFL:
         _CHECK_AND_WARN_PROBLEMATIC_LOCALE;
         /* FALLTHROUGH */
+    case ANYOFD:
     case ANYOF:
        if (utf8_target) {
            while (hardcount < max
index 88227ee..cc3da9d 100644 (file)
@@ -6,8 +6,8 @@
 
 /* Regops and State definitions */
 
-#define REGNODE_MAX            92
-#define REGMATCH_STATE_MAX     132
+#define REGNODE_MAX            93
+#define REGMATCH_STATE_MAX     133
 
 #define        END                     0       /* 0000 End of program. */
 #define        SUCCEED                 1       /* 0x01 Return from a subroutine, basically. */
 #define        REG_ANY                 16      /* 0x10 Match any one character (except newline). */
 #define        SANY                    17      /* 0x11 Match any one character. */
 #define        ANYOF                   18      /* 0x12 Match character in (or not in) this class, single char match only */
-#define        ANYOFL                  19      /* 0x13 Like ANYOF, but /l is in effect */
-#define        POSIXD                  20      /* 0x14 Some [[:class:]] under /d; the FLAGS field gives which one */
-#define        POSIXL                  21      /* 0x15 Some [[:class:]] under /l; the FLAGS field gives which one */
-#define        POSIXU                  22      /* 0x16 Some [[:class:]] under /u; the FLAGS field gives which one */
-#define        POSIXA                  23      /* 0x17 Some [[:class:]] under /a; the FLAGS field gives which one */
-#define        NPOSIXD                 24      /* 0x18 complement of POSIXD, [[:^class:]] */
-#define        NPOSIXL                 25      /* 0x19 complement of POSIXL, [[:^class:]] */
-#define        NPOSIXU                 26      /* 0x1a complement of POSIXU, [[:^class:]] */
-#define        NPOSIXA                 27      /* 0x1b complement of POSIXA, [[:^class:]] */
-#define        CLUMP                   28      /* 0x1c Match any extended grapheme cluster sequence */
-#define        BRANCH                  29      /* 0x1d Match this alternative, or the next... */
-#define        EXACT                   30      /* 0x1e Match this string (preceded by length). */
-#define        EXACTL                  31      /* 0x1f Like EXACT, but /l is in effect (used so locale-related warnings can be checked for). */
-#define        EXACTF                  32      /* 0x20 Match this non-UTF-8 string (not guaranteed to be folded) using /id rules (w/len). */
-#define        EXACTFL                 33      /* 0x21 Match this string (not guaranteed to be folded) using /il rules (w/len). */
-#define        EXACTFU                 34      /* 0x22 Match this string (folded iff in UTF-8, length in folding doesn't change if not in UTF-8) using /iu rules (w/len). */
-#define        EXACTFA                 35      /* 0x23 Match this string (not guaranteed to be folded) using /iaa rules (w/len). */
-#define        EXACTFU_SS              36      /* 0x24 Match this string (folded iff in UTF-8, length in folding may change even if not in UTF-8) using /iu rules (w/len). */
-#define        EXACTFLU8               37      /* 0x25 Rare cirucmstances: like EXACTFU, but is under /l, UTF-8, folded, and everything in it is above 255. */
-#define        EXACTFA_NO_TRIE         38      /* 0x26 Match this string (which is not trie-able; not guaranteed to be folded) using /iaa rules (w/len). */
-#define        NOTHING                 39      /* 0x27 Match empty string. */
-#define        TAIL                    40      /* 0x28 Match empty string. Can jump here from outside. */
-#define        STAR                    41      /* 0x29 Match this (simple) thing 0 or more times. */
-#define        PLUS                    42      /* 0x2a Match this (simple) thing 1 or more times. */
-#define        CURLY                   43      /* 0x2b Match this simple thing {n,m} times. */
-#define        CURLYN                  44      /* 0x2c Capture next-after-this simple thing */
-#define        CURLYM                  45      /* 0x2d Capture this medium-complex thing {n,m} times. */
-#define        CURLYX                  46      /* 0x2e Match this complex thing {n,m} times. */
-#define        WHILEM                  47      /* 0x2f Do curly processing and see if rest matches. */
-#define        OPEN                    48      /* 0x30 Mark this point in input as start of #n. */
-#define        CLOSE                   49      /* 0x31 Analogous to OPEN. */
-#define        REF                     50      /* 0x32 Match some already matched string */
-#define        REFF                    51      /* 0x33 Match already matched string, folded using native charset rules for non-utf8 */
-#define        REFFL                   52      /* 0x34 Match already matched string, folded in loc. */
-#define        REFFU                   53      /* 0x35 Match already matched string, folded using unicode rules for non-utf8 */
-#define        REFFA                   54      /* 0x36 Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
-#define        NREF                    55      /* 0x37 Match some already matched string */
-#define        NREFF                   56      /* 0x38 Match already matched string, folded using native charset rules for non-utf8 */
-#define        NREFFL                  57      /* 0x39 Match already matched string, folded in loc. */
-#define        NREFFU                  58      /* 0x3a Match already matched string, folded using unicode rules for non-utf8 */
-#define        NREFFA                  59      /* 0x3b Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
-#define        LONGJMP                 60      /* 0x3c Jump far away. */
-#define        BRANCHJ                 61      /* 0x3d BRANCH with long offset. */
-#define        IFMATCH                 62      /* 0x3e Succeeds if the following matches. */
-#define        UNLESSM                 63      /* 0x3f Fails if the following matches. */
-#define        SUSPEND                 64      /* 0x40 "Independent" sub-RE. */
-#define        IFTHEN                  65      /* 0x41 Switch, should be preceded by switcher. */
-#define        GROUPP                  66      /* 0x42 Whether the group matched. */
-#define        EVAL                    67      /* 0x43 Execute some Perl code. */
-#define        MINMOD                  68      /* 0x44 Next operator is not greedy. */
-#define        LOGICAL                 69      /* 0x45 Next opcode should set the flag only. */
-#define        RENUM                   70      /* 0x46 Group with independently numbered parens. */
-#define        TRIE                    71      /* 0x47 Match many EXACT(F[ALU]?)? at once. flags==type */
-#define        TRIEC                   72      /* 0x48 Same as TRIE, but with embedded charclass data */
-#define        AHOCORASICK             73      /* 0x49 Aho Corasick stclass. flags==type */
-#define        AHOCORASICKC            74      /* 0x4a Same as AHOCORASICK, but with embedded charclass data */
-#define        GOSUB                   75      /* 0x4b recurse to paren arg1 at (signed) ofs arg2 */
-#define        GOSTART                 76      /* 0x4c recurse to start of pattern */
-#define        NGROUPP                 77      /* 0x4d Whether the group matched. */
-#define        INSUBP                  78      /* 0x4e Whether we are in a specific recurse. */
-#define        DEFINEP                 79      /* 0x4f Never execute directly. */
-#define        ENDLIKE                 80      /* 0x50 Used only for the type field of verbs */
-#define        OPFAIL                  81      /* 0x51 Same as (?!) */
-#define        ACCEPT                  82      /* 0x52 Accepts the current matched string. */
-#define        VERB                    83      /* 0x53 Used only for the type field of verbs */
-#define        PRUNE                   84      /* 0x54 Pattern fails at this startpoint if no-backtracking through this */
-#define        MARKPOINT               85      /* 0x55 Push the current location for rollback by cut. */
-#define        SKIP                    86      /* 0x56 On failure skip forward (to the mark) before retrying */
-#define        COMMIT                  87      /* 0x57 Pattern fails outright if backtracking through this */
-#define        CUTGROUP                88      /* 0x58 On failure go to the next alternation in the group */
-#define        KEEPS                   89      /* 0x59 $& begins here. */
-#define        LNBREAK                 90      /* 0x5a generic newline pattern */
-#define        OPTIMIZED               91      /* 0x5b Placeholder for dump. */
-#define        PSEUDO                  92      /* 0x5c Pseudo opcode for internal use. */
+#define        ANYOFD                  19      /* 0x13 Like ANYOF, but /d is in effect */
+#define        ANYOFL                  20      /* 0x14 Like ANYOF, but /l is in effect */
+#define        POSIXD                  21      /* 0x15 Some [[:class:]] under /d; the FLAGS field gives which one */
+#define        POSIXL                  22      /* 0x16 Some [[:class:]] under /l; the FLAGS field gives which one */
+#define        POSIXU                  23      /* 0x17 Some [[:class:]] under /u; the FLAGS field gives which one */
+#define        POSIXA                  24      /* 0x18 Some [[:class:]] under /a; the FLAGS field gives which one */
+#define        NPOSIXD                 25      /* 0x19 complement of POSIXD, [[:^class:]] */
+#define        NPOSIXL                 26      /* 0x1a complement of POSIXL, [[:^class:]] */
+#define        NPOSIXU                 27      /* 0x1b complement of POSIXU, [[:^class:]] */
+#define        NPOSIXA                 28      /* 0x1c complement of POSIXA, [[:^class:]] */
+#define        CLUMP                   29      /* 0x1d Match any extended grapheme cluster sequence */
+#define        BRANCH                  30      /* 0x1e Match this alternative, or the next... */
+#define        EXACT                   31      /* 0x1f Match this string (preceded by length). */
+#define        EXACTL                  32      /* 0x20 Like EXACT, but /l is in effect (used so locale-related warnings can be checked for). */
+#define        EXACTF                  33      /* 0x21 Match this non-UTF-8 string (not guaranteed to be folded) using /id rules (w/len). */
+#define        EXACTFL                 34      /* 0x22 Match this string (not guaranteed to be folded) using /il rules (w/len). */
+#define        EXACTFU                 35      /* 0x23 Match this string (folded iff in UTF-8, length in folding doesn't change if not in UTF-8) using /iu rules (w/len). */
+#define        EXACTFA                 36      /* 0x24 Match this string (not guaranteed to be folded) using /iaa rules (w/len). */
+#define        EXACTFU_SS              37      /* 0x25 Match this string (folded iff in UTF-8, length in folding may change even if not in UTF-8) using /iu rules (w/len). */
+#define        EXACTFLU8               38      /* 0x26 Rare cirucmstances: like EXACTFU, but is under /l, UTF-8, folded, and everything in it is above 255. */
+#define        EXACTFA_NO_TRIE         39      /* 0x27 Match this string (which is not trie-able; not guaranteed to be folded) using /iaa rules (w/len). */
+#define        NOTHING                 40      /* 0x28 Match empty string. */
+#define        TAIL                    41      /* 0x29 Match empty string. Can jump here from outside. */
+#define        STAR                    42      /* 0x2a Match this (simple) thing 0 or more times. */
+#define        PLUS                    43      /* 0x2b Match this (simple) thing 1 or more times. */
+#define        CURLY                   44      /* 0x2c Match this simple thing {n,m} times. */
+#define        CURLYN                  45      /* 0x2d Capture next-after-this simple thing */
+#define        CURLYM                  46      /* 0x2e Capture this medium-complex thing {n,m} times. */
+#define        CURLYX                  47      /* 0x2f Match this complex thing {n,m} times. */
+#define        WHILEM                  48      /* 0x30 Do curly processing and see if rest matches. */
+#define        OPEN                    49      /* 0x31 Mark this point in input as start of #n. */
+#define        CLOSE                   50      /* 0x32 Analogous to OPEN. */
+#define        REF                     51      /* 0x33 Match some already matched string */
+#define        REFF                    52      /* 0x34 Match already matched string, folded using native charset rules for non-utf8 */
+#define        REFFL                   53      /* 0x35 Match already matched string, folded in loc. */
+#define        REFFU                   54      /* 0x36 Match already matched string, folded using unicode rules for non-utf8 */
+#define        REFFA                   55      /* 0x37 Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
+#define        NREF                    56      /* 0x38 Match some already matched string */
+#define        NREFF                   57      /* 0x39 Match already matched string, folded using native charset rules for non-utf8 */
+#define        NREFFL                  58      /* 0x3a Match already matched string, folded in loc. */
+#define        NREFFU                  59      /* 0x3b Match already matched string, folded using unicode rules for non-utf8 */
+#define        NREFFA                  60      /* 0x3c Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
+#define        LONGJMP                 61      /* 0x3d Jump far away. */
+#define        BRANCHJ                 62      /* 0x3e BRANCH with long offset. */
+#define        IFMATCH                 63      /* 0x3f Succeeds if the following matches. */
+#define        UNLESSM                 64      /* 0x40 Fails if the following matches. */
+#define        SUSPEND                 65      /* 0x41 "Independent" sub-RE. */
+#define        IFTHEN                  66      /* 0x42 Switch, should be preceded by switcher. */
+#define        GROUPP                  67      /* 0x43 Whether the group matched. */
+#define        EVAL                    68      /* 0x44 Execute some Perl code. */
+#define        MINMOD                  69      /* 0x45 Next operator is not greedy. */
+#define        LOGICAL                 70      /* 0x46 Next opcode should set the flag only. */
+#define        RENUM                   71      /* 0x47 Group with independently numbered parens. */
+#define        TRIE                    72      /* 0x48 Match many EXACT(F[ALU]?)? at once. flags==type */
+#define        TRIEC                   73      /* 0x49 Same as TRIE, but with embedded charclass data */
+#define        AHOCORASICK             74      /* 0x4a Aho Corasick stclass. flags==type */
+#define        AHOCORASICKC            75      /* 0x4b Same as AHOCORASICK, but with embedded charclass data */
+#define        GOSUB                   76      /* 0x4c recurse to paren arg1 at (signed) ofs arg2 */
+#define        GOSTART                 77      /* 0x4d recurse to start of pattern */
+#define        NGROUPP                 78      /* 0x4e Whether the group matched. */
+#define        INSUBP                  79      /* 0x4f Whether we are in a specific recurse. */
+#define        DEFINEP                 80      /* 0x50 Never execute directly. */
+#define        ENDLIKE                 81      /* 0x51 Used only for the type field of verbs */
+#define        OPFAIL                  82      /* 0x52 Same as (?!) */
+#define        ACCEPT                  83      /* 0x53 Accepts the current matched string. */
+#define        VERB                    84      /* 0x54 Used only for the type field of verbs */
+#define        PRUNE                   85      /* 0x55 Pattern fails at this startpoint if no-backtracking through this */
+#define        MARKPOINT               86      /* 0x56 Push the current location for rollback by cut. */
+#define        SKIP                    87      /* 0x57 On failure skip forward (to the mark) before retrying */
+#define        COMMIT                  88      /* 0x58 Pattern fails outright if backtracking through this */
+#define        CUTGROUP                89      /* 0x59 On failure go to the next alternation in the group */
+#define        KEEPS                   90      /* 0x5a $& begins here. */
+#define        LNBREAK                 91      /* 0x5b generic newline pattern */
+#define        OPTIMIZED               92      /* 0x5c Placeholder for dump. */
+#define        PSEUDO                  93      /* 0x5d 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 */
@@ -171,6 +172,7 @@ EXTCONST U8 PL_regkind[] = {
        REG_ANY,        /* REG_ANY                */
        REG_ANY,        /* SANY                   */
        ANYOF,          /* ANYOF                  */
+       ANYOF,          /* ANYOFD                 */
        ANYOF,          /* ANYOFL                 */
        POSIXD,         /* POSIXD                 */
        POSIXD,         /* POSIXL                 */
@@ -312,6 +314,7 @@ static const U8 regarglen[] = {
        0,                                      /* REG_ANY      */
        0,                                      /* SANY         */
        EXTRA_SIZE(struct regnode_1),           /* ANYOF        */
+       EXTRA_SIZE(struct regnode_1),           /* ANYOFD       */
        EXTRA_SIZE(struct regnode_1),           /* ANYOFL       */
        0,                                      /* POSIXD       */
        0,                                      /* POSIXL       */
@@ -410,6 +413,7 @@ static const char reg_off_by_arg[] = {
        0,      /* REG_ANY      */
        0,      /* SANY         */
        0,      /* ANYOF        */
+       0,      /* ANYOFD       */
        0,      /* ANYOFL       */
        0,      /* POSIXD       */
        0,      /* POSIXL       */
@@ -513,80 +517,81 @@ EXTCONST char * const PL_reg_name[] = {
        "REG_ANY",                      /* 0x10 */
        "SANY",                         /* 0x11 */
        "ANYOF",                        /* 0x12 */
-       "ANYOFL",                       /* 0x13 */
-       "POSIXD",                       /* 0x14 */
-       "POSIXL",                       /* 0x15 */
-       "POSIXU",                       /* 0x16 */
-       "POSIXA",                       /* 0x17 */
-       "NPOSIXD",                      /* 0x18 */
-       "NPOSIXL",                      /* 0x19 */
-       "NPOSIXU",                      /* 0x1a */
-       "NPOSIXA",                      /* 0x1b */
-       "CLUMP",                        /* 0x1c */
-       "BRANCH",                       /* 0x1d */
-       "EXACT",                        /* 0x1e */
-       "EXACTL",                       /* 0x1f */
-       "EXACTF",                       /* 0x20 */
-       "EXACTFL",                      /* 0x21 */
-       "EXACTFU",                      /* 0x22 */
-       "EXACTFA",                      /* 0x23 */
-       "EXACTFU_SS",                   /* 0x24 */
-       "EXACTFLU8",                    /* 0x25 */
-       "EXACTFA_NO_TRIE",              /* 0x26 */
-       "NOTHING",                      /* 0x27 */
-       "TAIL",                         /* 0x28 */
-       "STAR",                         /* 0x29 */
-       "PLUS",                         /* 0x2a */
-       "CURLY",                        /* 0x2b */
-       "CURLYN",                       /* 0x2c */
-       "CURLYM",                       /* 0x2d */
-       "CURLYX",                       /* 0x2e */
-       "WHILEM",                       /* 0x2f */
-       "OPEN",                         /* 0x30 */
-       "CLOSE",                        /* 0x31 */
-       "REF",                          /* 0x32 */
-       "REFF",                         /* 0x33 */
-       "REFFL",                        /* 0x34 */
-       "REFFU",                        /* 0x35 */
-       "REFFA",                        /* 0x36 */
-       "NREF",                         /* 0x37 */
-       "NREFF",                        /* 0x38 */
-       "NREFFL",                       /* 0x39 */
-       "NREFFU",                       /* 0x3a */
-       "NREFFA",                       /* 0x3b */
-       "LONGJMP",                      /* 0x3c */
-       "BRANCHJ",                      /* 0x3d */
-       "IFMATCH",                      /* 0x3e */
-       "UNLESSM",                      /* 0x3f */
-       "SUSPEND",                      /* 0x40 */
-       "IFTHEN",                       /* 0x41 */
-       "GROUPP",                       /* 0x42 */
-       "EVAL",                         /* 0x43 */
-       "MINMOD",                       /* 0x44 */
-       "LOGICAL",                      /* 0x45 */
-       "RENUM",                        /* 0x46 */
-       "TRIE",                         /* 0x47 */
-       "TRIEC",                        /* 0x48 */
-       "AHOCORASICK",                  /* 0x49 */
-       "AHOCORASICKC",                 /* 0x4a */
-       "GOSUB",                        /* 0x4b */
-       "GOSTART",                      /* 0x4c */
-       "NGROUPP",                      /* 0x4d */
-       "INSUBP",                       /* 0x4e */
-       "DEFINEP",                      /* 0x4f */
-       "ENDLIKE",                      /* 0x50 */
-       "OPFAIL",                       /* 0x51 */
-       "ACCEPT",                       /* 0x52 */
-       "VERB",                         /* 0x53 */
-       "PRUNE",                        /* 0x54 */
-       "MARKPOINT",                    /* 0x55 */
-       "SKIP",                         /* 0x56 */
-       "COMMIT",                       /* 0x57 */
-       "CUTGROUP",                     /* 0x58 */
-       "KEEPS",                        /* 0x59 */
-       "LNBREAK",                      /* 0x5a */
-       "OPTIMIZED",                    /* 0x5b */
-       "PSEUDO",                       /* 0x5c */
+       "ANYOFD",                       /* 0x13 */
+       "ANYOFL",                       /* 0x14 */
+       "POSIXD",                       /* 0x15 */
+       "POSIXL",                       /* 0x16 */
+       "POSIXU",                       /* 0x17 */
+       "POSIXA",                       /* 0x18 */
+       "NPOSIXD",                      /* 0x19 */
+       "NPOSIXL",                      /* 0x1a */
+       "NPOSIXU",                      /* 0x1b */
+       "NPOSIXA",                      /* 0x1c */
+       "CLUMP",                        /* 0x1d */
+       "BRANCH",                       /* 0x1e */
+       "EXACT",                        /* 0x1f */
+       "EXACTL",                       /* 0x20 */
+       "EXACTF",                       /* 0x21 */
+       "EXACTFL",                      /* 0x22 */
+       "EXACTFU",                      /* 0x23 */
+       "EXACTFA",                      /* 0x24 */
+       "EXACTFU_SS",                   /* 0x25 */
+       "EXACTFLU8",                    /* 0x26 */
+       "EXACTFA_NO_TRIE",              /* 0x27 */
+       "NOTHING",                      /* 0x28 */
+       "TAIL",                         /* 0x29 */
+       "STAR",                         /* 0x2a */
+       "PLUS",                         /* 0x2b */
+       "CURLY",                        /* 0x2c */
+       "CURLYN",                       /* 0x2d */
+       "CURLYM",                       /* 0x2e */
+       "CURLYX",                       /* 0x2f */
+       "WHILEM",                       /* 0x30 */
+       "OPEN",                         /* 0x31 */
+       "CLOSE",                        /* 0x32 */
+       "REF",                          /* 0x33 */
+       "REFF",                         /* 0x34 */
+       "REFFL",                        /* 0x35 */
+       "REFFU",                        /* 0x36 */
+       "REFFA",                        /* 0x37 */
+       "NREF",                         /* 0x38 */
+       "NREFF",                        /* 0x39 */
+       "NREFFL",                       /* 0x3a */
+       "NREFFU",                       /* 0x3b */
+       "NREFFA",                       /* 0x3c */
+       "LONGJMP",                      /* 0x3d */
+       "BRANCHJ",                      /* 0x3e */
+       "IFMATCH",                      /* 0x3f */
+       "UNLESSM",                      /* 0x40 */
+       "SUSPEND",                      /* 0x41 */
+       "IFTHEN",                       /* 0x42 */
+       "GROUPP",                       /* 0x43 */
+       "EVAL",                         /* 0x44 */
+       "MINMOD",                       /* 0x45 */
+       "LOGICAL",                      /* 0x46 */
+       "RENUM",                        /* 0x47 */
+       "TRIE",                         /* 0x48 */
+       "TRIEC",                        /* 0x49 */
+       "AHOCORASICK",                  /* 0x4a */
+       "AHOCORASICKC",                 /* 0x4b */
+       "GOSUB",                        /* 0x4c */
+       "GOSTART",                      /* 0x4d */
+       "NGROUPP",                      /* 0x4e */
+       "INSUBP",                       /* 0x4f */
+       "DEFINEP",                      /* 0x50 */
+       "ENDLIKE",                      /* 0x51 */
+       "OPFAIL",                       /* 0x52 */
+       "ACCEPT",                       /* 0x53 */
+       "VERB",                         /* 0x54 */
+       "PRUNE",                        /* 0x55 */
+       "MARKPOINT",                    /* 0x56 */
+       "SKIP",                         /* 0x57 */
+       "COMMIT",                       /* 0x58 */
+       "CUTGROUP",                     /* 0x59 */
+       "KEEPS",                        /* 0x5a */
+       "LNBREAK",                      /* 0x5b */
+       "OPTIMIZED",                    /* 0x5c */
+       "PSEUDO",                       /* 0x5d */
        /* ------------ States ------------- */
        "TRIE_next",                    /* REGNODE_MAX +0x01 */
        "TRIE_next_fail",               /* REGNODE_MAX +0x02 */
@@ -720,7 +725,7 @@ EXTCONST U8 PL_varies[] __attribute__deprecated__ = {
 EXTCONST U8 PL_varies_bitmask[];
 #else
 EXTCONST U8 PL_varies_bitmask[] = {
-    0x00, 0x00, 0x00, 0x30, 0x00, 0xFE, 0xFC, 0x2F, 0x03, 0x00, 0x00, 0x00
+    0x00, 0x00, 0x00, 0x60, 0x00, 0xFC, 0xF9, 0x5F, 0x06, 0x00, 0x00, 0x00
 };
 #endif /* DOINIT */
 
@@ -732,8 +737,8 @@ EXTCONST U8 PL_varies_bitmask[] = {
 EXTCONST U8 PL_simple[] __attribute__deprecated__;
 #else
 EXTCONST U8 PL_simple[] __attribute__deprecated__ = {
-    REG_ANY, SANY, ANYOF, ANYOFL, POSIXD, POSIXL, POSIXU, POSIXA, NPOSIXD,
-    NPOSIXL, NPOSIXU, NPOSIXA,
+    REG_ANY, SANY, ANYOF, ANYOFD, ANYOFL, POSIXD, POSIXL, POSIXU, POSIXA,
+    NPOSIXD, NPOSIXL, NPOSIXU, NPOSIXA,
     0
 };
 #endif /* DOINIT */
@@ -742,7 +747,7 @@ EXTCONST U8 PL_simple[] __attribute__deprecated__ = {
 EXTCONST U8 PL_simple_bitmask[];
 #else
 EXTCONST U8 PL_simple_bitmask[] = {
-    0x00, 0x00, 0xFF, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    0x00, 0x00, 0xFF, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 #endif /* DOINIT */