Add regnode EXACTFUP, for problematic
authorKarl Williamson <khw@cpan.org>
Sun, 23 Dec 2018 20:33:07 +0000 (13:33 -0700)
committerKarl Williamson <khw@cpan.org>
Wed, 26 Dec 2018 19:50:37 +0000 (12:50 -0700)
If a non-UTF-8 pattern contains a MICRO SIGN, this special node is now
created.  This character is the only one not needing UTF-8 to represent,
but its fold does need UTF-8, which causes some issues, so it has to be
specially handled.  When matching against a non-UTF-8 target string, the
pattern is effectively folded, but not if the target is UTF-8.  By
creating this node, we can remove the special handling required for the
nodes that don't have a MICRO SIGN, in a future commit.

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

index 6decb1f..0c32c9a 100644 (file)
@@ -669,6 +669,9 @@ will be lost.
  EXACTFU_SS       str        Match this string using /iu rules (w/len);
                              (string not UTF-8, only portions guaranteed
                              to be folded; folded length > unfolded).
+ EXACTFUP         str        Match this string using /iu rules (w/len);
+                             (string not UTF-8, not guaranteed to be
+                             folded; and its Problematic).
 
  EXACTFLU8        str        Like EXACTFU, but use /il, UTF-8, folded,
                              and everything in it is above 255.
index 768f3ff..2a94961 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -14709,13 +14709,19 @@ S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth)
                         }
                     }
 
-                    /* The micro sign is the only below 256 character that
-                     * folds to above 255 */
-                    if (   node_type == EXACTFU
-                        && requires_utf8_target
-                        && LIKELY(! has_micro_sign))
-                    {
-                        node_type = EXACTFU_ONLY8;
+                    if (node_type == EXACTFU) {
+                        if (UNLIKELY(has_micro_sign)) {
+
+                            /* The micro sign is the only below 256 character
+                             * that folds to above 255 */
+                            if (! UTF) {
+                                node_type = EXACTFUP;
+                            }
+                        }
+                        else if (requires_utf8_target) {
+
+                            node_type = EXACTFU_ONLY8;
+                        }
                     }
                 }
 
