This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
toke.c: comment, White-space only
[perl5.git] / regnodes.h
index 88609ed..cab219b 100644 (file)
 #define        GPOS                    7       /* 0x07 Matches where last m//g left off. */
 #define        BOUND                   8       /* 0x08 Like BOUNDA for non-utf8, otherwise match "" between any Unicode \w\W or \W\w */
 #define        BOUNDL                  9       /* 0x09 Like BOUND/BOUNDU, but \w and \W are defined by current locale */
-#define        BOUNDU                  10      /* 0x0a Match "" at any boundary of a given type using Unicode rules */
+#define        BOUNDU                  10      /* 0x0a Match "" at any boundary of a given type using /u rules. */
 #define        BOUNDA                  11      /* 0x0b Match "" at any boundary between \w\W or \W\w, where \w is [_a-zA-Z0-9] */
 #define        NBOUND                  12      /* 0x0c Like NBOUNDA for non-utf8, otherwise match "" between any Unicode \w\w or \W\W */
 #define        NBOUNDL                 13      /* 0x0d Like NBOUND/NBOUNDU, but \w and \W are defined by current locale */
-#define        NBOUNDU                 14      /* 0x0e Match "" at any non-boundary of a given type using using Unicode rules */
+#define        NBOUNDU                 14      /* 0x0e Match "" at any non-boundary of a given type using using /u rules. */
 #define        NBOUNDA                 15      /* 0x0f Match "" betweeen any \w\w or \W\W, where \w is [_a-zA-Z0-9] */
 #define        REG_ANY                 16      /* 0x10 Match any one character (except newline). */
 #define        SANY                    17      /* 0x11 Match any one character. */
 #define        ANYOFD                  19      /* 0x13 Like ANYOF, but /d is in effect */
 #define        ANYOFL                  20      /* 0x14 Like ANYOF, but /l is in effect */
 #define        ANYOFPOSIXL             21      /* 0x15 Like ANYOFL, but matches [[:posix:]] classes */
