This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
recomp.sym: Add ANYOFM regnode
authorKarl Williamson <khw@cpan.org>
Mon, 22 Jan 2018 20:55:03 +0000 (13:55 -0700)
committerKarl Williamson <khw@cpan.org>
Tue, 30 Jan 2018 18:38:13 +0000 (11:38 -0700)
This uses a mask instead of a bitmap, and is restricted to representing
invariant characters under UTF-8 that meet particular bit patterns.

pod/perldebguts.pod
regcomp.sym
regnodes.h

index 3a66f24..b1c01ca 100644 (file)
@@ -605,6 +605,8 @@ will be lost.
                             single char match only
  ANYOFD          sv 1       Like ANYOF, but /d is in effect
  ANYOFL          sv 1       Like ANYOF, but /l is in effect
+ ANYOFM          byte 1     Like ANYOF, but matches an invariant byte as
+                            determined by the mask and arg
 
  # POSIX Character Classes:
  POSIXD          none       Some [[:class:]] under /d; the FLAGS field
index cddf84c..14840b5 100644 (file)
@@ -59,6 +59,7 @@ 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
+ANYOFM      ANYOFM      byte 1 S  ; Like ANYOF, but matches an invariant byte as determined by the mask and arg
 
 #* POSIX Character Classes:
 # Order of the below is important.  See ordering comment above.
index f76aab4..855a215 100644 (file)
@@ -6,8 +6,8 @@
 
 /* Regops and State definitions */
 
-#define REGNODE_MAX            96
-#define REGMATCH_STATE_MAX     138
+#define REGNODE_MAX            97
+#define REGMATCH_STATE_MAX     139
 
 #define        END                     0       /* 0000 End of program. */
 #define        SUCCEED                 1       /* 0x01 Return from a subroutine, basically. */
 #define        ANYOF                   18      /* 0x12 Match character in (or not in) this class, single char match only */
 #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        ASCII                   29      /* 0x1d [[:ascii:]] */