index ab9943d..bdbe059 100644 (file)
@@ -108,7 +108,7 @@ EXACTFAA    EXACT,      str   ; Match this string using /iaa rules (w/len) (stri
 # End of important relative ordering.
 
 EXACTFU_SS  EXACT,      str      ; Match this string using /iu rules (w/len); (string not UTF-8, only portions guaranteed to be folded; folded length > unfolded).
-
+EXACTFUP    EXACT,      str      ; Match this string using /iu rules (w/len); (string not UTF-8, not guaranteed to be folded; and its Problematic).
 # In order for a non-UTF-8 EXACTFAA to think the pattern is pre-folded when
 # matching a UTF-8 target string, there would have to be something like an
 # EXACTFAA_MICRO which would not be considered pre-folded for UTF-8 targets,
index 13db8fd..63d4a94 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -2321,6 +2321,9 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s,
         goto do_exactf_non_utf8;
 
     case EXACTFU_SS:
+    case EXACTFUP:      /* Problematic even though pattern isn't UTF-8.  Use
+                           full functionality normally not done except for
+                           UTF-8 */
         assert(! is_utf8_pat);
         goto do_exactf_utf8;
 
@@ -4661,6 +4664,7 @@ S_setup_EXACTISH_ST_c1_c2(pTHX_ const regnode * const text_node, int *c1p,
                         /* FALLTHROUGH */
                     case EXACTFAA:
                     case EXACTFU_SS:
+                    case EXACTFUP:
                     case EXACTFU:
                         c2 = PL_fold_latin1[c1];
                         break;
@@ -6419,6 +6423,8 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
            goto do_exactf;
 
        case EXACTFU_SS:         /*  /\x{df}/iu   */
+        case EXACTFUP:          /*  /foo/iu, and something is problematic in
+                                    'foo' so can't take shortcuts. */
             assert(! is_utf8_pat);
             /* FALLTHROUGH */
        case EXACTFU:            /*  /abc/iu      */
@@ -6460,6 +6466,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
            if (   utf8_target
                 || is_utf8_pat
                 || state_num == EXACTFU_SS
+                || state_num == EXACTFUP
                 || (state_num == EXACTFL && IN_UTF8_CTYPE_LOCALE))
             {
              /* Either target or the pattern are utf8, or has the issue where
@@ -9361,6 +9368,7 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p,
         /* FALLTHROUGH */
 
     case EXACTFU_SS:
+    case EXACTFUP:
 
       do_exactf: {
         int c1, c2;
index 9fd01a7..88609ed 100644 (file)
@@ -6,8 +6,8 @@
 
 /* Regops and State definitions */
 
-#define REGNODE_MAX            104
-#define REGMATCH_STATE_MAX     144
+#define REGNODE_MAX            105
+#define REGMATCH_STATE_MAX     145
 
 #define        END                     0       /* 0000 End of program. */
 #define        SUCCEED                 1       /* 0x01 Return from a subroutine, basically. */
 #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        EXACTFLU8               43      /* 0x2b Like EXACTFU, but use /il, UTF-8, folded, and everything in it is above 255. */
-#define        EXACTFAA_NO_TRIE        44      /* 0x2c Match this string using /iaa rules (w/len) (string not UTF-8, not guaranteed to be folded, not currently trie-able). */
-#define        EXACT_ONLY8             45      /* 0x2d Like EXACT, but only UTF-8 encoded targets can match */
-#define        EXACTFU_ONLY8           46      /* 0x2e Like EXACTFU, but only UTF-8 encoded targets can match */
-#define        EXACTFS_B_U             47      /* 0x2f EXACTFU but begins with [Ss]; (string not UTF-8; compile-time only). */
-#define        EXACTFS_E_U             48      /* 0x30 EXACTFU but ends with [Ss]; (string not UTF-8; compile-time only). */
-#define        EXACTFS_BE_U            49      /* 0x31 EXACTFU but begins and ends with [Ss]; (string not UTF-8; compile-time only). */
-#define        NOTHING                 50      /* 0x32 Match empty string. */
-#define        TAIL                    51      /* 0x33 Match empty string. Can jump here from outside. */
-#define        STAR                    52      /* 0x34 Match this (simple) thing 0 or more times. */
-#define        PLUS                    53      /* 0x35 Match this (simple) thing 1 or more times. */
-#define        CURLY                   54      /* 0x36 Match this simple thing {n,m} times. */
-#define        CURLYN                  55      /* 0x37 Capture next-after-this simple thing */
-#define        CURLYM                  56      /* 0x38 Capture this medium-complex thing {n,m} times. */
-#define        CURLYX                  57      /* 0x39 Match this complex thing {n,m} times. */
-#define        WHILEM                  58      /* 0x3a Do curly processing and see if rest matches. */
-#define        OPEN                    59      /* 0x3b Mark this point in input as start of #n. */
-#define        CLOSE                   60      /* 0x3c Close corresponding OPEN of #n. */
-#define        SROPEN                  61      /* 0x3d Same as OPEN, but for script run */
-#define        SRCLOSE                 62      /* 0x3e Close preceding SROPEN */
-#define        REF                     63      /* 0x3f Match some already matched string */
-#define        REFF                    64      /* 0x40 Match already matched string, folded using native charset rules for non-utf8 */
-#define        REFFL                   65      /* 0x41 Match already matched string, folded in loc. */
-#define        REFFU                   66      /* 0x42 Match already matched string, folded using unicode rules for non-utf8 */
-#define        REFFA                   67      /* 0x43 Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
-#define        NREF                    68      /* 0x44 Match some already matched string */
-#define        NREFF                   69      /* 0x45 Match already matched string, folded using native charset rules for non-utf8 */
-#define        NREFFL                  70      /* 0x46 Match already matched string, folded in loc. */
-#define        NREFFU                  71      /* 0x47 Match already matched string, folded using unicode rules for non-utf8 */
-#define        NREFFA                  72      /* 0x48 Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
-#define        LONGJMP                 73      /* 0x49 Jump far away. */
-#define        BRANCHJ                 74      /* 0x4a BRANCH with long offset. */
-#define        IFMATCH                 75      /* 0x4b Succeeds if the following matches. */
-#define        UNLESSM                 76      /* 0x4c Fails if the following matches. */
-#define        SUSPEND                 77      /* 0x4d "Independent" sub-RE. */
-#define        IFTHEN                  78      /* 0x4e Switch, should be preceded by switcher. */
-#define        GROUPP                  79      /* 0x4f Whether the group matched. */
-#define        EVAL                    80      /* 0x50 Execute some Perl code. */
-#define        MINMOD                  81      /* 0x51 Next operator is not greedy. */
-#define        LOGICAL                 82      /* 0x52 Next opcode should set the flag only. */
-#define        RENUM                   83      /* 0x53 Group with independently numbered parens. */
-#define        TRIE                    84      /* 0x54 Match many EXACT(F[ALU]?)? at once. flags==type */
-#define        TRIEC                   85      /* 0x55 Same as TRIE, but with embedded charclass data */
-#define        AHOCORASICK             86      /* 0x56 Aho Corasick stclass. flags==type */
-#define        AHOCORASICKC            87      /* 0x57 Same as AHOCORASICK, but with embedded charclass data */
-#define        GOSUB                   88      /* 0x58 recurse to paren arg1 at (signed) ofs arg2 */
-#define        NGROUPP                 89      /* 0x59 Whether the group matched. */
-#define        INSUBP                  90      /* 0x5a Whether we are in a specific recurse. */
-#define        DEFINEP                 91      /* 0x5b Never execute directly. */
-#define        ENDLIKE                 92      /* 0x5c Used only for the type field of verbs */
-#define        OPFAIL                  93      /* 0x5d Same as (?!), but with verb arg */
-#define        ACCEPT                  94      /* 0x5e Accepts the current matched string, with verbar */
-#define        VERB                    95      /* 0x5f Used only for the type field of verbs */
-#define        PRUNE                   96      /* 0x60 Pattern fails at this startpoint if no-backtracking through this */
-#define        MARKPOINT               97      /* 0x61 Push the current location for rollback by cut. */
-#define        SKIP                    98      /* 0x62 On failure skip forward (to the mark) before retrying */
-#define        COMMIT                  99      /* 0x63 Pattern fails outright if backtracking through this */
-#define        CUTGROUP                100     /* 0x64 On failure go to the next alternation in the group */
-#define        KEEPS                   101     /* 0x65 $& begins here. */
-#define        LNBREAK                 102     /* 0x66 generic newline pattern */
-#define        OPTIMIZED               103     /* 0x67 Placeholder for dump. */
-#define        PSEUDO                  104     /* 0x68 Pseudo opcode for internal use. */
+#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        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        PLUS                    54      /* 0x36 Match this (simple) thing 1 or more times. */
+#define        CURLY                   55      /* 0x37 Match this simple thing {n,m} times. */
+#define        CURLYN                  56      /* 0x38 Capture next-after-this simple thing */
+#define        CURLYM                  57      /* 0x39 Capture this medium-complex thing {n,m} times. */
+#define        CURLYX                  58      /* 0x3a Match this complex thing {n,m} times. */
+#define        WHILEM                  59      /* 0x3b Do curly processing and see if rest matches. */
+#define        OPEN                    60      /* 0x3c Mark this point in input as start of #n. */
+#define        CLOSE                   61      /* 0x3d Close corresponding OPEN of #n. */
+#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        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        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        EVAL                    81      /* 0x51 Execute some Perl code. */
+#define        MINMOD                  82      /* 0x52 Next operator is not greedy. */
+#define        LOGICAL                 83      /* 0x53 Next opcode should set the flag only. */
+#define        RENUM                   84      /* 0x54 Group with independently numbered parens. */
+#define        TRIE                    85      /* 0x55 Match many EXACT(F[ALU]?)? at once. flags==type */
+#define        TRIEC                   86      /* 0x56 Same as TRIE, but with embedded charclass data */
+#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        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 */
+#define        OPFAIL                  94      /* 0x5e Same as (?!), but with verb arg */
+#define        ACCEPT                  95      /* 0x5f Accepts the current matched string, with verbar */
+#define        VERB                    96      /* 0x60 Used only for the type field of verbs */
+#define        PRUNE                   97      /* 0x61 Pattern fails at this startpoint if no-backtracking through this */
+#define        MARKPOINT               98      /* 0x62 Push the current location for rollback by cut. */
+#define        SKIP                    99      /* 0x63 On failure skip forward (to the mark) before retrying */
+#define        COMMIT                  100     /* 0x64 Pattern fails outright if backtracking through this */
+#define        CUTGROUP                101     /* 0x65 On failure go to the next alternation in the group */
+#define        KEEPS                   102     /* 0x66 $& begins here. */
+#define        LNBREAK                 103     /* 0x67 generic newline pattern */
+#define        OPTIMIZED               104     /* 0x68 Placeholder for dump. */
+#define        PSEUDO                  105     /* 0x69 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 */
@@ -207,6 +208,7 @@ EXTCONST U8 PL_regkind[] = {
        EXACT,          /* EXACTFU                */
        EXACT,          /* EXACTFAA               */
        EXACT,          /* EXACTFU_SS             */
+       EXACT,          /* EXACTFUP               */
        EXACT,          /* EXACTFLU8              */
        EXACT,          /* EXACTFAA_NO_TRIE       */
        EXACT,          /* EXACT_ONLY8            */
@@ -361,6 +363,7 @@ static const U8 regarglen[] = {
        0,                                      /* EXACTFU      */
        0,                                      /* EXACTFAA     */
        0,                                      /* EXACTFU_SS   */
+       0,                                      /* EXACTFUP     */
        0,                                      /* EXACTFLU8    */
        0,                                      /* EXACTFAA_NO_TRIE */
        0,                                      /* EXACT_ONLY8  */
@@ -471,6 +474,7 @@ static const char reg_off_by_arg[] = {
        0,      /* EXACTFU      */
        0,      /* EXACTFAA     */
        0,      /* EXACTFU_SS   */
+       0,      /* EXACTFUP     */
        0,      /* EXACTFLU8    */
        0,      /* EXACTFAA_NO_TRIE */
        0,      /* EXACT_ONLY8  */
@@ -587,68 +591,69 @@ EXTCONST char * const PL_reg_name[] = {
        "EXACTFU",                      /* 0x28 */
        "EXACTFAA",                     /* 0x29 */
        "EXACTFU_SS",                   /* 0x2a */
-       "EXACTFLU8",                    /* 0x2b */
-       "EXACTFAA_NO_TRIE",             /* 0x2c */
-       "EXACT_ONLY8",                  /* 0x2d */
-       "EXACTFU_ONLY8",                /* 0x2e */
-       "EXACTFS_B_U",                  /* 0x2f */
-       "EXACTFS_E_U",                  /* 0x30 */
-       "EXACTFS_BE_U",                 /* 0x31 */
-       "NOTHING",                      /* 0x32 */
-       "TAIL",                         /* 0x33 */
-       "STAR",                         /* 0x34 */
-       "PLUS",                         /* 0x35 */
-       "CURLY",                        /* 0x36 */
-       "CURLYN",                       /* 0x37 */
-       "CURLYM",                       /* 0x38 */
-       "CURLYX",                       /* 0x39 */
-       "WHILEM",                       /* 0x3a */
-       "OPEN",                         /* 0x3b */
-       "CLOSE",                        /* 0x3c */
-       "SROPEN",                       /* 0x3d */
-       "SRCLOSE",                      /* 0x3e */
-       "REF",                          /* 0x3f */
-       "REFF",                         /* 0x40 */
-       "REFFL",                        /* 0x41 */
-       "REFFU",                        /* 0x42 */
-       "REFFA",                        /* 0x43 */
-       "NREF",                         /* 0x44 */
-       "NREFF",                        /* 0x45 */
-       "NREFFL",                       /* 0x46 */
-       "NREFFU",                       /* 0x47 */
-       "NREFFA",                       /* 0x48 */
-       "LONGJMP",                      /* 0x49 */
-       "BRANCHJ",                      /* 0x4a */
-       "IFMATCH",                      /* 0x4b */
-       "UNLESSM",                      /* 0x4c */
-       "SUSPEND",                      /* 0x4d */
-       "IFTHEN",                       /* 0x4e */
-       "GROUPP",                       /* 0x4f */
-       "EVAL",                         /* 0x50 */
-       "MINMOD",                       /* 0x51 */
-       "LOGICAL",                      /* 0x52 */
-       "RENUM",                        /* 0x53 */
-       "TRIE",                         /* 0x54 */
-       "TRIEC",                        /* 0x55 */
-       "AHOCORASICK",                  /* 0x56 */
-       "AHOCORASICKC",                 /* 0x57 */
-       "GOSUB",                        /* 0x58 */
-       "NGROUPP",                      /* 0x59 */
-       "INSUBP",                       /* 0x5a */
-       "DEFINEP",                      /* 0x5b */
-       "ENDLIKE",                      /* 0x5c */
-       "OPFAIL",                       /* 0x5d */
-       "ACCEPT",                       /* 0x5e */
-       "VERB",                         /* 0x5f */
-       "PRUNE",                        /* 0x60 */
-       "MARKPOINT",                    /* 0x61 */
-       "SKIP",                         /* 0x62 */
-       "COMMIT",                       /* 0x63 */
-       "CUTGROUP",                     /* 0x64 */
-       "KEEPS",                        /* 0x65 */
-       "LNBREAK",                      /* 0x66 */
-       "OPTIMIZED",                    /* 0x67 */
-       "PSEUDO",                       /* 0x68 */
+       "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 */
+       "NOTHING",                      /* 0x33 */
+       "TAIL",                         /* 0x34 */
+       "STAR",                         /* 0x35 */
+       "PLUS",                         /* 0x36 */
+       "CURLY",                        /* 0x37 */
+       "CURLYN",                       /* 0x38 */
+       "CURLYM",                       /* 0x39 */
+       "CURLYX",                       /* 0x3a */
+       "WHILEM",                       /* 0x3b */
+       "OPEN",                         /* 0x3c */
+       "CLOSE",                        /* 0x3d */
+       "SROPEN",                       /* 0x3e */
+       "SRCLOSE",                      /* 0x3f */
+       "REF",                          /* 0x40 */
+       "REFF",                         /* 0x41 */
+       "REFFL",                        /* 0x42 */
+       "REFFU",                        /* 0x43 */
+       "REFFA",                        /* 0x44 */
+       "NREF",                         /* 0x45 */
+       "NREFF",                        /* 0x46 */
+       "NREFFL",                       /* 0x47 */
+       "NREFFU",                       /* 0x48 */
+       "NREFFA",                       /* 0x49 */
+       "LONGJMP",                      /* 0x4a */
+       "BRANCHJ",                      /* 0x4b */
+       "IFMATCH",                      /* 0x4c */
+       "UNLESSM",                      /* 0x4d */
+       "SUSPEND",                      /* 0x4e */
+       "IFTHEN",                       /* 0x4f */
+       "GROUPP",                       /* 0x50 */
+       "EVAL",                         /* 0x51 */
+       "MINMOD",                       /* 0x52 */
+       "LOGICAL",                      /* 0x53 */
+       "RENUM",                        /* 0x54 */
+       "TRIE",                         /* 0x55 */
+       "TRIEC",                        /* 0x56 */
+       "AHOCORASICK",                  /* 0x57 */
+       "AHOCORASICKC",                 /* 0x58 */
+       "GOSUB",                        /* 0x59 */
+       "NGROUPP",                      /* 0x5a */
+       "INSUBP",                       /* 0x5b */
+       "DEFINEP",                      /* 0x5c */
+       "ENDLIKE",                      /* 0x5d */
+       "OPFAIL",                       /* 0x5e */
+       "ACCEPT",                       /* 0x5f */
+       "VERB",                         /* 0x60 */
+       "PRUNE",                        /* 0x61 */
+       "MARKPOINT",                    /* 0x62 */
+       "SKIP",                         /* 0x63 */
+       "COMMIT",                       /* 0x64 */
+       "CUTGROUP",                     /* 0x65 */
+       "KEEPS",                        /* 0x66 */
+       "LNBREAK",                      /* 0x67 */
+       "OPTIMIZED",                    /* 0x68 */
+       "PSEUDO",                       /* 0x69 */
        /* ------------ States ------------- */
        "TRIE_next",                    /* REGNODE_MAX +0x01 */
        "TRIE_next_fail",               /* REGNODE_MAX +0x02 */
@@ -783,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, 0xF0, 0x87, 0xFF, 0x65, 0x00, 0x00, 0x00, 0x00
+    0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0xE0, 0x0F, 0xFF, 0xCB, 0x00, 0x00, 0x00, 0x00
 };
 #endif /* DOINIT */