-#define        ANYOFM                  22      /* 0x16 Like ANYOF, but matches an invariant byte as determined by the mask and arg */
-#define        NANYOFM                 23      /* 0x17 complement of ANYOFM */
-#define        POSIXD                  24      /* 0x18 Some [[:class:]] under /d; the FLAGS field gives which one */
-#define        POSIXL                  25      /* 0x19 Some [[:class:]] under /l; the FLAGS field gives which one */
-#define        POSIXU                  26      /* 0x1a Some [[:class:]] under /u; the FLAGS field gives which one */
-#define        POSIXA                  27      /* 0x1b Some [[:class:]] under /a; the FLAGS field gives which one */
-#define        NPOSIXD                 28      /* 0x1c complement of POSIXD, [[:^class:]] */
-#define        NPOSIXL                 29      /* 0x1d complement of POSIXL, [[:^class:]] */
-#define        NPOSIXU                 30      /* 0x1e complement of POSIXU, [[:^class:]] */
-#define        NPOSIXA                 31      /* 0x1f complement of POSIXA, [[:^class:]] */
-#define        ASCII                   32      /* 0x20 [[:ascii:]] */
-#define        NASCII                  33      /* 0x21 [[:^ascii:]] */
-#define        CLUMP                   34      /* 0x22 Match any extended grapheme cluster sequence */
-#define        BRANCH                  35      /* 0x23 Match this alternative, or the next... */
-#define        EXACT                   36      /* 0x24 Match this string (preceded by length). */
-#define        EXACTL                  37      /* 0x25 Like EXACT, but /l is in effect (used so locale-related warnings can be checked for). */
-#define        EXACTF                  38      /* 0x26 Match this string using /id rules (w/len); (string not UTF-8, not guaranteed to be folded). */
-#define        EXACTFL                 39      /* 0x27 Match this string using /il rules (w/len); (string not guaranteed to be folded). */
-#define        EXACTFU                 40      /* 0x28 Match this string using /iu rules (w/len); (string folded iff in UTF-8; non-UTF8 folded length <= unfolded). */
-#define        EXACTFAA                41      /* 0x29 Match this string using /iaa rules (w/len) (string folded iff in UTF-8; non-UTF8 folded length <= unfolded). */
-#define        EXACTFU_SS              42      /* 0x2a Match this string using /iu rules (w/len); (string not UTF-8, only portions guaranteed to be folded; folded length > unfolded). */
-#define        EXACTFUP                43      /* 0x2b Match this string using /iu rules (w/len); (string not UTF-8, not guaranteed to be folded; and its Problematic). */
-#define        EXACTFLU8               44      /* 0x2c Like EXACTFU, but use /il, UTF-8, folded, and everything in it is above 255. */
-#define        EXACTFAA_NO_TRIE        45      /* 0x2d Match this string using /iaa rules (w/len) (string not UTF-8, not guaranteed to be folded, not currently trie-able). */
-#define        EXACT_ONLY8             46      /* 0x2e Like EXACT, but only UTF-8 encoded targets can match */
-#define        EXACTFU_ONLY8           47      /* 0x2f Like EXACTFU, but only UTF-8 encoded targets can match */
-#define        EXACTFS_B_U             48      /* 0x30 EXACTFU but begins with [Ss]; (string not UTF-8; compile-time only). */
-#define        EXACTFS_E_U             49      /* 0x31 EXACTFU but ends with [Ss]; (string not UTF-8; compile-time only). */
-#define        EXACTFS_BE_U            50      /* 0x32 EXACTFU but begins and ends with [Ss]; (string not UTF-8; compile-time only). */
+#define        ANYOFH                  22      /* 0x16 Like ANYOF, but only has "High" matches, none in the bitmap; the flags field contains the lowest matchable UTF-8 start byte */
+#define        ANYOFHb                 23      /* 0x17 Like ANYOFH, but all matches share the same UTF-8 start byte, given in the flags field */
+#define        ANYOFHr                 24      /* 0x18 Like ANYOFH, but the flags field contains packed bounds for all matchable UTF-8 start bytes. */
+#define        ANYOFM                  25      /* 0x19 Like ANYOF, but matches an invariant byte as determined by the mask and arg */
+#define        NANYOFM                 26      /* 0x1a complement of ANYOFM */
+#define        POSIXD                  27      /* 0x1b Some [[:class:]] under /d; the FLAGS field gives which one */
+#define        POSIXL                  28      /* 0x1c Some [[:class:]] under /l; the FLAGS field gives which one */
+#define        POSIXU                  29      /* 0x1d Some [[:class:]] under /u; the FLAGS field gives which one */
+#define        POSIXA                  30      /* 0x1e Some [[:class:]] under /a; the FLAGS field gives which one */
+#define        NPOSIXD                 31      /* 0x1f complement of POSIXD, [[:^class:]] */
+#define        NPOSIXL                 32      /* 0x20 complement of POSIXL, [[:^class:]] */
+#define        NPOSIXU                 33      /* 0x21 complement of POSIXU, [[:^class:]] */
+#define        NPOSIXA                 34      /* 0x22 complement of POSIXA, [[:^class:]] */
+#define        CLUMP                   35      /* 0x23 Match any extended grapheme cluster sequence */
+#define        BRANCH                  36      /* 0x24 Match this alternative, or the next... */
+#define        EXACT                   37      /* 0x25 Match this string (flags field is the length). */
+#define        LEXACT                  38      /* 0x26 Match this long string (preceded by length; flags unused). */
+#define        EXACTL                  39      /* 0x27 Like EXACT, but /l is in effect (used so locale-related warnings can be checked for). */
+#define        EXACTF                  40      /* 0x28 Like EXACT, but match using /id rules; (string not UTF-8, not guaranteed to be folded). */
+#define        EXACTFL                 41      /* 0x29 Like EXACT, but match using /il rules; (string not likely to be folded). */
+#define        EXACTFU                 42      /* 0x2a Like EXACT, but match using /iu rules; (string folded). */
+#define        EXACTFAA                43      /* 0x2b Like EXACT, but match using /iaa rules; (string folded iff pattern is UTF8; folded length <= unfolded). */
+#define        EXACTFUP                44      /* 0x2c Like EXACT, but match using /iu rules; (string not UTF-8, not guaranteed to be folded; and it is Problematic). */
+#define        EXACTFLU8               45      /* 0x2d Like EXACTFU, but use /il, UTF-8, (string is folded, and everything in it is above 255. */
+#define        EXACTFAA_NO_TRIE        46      /* 0x2e Like EXACT, but match using /iaa rules (string not UTF-8, not guaranteed to be folded, not currently trie-able). */
+#define        EXACT_REQ8              47      /* 0x2f Like EXACT, but only UTF-8 encoded targets can match */
+#define        LEXACT_REQ8             48      /* 0x30 Like LEXACT, but only UTF-8 encoded targets can match */
+#define        EXACTFU_REQ8            49      /* 0x31 Like EXACTFU, but only UTF-8 encoded targets can match */
+#define        EXACTFU_S_EDGE          50      /* 0x32 /di rules, but nothing in it precludes /ui, except begins and/or ends with [Ss]; (string not UTF-8; compile-time only). */
 #define        NOTHING                 51      /* 0x33 Match empty string. */
 #define        TAIL                    52      /* 0x34 Match empty string. Can jump here from outside. */
 #define        STAR                    53      /* 0x35 Match this (simple) thing 0 or more times. */
 #define        SROPEN                  62      /* 0x3e Same as OPEN, but for script run */
 #define        SRCLOSE                 63      /* 0x3f Close preceding SROPEN */
 #define        REF                     64      /* 0x40 Match some already matched string */