-#define        NASCII                  30      /* 0x1e [[:^ascii:]] */
-#define        CLUMP                   31      /* 0x1f Match any extended grapheme cluster sequence */
-#define        BRANCH                  32      /* 0x20 Match this alternative, or the next... */
-#define        EXACT                   33      /* 0x21 Match this string (preceded by length). */
-#define        EXACTL                  34      /* 0x22 Like EXACT, but /l is in effect (used so locale-related warnings can be checked for). */
-#define        EXACTF                  35      /* 0x23 Match this non-UTF-8 string (not guaranteed to be folded) using /id rules (w/len). */
-#define        EXACTFL                 36      /* 0x24 Match this string (not guaranteed to be folded) using /il rules (w/len). */
-#define        EXACTFU                 37      /* 0x25 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                 38      /* 0x26 Match this string (not guaranteed to be folded) using /iaa rules (w/len). */
-#define        EXACTFU_SS              39      /* 0x27 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               40      /* 0x28 Rare cirucmstances: like EXACTFU, but is under /l, UTF-8, folded, and everything in it is above 255. */
-#define        EXACTFA_NO_TRIE         41      /* 0x29 Match this string (which is not trie-able; not guaranteed to be folded) using /iaa rules (w/len). */
-#define        NOTHING                 42      /* 0x2a Match empty string. */
-#define        TAIL                    43      /* 0x2b Match empty string. Can jump here from outside. */
-#define        STAR                    44      /* 0x2c Match this (simple) thing 0 or more times. */
-#define        PLUS                    45      /* 0x2d Match this (simple) thing 1 or more times. */
-#define        CURLY                   46      /* 0x2e Match this simple thing {n,m} times. */
-#define        CURLYN                  47      /* 0x2f Capture next-after-this simple thing */
-#define        CURLYM                  48      /* 0x30 Capture this medium-complex thing {n,m} times. */
-#define        CURLYX                  49      /* 0x31 Match this complex thing {n,m} times. */
-#define        WHILEM                  50      /* 0x32 Do curly processing and see if rest matches. */
-#define        OPEN                    51      /* 0x33 Mark this point in input as start of #n. */
-#define        CLOSE                   52      /* 0x34 Close corresponding OPEN of #n. */
-#define        SROPEN                  53      /* 0x35 Same as OPEN, but for script run */
-#define        SRCLOSE                 54      /* 0x36 Close preceding SROPEN */
-#define        REF                     55      /* 0x37 Match some already matched string */
-#define        REFF                    56      /* 0x38 Match already matched string, folded using native charset rules for non-utf8 */
-#define        REFFL                   57      /* 0x39 Match already matched string, folded in loc. */
-#define        REFFU                   58      /* 0x3a Match already matched string, folded using unicode rules for non-utf8 */
-#define        REFFA                   59      /* 0x3b Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
-#define        NREF                    60      /* 0x3c Match some already matched string */
-#define        NREFF                   61      /* 0x3d Match already matched string, folded using native charset rules for non-utf8 */
-#define        NREFFL                  62      /* 0x3e Match already matched string, folded in loc. */
-#define        NREFFU                  63      /* 0x3f Match already matched string, folded using unicode rules for non-utf8 */
-#define        NREFFA                  64      /* 0x40 Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
-#define        LONGJMP                 65      /* 0x41 Jump far away. */
-#define        BRANCHJ                 66      /* 0x42 BRANCH with long offset. */
-#define        IFMATCH                 67      /* 0x43 Succeeds if the following matches. */
-#define        UNLESSM                 68      /* 0x44 Fails if the following matches. */
-#define        SUSPEND                 69      /* 0x45 "Independent" sub-RE. */
-#define        IFTHEN                  70      /* 0x46 Switch, should be preceded by switcher. */
-#define        GROUPP                  71      /* 0x47 Whether the group matched. */
-#define        EVAL                    72      /* 0x48 Execute some Perl code. */
-#define        MINMOD                  73      /* 0x49 Next operator is not greedy. */
-#define        LOGICAL                 74      /* 0x4a Next opcode should set the flag only. */
-#define        RENUM                   75      /* 0x4b Group with independently numbered parens. */
-#define        TRIE                    76      /* 0x4c Match many EXACT(F[ALU]?)? at once. flags==type */
-#define        TRIEC                   77      /* 0x4d Same as TRIE, but with embedded charclass data */
-#define        AHOCORASICK             78      /* 0x4e Aho Corasick stclass. flags==type */
-#define        AHOCORASICKC            79      /* 0x4f Same as AHOCORASICK, but with embedded charclass data */
-#define        GOSUB                   80      /* 0x50 recurse to paren arg1 at (signed) ofs arg2 */
-#define        NGROUPP                 81      /* 0x51 Whether the group matched. */
-#define        INSUBP                  82      /* 0x52 Whether we are in a specific recurse. */
-#define        DEFINEP                 83      /* 0x53 Never execute directly. */
-#define        ENDLIKE                 84      /* 0x54 Used only for the type field of verbs */
-#define        OPFAIL                  85      /* 0x55 Same as (?!), but with verb arg */
-#define        ACCEPT                  86      /* 0x56 Accepts the current matched string, with verbar */
-#define        VERB                    87      /* 0x57 Used only for the type field of verbs */
-#define        PRUNE                   88      /* 0x58 Pattern fails at this startpoint if no-backtracking through this */
-#define        MARKPOINT               89      /* 0x59 Push the current location for rollback by cut. */
-#define        SKIP                    90      /* 0x5a On failure skip forward (to the mark) before retrying */
-#define        COMMIT                  91      /* 0x5b Pattern fails outright if backtracking through this */
-#define        CUTGROUP                92      /* 0x5c On failure go to the next alternation in the group */
-#define        KEEPS                   93      /* 0x5d $& begins here. */
-#define        LNBREAK                 94      /* 0x5e generic newline pattern */
-#define        OPTIMIZED               95      /* 0x5f Placeholder for dump. */
-#define        PSEUDO                  96      /* 0x60 Pseudo opcode for internal use. */
+#define        ANYOFM                  21      /* 0x15 Like ANYOF, but matches an invariant byte as determined by the mask and arg */
+#define        POSIXD                  22      /* 0x16 Some [[:class:]] under /d; the FLAGS field gives which one */
+#define        POSIXL                  23      /* 0x17 Some [[:class:]] under /l; the FLAGS field gives which one */
+#define        POSIXU                  24      /* 0x18 Some [[:class:]] under /u; the FLAGS field gives which one */
+#define        POSIXA                  25      /* 0x19 Some [[:class:]] under /a; the FLAGS field gives which one */
+#define        NPOSIXD                 26      /* 0x1a complement of POSIXD, [[:^class:]] */
+#define        NPOSIXL                 27      /* 0x1b complement of POSIXL, [[:^class:]] */
+#define        NPOSIXU                 28      /* 0x1c complement of POSIXU, [[:^class:]] */
+#define        NPOSIXA                 29      /* 0x1d complement of POSIXA, [[:^class:]] */
+#define        ASCII                   30      /* 0x1e [[:ascii:]] */
+#define        NASCII                  31      /* 0x1f [[:^ascii:]] */
+#define        CLUMP                   32      /* 0x20 Match any extended grapheme cluster sequence */
+#define        BRANCH                  33      /* 0x21 Match this alternative, or the next... */
+#define        EXACT                   34      /* 0x22 Match this string (preceded by length). */
+#define        EXACTL                  35      /* 0x23 Like EXACT, but /l is in effect (used so locale-related warnings can be checked for). */
+#define        EXACTF                  36      /* 0x24 Match this non-UTF-8 string (not guaranteed to be folded) using /id rules (w/len). */
+#define        EXACTFL                 37      /* 0x25 Match this string (not guaranteed to be folded) using /il rules (w/len). */
+#define        EXACTFU                 38      /* 0x26 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                 39      /* 0x27 Match this string (not guaranteed to be folded) using /iaa rules (w/len). */
+#define        EXACTFU_SS              40      /* 0x28 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               41      /* 0x29 Rare cirucmstances: like EXACTFU, but is under /l, UTF-8, folded, and everything in it is above 255. */
+#define        EXACTFA_NO_TRIE         42      /* 0x2a Match this string (which is not trie-able; not guaranteed to be folded) using /iaa rules (w/len). */
+#define        NOTHING                 43      /* 0x2b Match empty string. */
+#define        TAIL                    44      /* 0x2c Match empty string. Can jump here from outside. */
+#define        STAR                    45      /* 0x2d Match this (simple) thing 0 or more times. */
+#define        PLUS                    46      /* 0x2e Match this (simple) thing 1 or more times. */
+#define        CURLY                   47      /* 0x2f Match this simple thing {n,m} times. */
+#define        CURLYN                  48      /* 0x30 Capture next-after-this simple thing */
+#define        CURLYM                  49      /* 0x31 Capture this medium-complex thing {n,m} times. */
+#define        CURLYX                  50      /* 0x32 Match this complex thing {n,m} times. */
+#define        WHILEM                  51      /* 0x33 Do curly processing and see if rest matches. */
+#define        OPEN                    52      /* 0x34 Mark this point in input as start of #n. */
+#define        CLOSE                   53      /* 0x35 Close corresponding OPEN of #n. */
+#define        SROPEN                  54      /* 0x36 Same as OPEN, but for script run */
+#define        SRCLOSE                 55      /* 0x37 Close preceding SROPEN */
+#define        REF                     56      /* 0x38 Match some already matched string */
+#define        REFF                    57      /* 0x39 Match already matched string, folded using native charset rules for non-utf8 */
+#define        REFFL                   58      /* 0x3a Match already matched string, folded in loc. */
+#define        REFFU                   59      /* 0x3b Match already matched string, folded using unicode rules for non-utf8 */
+#define        REFFA                   60      /* 0x3c Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
+#define        NREF                    61      /* 0x3d Match some already matched string */
+#define        NREFF                   62      /* 0x3e Match already matched string, folded using native charset rules for non-utf8 */
+#define        NREFFL                  63      /* 0x3f Match already matched string, folded in loc. */
+#define        NREFFU                  64      /* 0x40 Match already matched string, folded using unicode rules for non-utf8 */
+#define        NREFFA                  65      /* 0x41 Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
+#define        LONGJMP                 66      /* 0x42 Jump far away. */
+#define        BRANCHJ                 67      /* 0x43 BRANCH with long offset. */
+#define        IFMATCH                 68      /* 0x44 Succeeds if the following matches. */
+#define        UNLESSM                 69      /* 0x45 Fails if the following matches. */
+#define        SUSPEND                 70      /* 0x46 "Independent" sub-RE. */
+#define        IFTHEN                  71      /* 0x47 Switch, should be preceded by switcher. */
+#define        GROUPP                  72      /* 0x48 Whether the group matched. */
+#define        EVAL                    73      /* 0x49 Execute some Perl code. */
+#define        MINMOD                  74      /* 0x4a Next operator is not greedy. */
+#define        LOGICAL                 75      /* 0x4b Next opcode should set the flag only. */
+#define        RENUM                   76      /* 0x4c Group with independently numbered parens. */
+#define        TRIE                    77      /* 0x4d Match many EXACT(F[ALU]?)? at once. flags==type */
+#define        TRIEC                   78      /* 0x4e Same as TRIE, but with embedded charclass data */
+#define        AHOCORASICK             79      /* 0x4f Aho Corasick stclass. flags==type */
+#define        AHOCORASICKC            80      /* 0x50 Same as AHOCORASICK, but with embedded charclass data */
+#define        GOSUB                   81      /* 0x51 recurse to paren arg1 at (signed) ofs arg2 */
+#define        NGROUPP                 82      /* 0x52 Whether the group matched. */
+#define        INSUBP                  83      /* 0x53 Whether we are in a specific recurse. */
+#define        DEFINEP                 84      /* 0x54 Never execute directly. */
+#define        ENDLIKE                 85      /* 0x55 Used only for the type field of verbs */
+#define        OPFAIL                  86      /* 0x56 Same as (?!), but with verb arg */
+#define        ACCEPT                  87      /* 0x57 Accepts the current matched string, with verbar */
+#define        VERB                    88      /* 0x58 Used only for the type field of verbs */
+#define        PRUNE                   89      /* 0x59 Pattern fails at this startpoint if no-backtracking through this */
+#define        MARKPOINT               90      /* 0x5a Push the current location for rollback by cut. */
+#define        SKIP                    91      /* 0x5b On failure skip forward (to the mark) before retrying */
+#define        COMMIT                  92      /* 0x5c Pattern fails outright if backtracking through this */
+#define        CUTGROUP                93      /* 0x5d On failure go to the next alternation in the group */
+#define        KEEPS                   94      /* 0x5e $& begins here. */
+#define        LNBREAK                 95      /* 0x5f generic newline pattern */
+#define        OPTIMIZED               96      /* 0x60 Placeholder for dump. */
+#define        PSEUDO                  97      /* 0x61 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 */
@@ -179,6 +180,7 @@ EXTCONST U8 PL_regkind[] = {
        ANYOF,          /* ANYOF                  */
        ANYOF,          /* ANYOFD                 */
        ANYOF,          /* ANYOFL                 */
+       ANYOFM,         /* ANYOFM                 */
        POSIXD,         /* POSIXD                 */
        POSIXD,         /* POSIXL                 */
        POSIXD,         /* POSIXU                 */
@@ -327,6 +329,7 @@ static const U8 regarglen[] = {
        EXTRA_SIZE(struct regnode_1),           /* ANYOF        */
        EXTRA_SIZE(struct regnode_1),           /* ANYOFD       */
        EXTRA_SIZE(struct regnode_1),           /* ANYOFL       */
+       EXTRA_SIZE(struct regnode_1),           /* ANYOFM       */
        0,                                      /* POSIXD       */
        0,                                      /* POSIXL       */
        0,                                      /* POSIXU       */
@@ -429,6 +432,7 @@ static const char reg_off_by_arg[] = {
        0,      /* ANYOF        */
        0,      /* ANYOFD       */
        0,      /* ANYOFL       */
+       0,      /* ANYOFM       */
        0,      /* POSIXD       */
        0,      /* POSIXL       */
        0,      /* POSIXU       */
@@ -537,82 +541,83 @@ EXTCONST char * const PL_reg_name[] = {
        "ANYOF",                        /* 0x12 */
        "ANYOFD",                       /* 0x13 */
        "ANYOFL",                       /* 0x14 */
-       "POSIXD",                       /* 0x15 */
-       "POSIXL",                       /* 0x16 */
-       "POSIXU",                       /* 0x17 */
-       "POSIXA",                       /* 0x18 */
-       "NPOSIXD",                      /* 0x19 */
-       "NPOSIXL",                      /* 0x1a */
-       "NPOSIXU",                      /* 0x1b */
-       "NPOSIXA",                      /* 0x1c */
-       "ASCII",                        /* 0x1d */
-       "NASCII",                       /* 0x1e */
-       "CLUMP",                        /* 0x1f */
-       "BRANCH",                       /* 0x20 */
-       "EXACT",                        /* 0x21 */
-       "EXACTL",                       /* 0x22 */
-       "EXACTF",                       /* 0x23 */
-       "EXACTFL",                      /* 0x24 */
-       "EXACTFU",                      /* 0x25 */
-       "EXACTFA",                      /* 0x26 */
-       "EXACTFU_SS",                   /* 0x27 */
-       "EXACTFLU8",                    /* 0x28 */
-       "EXACTFA_NO_TRIE",              /* 0x29 */
-       "NOTHING",                      /* 0x2a */
-       "TAIL",                         /* 0x2b */
-       "STAR",                         /* 0x2c */
-       "PLUS",                         /* 0x2d */
-       "CURLY",                        /* 0x2e */
-       "CURLYN",                       /* 0x2f */
-       "CURLYM",                       /* 0x30 */
-       "CURLYX",                       /* 0x31 */
-       "WHILEM",                       /* 0x32 */
-       "OPEN",                         /* 0x33 */
-       "CLOSE",                        /* 0x34 */
-       "SROPEN",                       /* 0x35 */
-       "SRCLOSE",                      /* 0x36 */
-       "REF",                          /* 0x37 */
-       "REFF",                         /* 0x38 */
-       "REFFL",                        /* 0x39 */
-       "REFFU",                        /* 0x3a */
-       "REFFA",                        /* 0x3b */
-       "NREF",                         /* 0x3c */
-       "NREFF",                        /* 0x3d */
-       "NREFFL",                       /* 0x3e */
-       "NREFFU",                       /* 0x3f */
-       "NREFFA",                       /* 0x40 */
-       "LONGJMP",                      /* 0x41 */
-       "BRANCHJ",                      /* 0x42 */
-       "IFMATCH",                      /* 0x43 */
-       "UNLESSM",                      /* 0x44 */
-       "SUSPEND",                      /* 0x45 */
-       "IFTHEN",                       /* 0x46 */
-       "GROUPP",                       /* 0x47 */
-       "EVAL",                         /* 0x48 */
-       "MINMOD",                       /* 0x49 */
-       "LOGICAL",                      /* 0x4a */
-       "RENUM",                        /* 0x4b */
-       "TRIE",                         /* 0x4c */
-       "TRIEC",                        /* 0x4d */
-       "AHOCORASICK",                  /* 0x4e */
-       "AHOCORASICKC",                 /* 0x4f */
-       "GOSUB",                        /* 0x50 */
-       "NGROUPP",                      /* 0x51 */
-       "INSUBP",                       /* 0x52 */
-       "DEFINEP",                      /* 0x53 */
-       "ENDLIKE",                      /* 0x54 */
-       "OPFAIL",                       /* 0x55 */
-       "ACCEPT",                       /* 0x56 */
-       "VERB",                         /* 0x57 */
-       "PRUNE",                        /* 0x58 */
-       "MARKPOINT",                    /* 0x59 */
-       "SKIP",                         /* 0x5a */
-       "COMMIT",                       /* 0x5b */
-       "CUTGROUP",                     /* 0x5c */
-       "KEEPS",                        /* 0x5d */
-       "LNBREAK",                      /* 0x5e */
-       "OPTIMIZED",                    /* 0x5f */
-       "PSEUDO",                       /* 0x60 */
+       "ANYOFM",                       /* 0x15 */
+       "POSIXD",                       /* 0x16 */
+       "POSIXL",                       /* 0x17 */
+       "POSIXU",                       /* 0x18 */
+       "POSIXA",                       /* 0x19 */
+       "NPOSIXD",                      /* 0x1a */
+       "NPOSIXL",                      /* 0x1b */
+       "NPOSIXU",                      /* 0x1c */
+       "NPOSIXA",                      /* 0x1d */
+       "ASCII",                        /* 0x1e */
+       "NASCII",                       /* 0x1f */
+       "CLUMP",                        /* 0x20 */
+       "BRANCH",                       /* 0x21 */
+       "EXACT",                        /* 0x22 */
+       "EXACTL",                       /* 0x23 */
+       "EXACTF",                       /* 0x24 */
+       "EXACTFL",                      /* 0x25 */
+       "EXACTFU",                      /* 0x26 */
+       "EXACTFA",                      /* 0x27 */
+       "EXACTFU_SS",                   /* 0x28 */
+       "EXACTFLU8",                    /* 0x29 */
+       "EXACTFA_NO_TRIE",              /* 0x2a */
+       "NOTHING",                      /* 0x2b */
+       "TAIL",                         /* 0x2c */
+       "STAR",                         /* 0x2d */
+       "PLUS",                         /* 0x2e */
+       "CURLY",                        /* 0x2f */
+       "CURLYN",                       /* 0x30 */
+       "CURLYM",                       /* 0x31 */
+       "CURLYX",                       /* 0x32 */
+       "WHILEM",                       /* 0x33 */
+       "OPEN",                         /* 0x34 */
+       "CLOSE",                        /* 0x35 */
+       "SROPEN",                       /* 0x36 */
+       "SRCLOSE",                      /* 0x37 */
+       "REF",                          /* 0x38 */
+       "REFF",                         /* 0x39 */
+       "REFFL",                        /* 0x3a */
+       "REFFU",                        /* 0x3b */
+       "REFFA",                        /* 0x3c */
+       "NREF",                         /* 0x3d */
+       "NREFF",                        /* 0x3e */
+       "NREFFL",                       /* 0x3f */
+       "NREFFU",                       /* 0x40 */
+       "NREFFA",                       /* 0x41 */
+       "LONGJMP",                      /* 0x42 */
+       "BRANCHJ",                      /* 0x43 */
+       "IFMATCH",                      /* 0x44 */
+       "UNLESSM",                      /* 0x45 */
+       "SUSPEND",                      /* 0x46 */
+       "IFTHEN",                       /* 0x47 */
+       "GROUPP",                       /* 0x48 */
+       "EVAL",                         /* 0x49 */
+       "MINMOD",                       /* 0x4a */
+       "LOGICAL",                      /* 0x4b */
+       "RENUM",                        /* 0x4c */
+       "TRIE",                         /* 0x4d */
+       "TRIEC",                        /* 0x4e */
+       "AHOCORASICK",                  /* 0x4f */
+       "AHOCORASICKC",                 /* 0x50 */
+       "GOSUB",                        /* 0x51 */
+       "NGROUPP",                      /* 0x52 */
+       "INSUBP",                       /* 0x53 */
+       "DEFINEP",                      /* 0x54 */
+       "ENDLIKE",                      /* 0x55 */
+       "OPFAIL",                       /* 0x56 */
+       "ACCEPT",                       /* 0x57 */
+       "VERB",                         /* 0x58 */
+       "PRUNE",                        /* 0x59 */
+       "MARKPOINT",                    /* 0x5a */
+       "SKIP",                         /* 0x5b */
+       "COMMIT",                       /* 0x5c */
+       "CUTGROUP",                     /* 0x5d */
+       "KEEPS",                        /* 0x5e */
+       "LNBREAK",                      /* 0x5f */
+       "OPTIMIZED",                    /* 0x60 */
+       "PSEUDO",                       /* 0x61 */
        /* ------------ States ------------- */
        "TRIE_next",                    /* REGNODE_MAX +0x01 */
        "TRIE_next_fail",               /* REGNODE_MAX +0x02 */
@@ -749,7 +754,7 @@ EXTCONST U8 PL_varies[] __attribute__deprecated__ = {
 EXTCONST U8 PL_varies_bitmask[];
 #else
 EXTCONST U8 PL_varies_bitmask[] = {
-    0x00, 0x00, 0x00, 0x80, 0x01, 0xF0, 0x87, 0xFF, 0x65, 0x00, 0x00, 0x00, 0x00
+    0x00, 0x00, 0x00, 0x00, 0x03, 0xE0, 0x0F, 0xFF, 0xCB, 0x00, 0x00, 0x00, 0x00
 };
 #endif /* DOINIT */
 
@@ -761,8 +766,8 @@ EXTCONST U8 PL_varies_bitmask[] = {
 EXTCONST U8 PL_simple[] __attribute__deprecated__;
 #else
 EXTCONST U8 PL_simple[] __attribute__deprecated__ = {
-    REG_ANY, SANY, ANYOF, ANYOFD, ANYOFL, POSIXD, POSIXL, POSIXU, POSIXA,
-    NPOSIXD, NPOSIXL, NPOSIXU, NPOSIXA, ASCII, NASCII,
+    REG_ANY, SANY, ANYOF, ANYOFD, ANYOFL, ANYOFM, POSIXD, POSIXL, POSIXU,
+    POSIXA, NPOSIXD, NPOSIXL, NPOSIXU, NPOSIXA, ASCII, NASCII,
     0
 };
 #endif /* DOINIT */
@@ -771,7 +776,7 @@ EXTCONST U8 PL_simple[] __attribute__deprecated__ = {
 EXTCONST U8 PL_simple_bitmask[];
 #else
 EXTCONST U8 PL_simple_bitmask[] = {
-    0x00, 0x00, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 #endif /* DOINIT */