-#define        REFF                    65      /* 0x41 Match already matched string, folded using native charset rules for non-utf8 */
-#define        REFFL                   66      /* 0x42 Match already matched string, folded in loc. */
-#define        REFFU                   67      /* 0x43 Match already matched string, folded using unicode rules for non-utf8 */
-#define        REFFA                   68      /* 0x44 Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
-#define        NREF                    69      /* 0x45 Match some already matched string */
-#define        NREFF                   70      /* 0x46 Match already matched string, folded using native charset rules for non-utf8 */
-#define        NREFFL                  71      /* 0x47 Match already matched string, folded in loc. */
-#define        NREFFU                  72      /* 0x48 Match already matched string, folded using unicode rules for non-utf8 */
-#define        NREFFA                  73      /* 0x49 Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
+#define        REFF                    65      /* 0x41 Match already matched string, using /di rules. */
+#define        REFFL                   66      /* 0x42 Match already matched string, using /li rules. */
+#define        REFFU                   67      /* 0x43 Match already matched string, usng /ui. */
+#define        REFFA                   68      /* 0x44 Match already matched string, using /aai rules. */
+#define        REFN                    69      /* 0x45 Match some already matched string */
+#define        REFFN                   70      /* 0x46 Match already matched string, using /di rules. */
+#define        REFFLN                  71      /* 0x47 Match already matched string, using /li rules. */
+#define        REFFUN                  72      /* 0x48 Match already matched string, using /ui rules. */
+#define        REFFAN                  73      /* 0x49 Match already matched string, using /aai rules. */
 #define        LONGJMP                 74      /* 0x4a Jump far away. */
 #define        BRANCHJ                 75      /* 0x4b BRANCH with long offset. */
-#define        IFMATCH                 76      /* 0x4c Succeeds if the following matches. */
-#define        UNLESSM                 77      /* 0x4d Fails if the following matches. */
+#define        IFMATCH                 76      /* 0x4c Succeeds if the following matches; non-zero flags "f", next_off "o" means lookbehind assertion starting "f..(f-o)" characters before current */
+#define        UNLESSM                 77      /* 0x4d Fails if the following matches; non-zero flags "f", next_off "o" means lookbehind assertion starting "f..(f-o)" characters before current */
 #define        SUSPEND                 78      /* 0x4e "Independent" sub-RE. */
 #define        IFTHEN                  79      /* 0x4f Switch, should be preceded by switcher. */
 #define        GROUPP                  80      /* 0x50 Whether the group matched. */
 #define        AHOCORASICK             87      /* 0x57 Aho Corasick stclass. flags==type */
 #define        AHOCORASICKC            88      /* 0x58 Same as AHOCORASICK, but with embedded charclass data */
 #define        GOSUB                   89      /* 0x59 recurse to paren arg1 at (signed) ofs arg2 */
-#define        NGROUPP                 90      /* 0x5a Whether the group matched. */
+#define        GROUPPN                 90      /* 0x5a Whether the group matched. */
 #define        INSUBP                  91      /* 0x5b Whether we are in a specific recurse. */
 #define        DEFINEP                 92      /* 0x5c Never execute directly. */
 #define        ENDLIKE                 93      /* 0x5d Used only for the type field of verbs */
@@ -187,6 +187,9 @@ EXTCONST U8 PL_regkind[] = {
        ANYOF,          /* ANYOFD                 */
        ANYOF,          /* ANYOFL                 */
        ANYOF,          /* ANYOFPOSIXL            */
+       ANYOF,          /* ANYOFH                 */
+       ANYOF,          /* ANYOFHb                */
+       ANYOF,          /* ANYOFHr                */
        ANYOFM,         /* ANYOFM                 */
        ANYOFM,         /* NANYOFM                */
        POSIXD,         /* POSIXD                 */
@@ -197,25 +200,22 @@ EXTCONST U8 PL_regkind[] = {
        NPOSIXD,        /* NPOSIXL                */
        NPOSIXD,        /* NPOSIXU                */
        NPOSIXD,        /* NPOSIXA                */
-       ASCII,          /* ASCII                  */
-       ASCII,          /* NASCII                 */
        CLUMP,          /* CLUMP                  */
        BRANCH,         /* BRANCH                 */
        EXACT,          /* EXACT                  */
+       EXACT,          /* LEXACT                 */
        EXACT,          /* EXACTL                 */
        EXACT,          /* EXACTF                 */
        EXACT,          /* EXACTFL                */
        EXACT,          /* EXACTFU                */
        EXACT,          /* EXACTFAA               */
-       EXACT,          /* EXACTFU_SS             */
        EXACT,          /* EXACTFUP               */
        EXACT,          /* EXACTFLU8              */
        EXACT,          /* EXACTFAA_NO_TRIE       */
-       EXACT,          /* EXACT_ONLY8            */
-       EXACT,          /* EXACTFU_ONLY8          */
-       EXACT,          /* EXACTFS_B_U            */
-       EXACT,          /* EXACTFS_E_U            */
-       EXACT,          /* EXACTFS_BE_U           */
+       EXACT,          /* EXACT_REQ8             */
+       EXACT,          /* LEXACT_REQ8            */
+       EXACT,          /* EXACTFU_REQ8           */
+       EXACT,          /* EXACTFU_S_EDGE         */
        NOTHING,        /* NOTHING                */
        NOTHING,        /* TAIL                   */
        STAR,           /* STAR                   */
@@ -234,11 +234,11 @@ EXTCONST U8 PL_regkind[] = {
        REF,            /* REFFL                  */
        REF,            /* REFFU                  */
        REF,            /* REFFA                  */
-       REF,            /* NREF                   */
-       REF,            /* NREFF                  */
-       REF,            /* NREFFL                 */
-       REF,            /* NREFFU                 */
-       REF,            /* NREFFA                 */
+       REF,            /* REFN                   */
+       REF,            /* REFFN                  */
+       REF,            /* REFFLN                 */
+       REF,            /* REFFUN                 */
+       REF,            /* REFFAN                 */
        LONGJMP,        /* LONGJMP                */
        BRANCHJ,        /* BRANCHJ                */
        BRANCHJ,        /* IFMATCH                */
@@ -255,7 +255,7 @@ EXTCONST U8 PL_regkind[] = {
        TRIE,           /* AHOCORASICK            */
        TRIE,           /* AHOCORASICKC           */
        GOSUB,          /* GOSUB                  */
-       NGROUPP,        /* NGROUPP                */
+       GROUPPN,        /* GROUPPN                */
        INSUBP,         /* INSUBP                 */
        DEFINEP,        /* DEFINEP                */
        ENDLIKE,        /* ENDLIKE                */
@@ -342,6 +342,9 @@ static const U8 regarglen[] = {
        EXTRA_SIZE(struct regnode_charclass),   /* ANYOFD       */
        EXTRA_SIZE(struct regnode_charclass),   /* ANYOFL       */
        EXTRA_SIZE(struct regnode_charclass_posixl),    /* ANYOFPOSIXL  */
+       EXTRA_SIZE(struct regnode_1),           /* ANYOFH       */
+       EXTRA_SIZE(struct regnode_1),           /* ANYOFHb      */
+       EXTRA_SIZE(struct regnode_1),           /* ANYOFHr      */
        EXTRA_SIZE(struct regnode_1),           /* ANYOFM       */
        EXTRA_SIZE(struct regnode_1),           /* NANYOFM      */
        0,                                      /* POSIXD       */
@@ -352,25 +355,22 @@ static const U8 regarglen[] = {
        0,                                      /* NPOSIXL      */
        0,                                      /* NPOSIXU      */
        0,                                      /* NPOSIXA      */
-       0,                                      /* ASCII        */
-       0,                                      /* NASCII       */
        0,                                      /* CLUMP        */
        0,                                      /* BRANCH       */
        0,                                      /* EXACT        */
+       EXTRA_SIZE(struct regnode_1),           /* LEXACT       */
        0,                                      /* EXACTL       */
        0,                                      /* EXACTF       */
        0,                                      /* EXACTFL      */
        0,                                      /* EXACTFU      */
        0,                                      /* EXACTFAA     */
-       0,                                      /* EXACTFU_SS   */
        0,                                      /* EXACTFUP     */
        0,                                      /* EXACTFLU8    */
        0,                                      /* EXACTFAA_NO_TRIE */
-       0,                                      /* EXACT_ONLY8  */
-       0,                                      /* EXACTFU_ONLY8 */
-       0,                                      /* EXACTFS_B_U  */
-       0,                                      /* EXACTFS_E_U  */
-       0,                                      /* EXACTFS_BE_U */
+       0,                                      /* EXACT_REQ8   */
+       EXTRA_SIZE(struct regnode_1),           /* LEXACT_REQ8  */
+       0,                                      /* EXACTFU_REQ8 */
+       0,                                      /* EXACTFU_S_EDGE */
        0,                                      /* NOTHING      */
        0,                                      /* TAIL         */
        0,                                      /* STAR         */
@@ -389,11 +389,11 @@ static const U8 regarglen[] = {
        EXTRA_SIZE(struct regnode_1),           /* REFFL        */
        EXTRA_SIZE(struct regnode_1),           /* REFFU        */
        EXTRA_SIZE(struct regnode_1),           /* REFFA        */
-       EXTRA_SIZE(struct regnode_1),           /* NREF         */
-       EXTRA_SIZE(struct regnode_1),           /* NREFF        */
-       EXTRA_SIZE(struct regnode_1),           /* NREFFL       */
-       EXTRA_SIZE(struct regnode_1),           /* NREFFU       */
-       EXTRA_SIZE(struct regnode_1),           /* NREFFA       */
+       EXTRA_SIZE(struct regnode_1),           /* REFN         */
+       EXTRA_SIZE(struct regnode_1),           /* REFFN        */
+       EXTRA_SIZE(struct regnode_1),           /* REFFLN       */
+       EXTRA_SIZE(struct regnode_1),           /* REFFUN       */
+       EXTRA_SIZE(struct regnode_1),           /* REFFAN       */
        EXTRA_SIZE(struct regnode_1),           /* LONGJMP      */
        EXTRA_SIZE(struct regnode_1),           /* BRANCHJ      */
        EXTRA_SIZE(struct regnode_1),           /* IFMATCH      */
@@ -410,7 +410,7 @@ static const U8 regarglen[] = {
        EXTRA_SIZE(struct regnode_1),           /* AHOCORASICK  */
        EXTRA_SIZE(struct regnode_charclass),   /* AHOCORASICKC */
        EXTRA_SIZE(struct regnode_2L),          /* GOSUB        */
-       EXTRA_SIZE(struct regnode_1),           /* NGROUPP      */
+       EXTRA_SIZE(struct regnode_1),           /* GROUPPN      */
        EXTRA_SIZE(struct regnode_1),           /* INSUBP       */
        EXTRA_SIZE(struct regnode_1),           /* DEFINEP      */
        0,                                      /* ENDLIKE      */
@@ -453,6 +453,9 @@ static const char reg_off_by_arg[] = {
        0,      /* ANYOFD       */
        0,      /* ANYOFL       */
        0,      /* ANYOFPOSIXL  */
+       0,      /* ANYOFH       */
+       0,      /* ANYOFHb      */
+       0,      /* ANYOFHr      */
        0,      /* ANYOFM       */
        0,      /* NANYOFM      */
        0,      /* POSIXD       */
@@ -463,25 +466,22 @@ static const char reg_off_by_arg[] = {
        0,      /* NPOSIXL      */
        0,      /* NPOSIXU      */
        0,      /* NPOSIXA      */
-       0,      /* ASCII        */
-       0,      /* NASCII       */
        0,      /* CLUMP        */
        0,      /* BRANCH       */
        0,      /* EXACT        */
+       0,      /* LEXACT       */
        0,      /* EXACTL       */
        0,      /* EXACTF       */
        0,      /* EXACTFL      */
        0,      /* EXACTFU      */
        0,      /* EXACTFAA     */
-       0,      /* EXACTFU_SS   */
        0,      /* EXACTFUP     */
        0,      /* EXACTFLU8    */
        0,      /* EXACTFAA_NO_TRIE */
-       0,      /* EXACT_ONLY8  */
-       0,      /* EXACTFU_ONLY8 */
-       0,      /* EXACTFS_B_U  */
-       0,      /* EXACTFS_E_U  */
-       0,      /* EXACTFS_BE_U */
+       0,      /* EXACT_REQ8   */
+       0,      /* LEXACT_REQ8  */
+       0,      /* EXACTFU_REQ8 */
+       0,      /* EXACTFU_S_EDGE */
        0,      /* NOTHING      */
        0,      /* TAIL         */
        0,      /* STAR         */
@@ -500,11 +500,11 @@ static const char reg_off_by_arg[] = {
        0,      /* REFFL        */
        0,      /* REFFU        */
        0,      /* REFFA        */
-       0,      /* NREF         */
-       0,      /* NREFF        */
-       0,      /* NREFFL       */
-       0,      /* NREFFU       */
-       0,      /* NREFFA       */
+       0,      /* REFN         */
+       0,      /* REFFN        */
+       0,      /* REFFLN       */
+       0,      /* REFFUN       */
+       0,      /* REFFAN       */
        1,      /* LONGJMP      */
        1,      /* BRANCHJ      */
        1,      /* IFMATCH      */
@@ -521,7 +521,7 @@ static const char reg_off_by_arg[] = {
        0,      /* AHOCORASICK  */
        0,      /* AHOCORASICKC */
        0,      /* GOSUB        */
-       0,      /* NGROUPP      */
+       0,      /* GROUPPN      */
        0,      /* INSUBP       */
        0,      /* DEFINEP      */
        0,      /* ENDLIKE      */
@@ -570,35 +570,35 @@ EXTCONST char * const PL_reg_name[] = {
        "ANYOFD",                       /* 0x13 */
        "ANYOFL",                       /* 0x14 */
        "ANYOFPOSIXL",                  /* 0x15 */
-       "ANYOFM",                       /* 0x16 */
-       "NANYOFM",                      /* 0x17 */
-       "POSIXD",                       /* 0x18 */
-       "POSIXL",                       /* 0x19 */
-       "POSIXU",                       /* 0x1a */
-       "POSIXA",                       /* 0x1b */
-       "NPOSIXD",                      /* 0x1c */
-       "NPOSIXL",                      /* 0x1d */
-       "NPOSIXU",                      /* 0x1e */
-       "NPOSIXA",                      /* 0x1f */
-       "ASCII",                        /* 0x20 */
-       "NASCII",                       /* 0x21 */
-       "CLUMP",                        /* 0x22 */
-       "BRANCH",                       /* 0x23 */
-       "EXACT",                        /* 0x24 */
-       "EXACTL",                       /* 0x25 */
-       "EXACTF",                       /* 0x26 */
-       "EXACTFL",                      /* 0x27 */
-       "EXACTFU",                      /* 0x28 */
-       "EXACTFAA",                     /* 0x29 */
-       "EXACTFU_SS",                   /* 0x2a */
-       "EXACTFUP",                     /* 0x2b */
-       "EXACTFLU8",                    /* 0x2c */
-       "EXACTFAA_NO_TRIE",             /* 0x2d */
-       "EXACT_ONLY8",                  /* 0x2e */
-       "EXACTFU_ONLY8",                /* 0x2f */
-       "EXACTFS_B_U",                  /* 0x30 */
-       "EXACTFS_E_U",                  /* 0x31 */
-       "EXACTFS_BE_U",                 /* 0x32 */
+       "ANYOFH",                       /* 0x16 */
+       "ANYOFHb",                      /* 0x17 */
+       "ANYOFHr",                      /* 0x18 */
+       "ANYOFM",                       /* 0x19 */
+       "NANYOFM",                      /* 0x1a */
+       "POSIXD",                       /* 0x1b */
+       "POSIXL",                       /* 0x1c */
+       "POSIXU",                       /* 0x1d */
+       "POSIXA",                       /* 0x1e */
+       "NPOSIXD",                      /* 0x1f */
+       "NPOSIXL",                      /* 0x20 */
+       "NPOSIXU",                      /* 0x21 */
+       "NPOSIXA",                      /* 0x22 */
+       "CLUMP",                        /* 0x23 */
+       "BRANCH",                       /* 0x24 */
+       "EXACT",                        /* 0x25 */
+       "LEXACT",                       /* 0x26 */
+       "EXACTL",                       /* 0x27 */
+       "EXACTF",                       /* 0x28 */
+       "EXACTFL",                      /* 0x29 */
+       "EXACTFU",                      /* 0x2a */
+       "EXACTFAA",                     /* 0x2b */
+       "EXACTFUP",                     /* 0x2c */
+       "EXACTFLU8",                    /* 0x2d */
+       "EXACTFAA_NO_TRIE",             /* 0x2e */
+       "EXACT_REQ8",                   /* 0x2f */
+       "LEXACT_REQ8",                  /* 0x30 */
+       "EXACTFU_REQ8",                 /* 0x31 */
+       "EXACTFU_S_EDGE",               /* 0x32 */
        "NOTHING",                      /* 0x33 */
        "TAIL",                         /* 0x34 */
        "STAR",                         /* 0x35 */
@@ -617,11 +617,11 @@ EXTCONST char * const PL_reg_name[] = {
        "REFFL",                        /* 0x42 */
        "REFFU",                        /* 0x43 */
        "REFFA",                        /* 0x44 */
-       "NREF",                         /* 0x45 */
-       "NREFF",                        /* 0x46 */
-       "NREFFL",                       /* 0x47 */
-       "NREFFU",                       /* 0x48 */
-       "NREFFA",                       /* 0x49 */
+       "REFN",                         /* 0x45 */
+       "REFFN",                        /* 0x46 */
+       "REFFLN",                       /* 0x47 */
+       "REFFUN",                       /* 0x48 */
+       "REFFAN",                       /* 0x49 */
        "LONGJMP",                      /* 0x4a */
        "BRANCHJ",                      /* 0x4b */
        "IFMATCH",                      /* 0x4c */
@@ -638,7 +638,7 @@ EXTCONST char * const PL_reg_name[] = {
        "AHOCORASICK",                  /* 0x57 */
        "AHOCORASICKC",                 /* 0x58 */
        "GOSUB",                        /* 0x59 */
-       "NGROUPP",                      /* 0x5a */
+       "GROUPPN",                      /* 0x5a */
        "INSUBP",                       /* 0x5b */
        "DEFINEP",                      /* 0x5c */
        "ENDLIKE",                      /* 0x5d */
@@ -778,7 +778,7 @@ EXTCONST U8 PL_varies[] __attribute__deprecated__;
 #else
 EXTCONST U8 PL_varies[] __attribute__deprecated__ = {
     CLUMP, BRANCH, STAR, PLUS, CURLY, CURLYN, CURLYM, CURLYX, WHILEM, REF,
-    REFF, REFFL, REFFU, REFFA, NREF, NREFF, NREFFL, NREFFU, NREFFA,
+    REFF, REFFL, REFFU, REFFA, REFN, REFFN, REFFLN, REFFUN, REFFAN,
     BRANCHJ, SUSPEND, IFTHEN,
     0
 };
@@ -788,7 +788,7 @@ EXTCONST U8 PL_varies[] __attribute__deprecated__ = {
 EXTCONST U8 PL_varies_bitmask[];
 #else
 EXTCONST U8 PL_varies_bitmask[] = {
-    0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0xE0, 0x0F, 0xFF, 0xCB, 0x00, 0x00, 0x00, 0x00
+    0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0xE0, 0x0F, 0xFF, 0xCB, 0x00, 0x00, 0x00, 0x00
 };
 #endif /* DOINIT */
 
@@ -800,9 +800,9 @@ EXTCONST U8 PL_varies_bitmask[] = {
 EXTCONST U8 PL_simple[] __attribute__deprecated__;
 #else
 EXTCONST U8 PL_simple[] __attribute__deprecated__ = {
-    REG_ANY, SANY, ANYOF, ANYOFD, ANYOFL, ANYOFPOSIXL, ANYOFM, NANYOFM,
-    POSIXD, POSIXL, POSIXU, POSIXA, NPOSIXD, NPOSIXL, NPOSIXU, NPOSIXA,
-    ASCII, NASCII,
+    REG_ANY, SANY, ANYOF, ANYOFD, ANYOFL, ANYOFPOSIXL, ANYOFH, ANYOFHb,
+    ANYOFHr, ANYOFM, NANYOFM, POSIXD, POSIXL, POSIXU, POSIXA, NPOSIXD,
+    NPOSIXL, NPOSIXU, NPOSIXA,
     0
 };
 #endif /* DOINIT */
@@ -811,7 +811,7 @@ EXTCONST U8 PL_simple[] __attribute__deprecated__ = {
 EXTCONST U8 PL_simple_bitmask[];
 #else
 EXTCONST U8 PL_simple_bitmask[] = {
-    0x00, 0x00, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    0x00, 0x00, 0xFF, 0xFF, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 #endif /* DOINIT */