This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Add RXf_UNBOUNDED_QUANTIFIER and regexp->maxlen
[perl5.git] / regnodes.h
index 6bae28c..f9d4fc0 100644 (file)
@@ -2,12 +2,12 @@
    !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
    This file is built by regen/regcomp.pl from regcomp.sym.
    Any changes made here will be lost!
-*/
+ */
 
 /* Regops and State definitions */
 
-#define REGNODE_MAX            90
-#define REGMATCH_STATE_MAX     130
+#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        EOL                     6       /* 0x06 Match "" at end of line. */
 #define        MEOL                    7       /* 0x07 Same, assuming multiline. */
 #define        SEOL                    8       /* 0x08 Same, assuming singleline. */
-#define        BOUND                   9       /* 0x09 Match "" at any word boundary */
-#define        BOUNDL                  10      /* 0x0a Match "" at any word boundary */
-#define        NBOUND                  11      /* 0x0b Match "" at any word non-boundary */
-#define        NBOUNDL                 12      /* 0x0c Match "" at any word non-boundary */
-#define        GPOS                    13      /* 0x0d Matches where last m//g left off. */
-#define        REG_ANY                 14      /* 0x0e Match any one character (except newline). */
-#define        SANY                    15      /* 0x0f Match any one character. */
-#define        CANY                    16      /* 0x10 Match any one byte. */
-#define        ANYOF                   17      /* 0x11 Match character in (or not in) this class. */
-#define        ALNUM                   18      /* 0x12 Match any alphanumeric character */
-#define        ALNUML                  19      /* 0x13 Match any alphanumeric char in locale */
-#define        NALNUM                  20      /* 0x14 Match any non-alphanumeric character */
-#define        NALNUML                 21      /* 0x15 Match any non-alphanumeric char in locale */
-#define        SPACE                   22      /* 0x16 Match any whitespace character */
-#define        SPACEL                  23      /* 0x17 Match any whitespace char in locale */
-#define        NSPACE                  24      /* 0x18 Match any non-whitespace character */
-#define        NSPACEL                 25      /* 0x19 Match any non-whitespace char in locale */
-#define        DIGIT                   26      /* 0x1a Match any numeric character */
-#define        DIGITL                  27      /* 0x1b Match any numeric character in locale */
-#define        NDIGIT                  28      /* 0x1c Match any non-numeric character */
-#define        NDIGITL                 29      /* 0x1d Match any non-numeric character in locale */
-#define        CLUMP                   30      /* 0x1e Match any combining character sequence */
+#define        BOUND                   9       /* 0x09 Match "" at any word boundary using native charset semantics for non-utf8 */
+#define        BOUNDL                  10      /* 0x0a Match "" at any locale word boundary */
+#define        BOUNDU                  11      /* 0x0b Match "" at any word boundary using Unicode semantics */
+#define        BOUNDA                  12      /* 0x0c Match "" at any word boundary using ASCII semantics */
+#define        NBOUND                  13      /* 0x0d Match "" at any word non-boundary using native charset semantics for non-utf8 */
+#define        NBOUNDL                 14      /* 0x0e Match "" at any locale word non-boundary */
+#define        NBOUNDU                 15      /* 0x0f Match "" at any word non-boundary using Unicode semantics */
+#define        NBOUNDA                 16      /* 0x10 Match "" at any word non-boundary using ASCII semantics */
+#define        GPOS                    17      /* 0x11 Matches where last m//g left off. */
+#define        REG_ANY                 18      /* 0x12 Match any one character (except newline). */
+#define        SANY                    19      /* 0x13 Match any one character. */
+#define        CANY                    20      /* 0x14 Match any one byte. */
+#define        ANYOF                   21      /* 0x15 Match character in (or not in) this class, single char match only */
+#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        CLUMP                   30      /* 0x1e Match any extended grapheme cluster sequence */
 #define        BRANCH                  31      /* 0x1f Match this alternative, or the next... */
 #define        BACK                    32      /* 0x20 Match "", "next" ptr points backward. */
 #define        EXACT                   33      /* 0x21 Match this string (preceded by length). */
-#define        EXACTF                  34      /* 0x22 Match this string, folded (prec. by length). */
-#define        EXACTFL                 35      /* 0x23 Match this string, folded in locale (w/len). */
-#define        NOTHING                 36      /* 0x24 Match empty string. */
-#define        TAIL                    37      /* 0x25 Match empty string. Can jump here from outside. */
-#define        STAR                    38      /* 0x26 Match this (simple) thing 0 or more times. */
-#define        PLUS                    39      /* 0x27 Match this (simple) thing 1 or more times. */
-#define        CURLY                   40      /* 0x28 Match this simple thing {n,m} times. */
-#define        CURLYN                  41      /* 0x29 Capture next-after-this simple thing */
-#define        CURLYM                  42      /* 0x2a Capture this medium-complex thing {n,m} times. */
-#define        CURLYX                  43      /* 0x2b Match this complex thing {n,m} times. */
-#define        WHILEM                  44      /* 0x2c Do curly processing and see if rest matches. */
-#define        OPEN                    45      /* 0x2d Mark this point in input as start of */
-#define        CLOSE                   46      /* 0x2e Analogous to OPEN. */
-#define        REF                     47      /* 0x2f Match some already matched string */
-#define        REFF                    48      /* 0x30 Match already matched string, folded */
-#define        REFFL                   49      /* 0x31 Match already matched string, folded in loc. */
-#define        IFMATCH                 50      /* 0x32 Succeeds if the following matches. */
-#define        UNLESSM                 51      /* 0x33 Fails if the following matches. */
-#define        SUSPEND                 52      /* 0x34 "Independent" sub-RE. */
-#define        IFTHEN                  53      /* 0x35 Switch, should be preceeded by switcher . */
-#define        GROUPP                  54      /* 0x36 Whether the group matched. */
-#define        LONGJMP                 55      /* 0x37 Jump far away. */
-#define        BRANCHJ                 56      /* 0x38 BRANCH with long offset. */
-#define        EVAL                    57      /* 0x39 Execute some Perl code. */
-#define        MINMOD                  58      /* 0x3a Next operator is not greedy. */
-#define        LOGICAL                 59      /* 0x3b Next opcode should set the flag only. */
-#define        RENUM                   60      /* 0x3c Group with independently numbered parens. */
-#define        TRIE                    61      /* 0x3d Match many EXACT(FL?)? at once. flags==type */
-#define        TRIEC                   62      /* 0x3e Same as TRIE, but with embedded charclass data */
-#define        AHOCORASICK             63      /* 0x3f Aho Corasick stclass. flags==type */
-#define        AHOCORASICKC            64      /* 0x40 Same as AHOCORASICK, but with embedded charclass data */
-#define        GOSUB                   65      /* 0x41 recurse to paren arg1 at (signed) ofs arg2 */
-#define        GOSTART                 66      /* 0x42 recurse to start of pattern */
-#define        NREF                    67      /* 0x43 Match some already matched string */
-#define        NREFF                   68      /* 0x44 Match already matched string, folded */
-#define        NREFFL                  69      /* 0x45 Match already matched string, folded in loc. */
-#define        NGROUPP                 70      /* 0x46 Whether the group matched. */
-#define        INSUBP                  71      /* 0x47 Whether we are in a specific recurse. */
-#define        DEFINEP                 72      /* 0x48 Never execute directly. */
-#define        ENDLIKE                 73      /* 0x49 Used only for the type field of verbs */
-#define        OPFAIL                  74      /* 0x4a Same as (?!) */
-#define        ACCEPT                  75      /* 0x4b Accepts the current matched string. */
-#define        VERB                    76      /* 0x4c Used only for the type field of verbs */
-#define        PRUNE                   77      /* 0x4d Pattern fails at this startpoint if no-backtracking through this */
-#define        MARKPOINT               78      /* 0x4e Push the current location for rollback by cut. */
-#define        SKIP                    79      /* 0x4f On failure skip forward (to the mark) before retrying */
-#define        COMMIT                  80      /* 0x50 Pattern fails outright if backtracking through this */
-#define        CUTGROUP                81      /* 0x51 On failure go to the next alternation in the group */
-#define        KEEPS                   82      /* 0x52 $& begins here. */
-#define        LNBREAK                 83      /* 0x53 generic newline pattern */
-#define        VERTWS                  84      /* 0x54 vertical whitespace         (Perl 6) */
-#define        NVERTWS                 85      /* 0x55 not vertical whitespace     (Perl 6) */
-#define        HORIZWS                 86      /* 0x56 horizontal whitespace       (Perl 6) */
-#define        NHORIZWS                87      /* 0x57 not horizontal whitespace   (Perl 6) */
-#define        FOLDCHAR                88      /* 0x58 codepoint with tricky case folding properties. */
-#define        OPTIMIZED               89      /* 0x59 Placeholder for dump. */
-#define        PSEUDO                  90      /* 0x5a Pseudo opcode for internal use. */
+#define        EXACTF                  34      /* 0x22 Match this non-UTF-8 string (not guaranteed to be folded) using /id rules (w/len). */
+#define        EXACTFL                 35      /* 0x23 Match this string (not guaranteed to be folded) using /il rules (w/len). */
+#define        EXACTFU                 36      /* 0x24 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                 37      /* 0x25 Match this string (not guaranteed to be folded) using /iaa rules (w/len). */
+#define        EXACTFU_SS              38      /* 0x26 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        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 semantics 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 semantics for non-utf8 */
+#define        REFFA                   55      /* 0x37 Match already matched string, folded using unicode semantics 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 semantics 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 semantics for non-utf8 */
+#define        NREFFA                  60      /* 0x3c Match already matched string, folded using unicode semantics for non-utf8, no mixing ASCII, non-ASCII */
+#define        IFMATCH                 61      /* 0x3d Succeeds if the following matches. */
+#define        UNLESSM                 62      /* 0x3e Fails if the following matches. */
+#define        SUSPEND                 63      /* 0x3f "Independent" sub-RE. */
+#define        IFTHEN                  64      /* 0x40 Switch, should be preceded by switcher. */
+#define        GROUPP                  65      /* 0x41 Whether the group matched. */
+#define        LONGJMP                 66      /* 0x42 Jump far away. */
+#define        BRANCHJ                 67      /* 0x43 BRANCH with long offset. */
+#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 */
@@ -159,31 +162,35 @@ EXTCONST U8 PL_regkind[] = {
        EOL,            /* SEOL                   */
        BOUND,          /* BOUND                  */
        BOUND,          /* BOUNDL                 */
+       BOUND,          /* BOUNDU                 */
+       BOUND,          /* BOUNDA                 */
        NBOUND,         /* NBOUND                 */
        NBOUND,         /* NBOUNDL                */
+       NBOUND,         /* NBOUNDU                */
+       NBOUND,         /* NBOUNDA                */
        GPOS,           /* GPOS                   */
        REG_ANY,        /* REG_ANY                */
        REG_ANY,        /* SANY                   */
        REG_ANY,        /* CANY                   */
        ANYOF,          /* ANYOF                  */
-       ALNUM,          /* ALNUM                  */
-       ALNUM,          /* ALNUML                 */
-       NALNUM,         /* NALNUM                 */
-       NALNUM,         /* NALNUML                */
-       SPACE,          /* SPACE                  */
-       SPACE,          /* SPACEL                 */
-       NSPACE,         /* NSPACE                 */
-       NSPACE,         /* NSPACEL                */
-       DIGIT,          /* DIGIT                  */
-       DIGIT,          /* DIGITL                 */
-       NDIGIT,         /* NDIGIT                 */
-       NDIGIT,         /* NDIGITL                */
+       POSIXD,         /* POSIXD                 */
+       POSIXD,         /* POSIXL                 */
+       POSIXD,         /* POSIXU                 */
+       POSIXD,         /* POSIXA                 */
+       NPOSIXD,        /* NPOSIXD                */
+       NPOSIXD,        /* NPOSIXL                */
+       NPOSIXD,        /* NPOSIXU                */
+       NPOSIXD,        /* NPOSIXA                */
        CLUMP,          /* CLUMP                  */
        BRANCH,         /* BRANCH                 */
        BACK,           /* BACK                   */
        EXACT,          /* EXACT                  */
        EXACT,          /* EXACTF                 */
        EXACT,          /* EXACTFL                */
+       EXACT,          /* EXACTFU                */
+       EXACT,          /* EXACTFA                */
+       EXACT,          /* EXACTFU_SS             */
+       EXACT,          /* EXACTFA_NO_TRIE        */
        NOTHING,        /* NOTHING                */
        NOTHING,        /* TAIL                   */
        STAR,           /* STAR                   */
@@ -198,6 +205,13 @@ EXTCONST U8 PL_regkind[] = {
        REF,            /* REF                    */
        REF,            /* REFF                   */
        REF,            /* REFFL                  */
+       REF,            /* REFFU                  */
+       REF,            /* REFFA                  */
+       REF,            /* NREF                   */
+       REF,            /* NREFF                  */
+       REF,            /* NREFFL                 */
+       REF,            /* NREFFU                 */
+       REF,            /* NREFFA                 */
        BRANCHJ,        /* IFMATCH                */
        BRANCHJ,        /* UNLESSM                */
        BRANCHJ,        /* SUSPEND                */
@@ -215,9 +229,6 @@ EXTCONST U8 PL_regkind[] = {
        TRIE,           /* AHOCORASICKC           */
        GOSUB,          /* GOSUB                  */
        GOSTART,        /* GOSTART                */
-       REF,            /* NREF                   */
-       REF,            /* NREFF                  */
-       REF,            /* NREFFL                 */
        NGROUPP,        /* NGROUPP                */
        INSUBP,         /* INSUBP                 */
        DEFINEP,        /* DEFINEP                */
@@ -232,11 +243,6 @@ EXTCONST U8 PL_regkind[] = {
        VERB,           /* CUTGROUP               */
        KEEPS,          /* KEEPS                  */
        LNBREAK,        /* LNBREAK                */
-       VERTWS,         /* VERTWS                 */
-       NVERTWS,        /* NVERTWS                */
-       HORIZWS,        /* HORIZWS                */
-       NHORIZWS,       /* NHORIZWS               */
-       FOLDCHAR,       /* FOLDCHAR               */
        NOTHING,        /* OPTIMIZED              */
        PSEUDO,         /* PSEUDO                 */
        /* ------------ States ------------- */
@@ -298,31 +304,35 @@ static const U8 regarglen[] = {
        0,                                      /* SEOL         */
        0,                                      /* BOUND        */
        0,                                      /* BOUNDL       */
+       0,                                      /* BOUNDU       */
+       0,                                      /* BOUNDA       */
        0,                                      /* NBOUND       */
        0,                                      /* NBOUNDL      */
+       0,                                      /* NBOUNDU      */
+       0,                                      /* NBOUNDA      */
        0,                                      /* GPOS         */
        0,                                      /* REG_ANY      */
        0,                                      /* SANY         */
        0,                                      /* CANY         */
        0,                                      /* ANYOF        */
-       0,                                      /* ALNUM        */
-       0,                                      /* ALNUML       */
-       0,                                      /* NALNUM       */
-       0,                                      /* NALNUML      */
-       0,                                      /* SPACE        */
-       0,                                      /* SPACEL       */
-       0,                                      /* NSPACE       */
-       0,                                      /* NSPACEL      */
-       0,                                      /* DIGIT        */
-       0,                                      /* DIGITL       */
-       0,                                      /* NDIGIT       */
-       0,                                      /* NDIGITL      */
+       0,                                      /* POSIXD       */
+       0,                                      /* POSIXL       */
+       0,                                      /* POSIXU       */
+       0,                                      /* POSIXA       */
+       0,                                      /* NPOSIXD      */
+       0,                                      /* NPOSIXL      */
+       0,                                      /* NPOSIXU      */
+       0,                                      /* NPOSIXA      */
        0,                                      /* CLUMP        */
        0,                                      /* BRANCH       */
        0,                                      /* BACK         */
        0,                                      /* EXACT        */
        0,                                      /* EXACTF       */
        0,                                      /* EXACTFL      */
+       0,                                      /* EXACTFU      */
+       0,                                      /* EXACTFA      */
+       0,                                      /* EXACTFU_SS   */
+       0,                                      /* EXACTFA_NO_TRIE */
        0,                                      /* NOTHING      */
        0,                                      /* TAIL         */
        0,                                      /* STAR         */
@@ -337,6 +347,13 @@ static const U8 regarglen[] = {
        EXTRA_SIZE(struct regnode_1),           /* REF          */
        EXTRA_SIZE(struct regnode_1),           /* REFF         */
        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),           /* IFMATCH      */
        EXTRA_SIZE(struct regnode_1),           /* UNLESSM      */
        EXTRA_SIZE(struct regnode_1),           /* SUSPEND      */
@@ -354,9 +371,6 @@ static const U8 regarglen[] = {
        EXTRA_SIZE(struct regnode_charclass),   /* AHOCORASICKC */
        EXTRA_SIZE(struct regnode_2L),          /* GOSUB        */
        0,                                      /* GOSTART      */
-       EXTRA_SIZE(struct regnode_1),           /* NREF         */
-       EXTRA_SIZE(struct regnode_1),           /* NREFF        */
-       EXTRA_SIZE(struct regnode_1),           /* NREFFL       */
        EXTRA_SIZE(struct regnode_1),           /* NGROUPP      */
        EXTRA_SIZE(struct regnode_1),           /* INSUBP       */
        EXTRA_SIZE(struct regnode_1),           /* DEFINEP      */
@@ -371,11 +385,6 @@ static const U8 regarglen[] = {
        EXTRA_SIZE(struct regnode_1),           /* CUTGROUP     */
        0,                                      /* KEEPS        */
        0,                                      /* LNBREAK      */
-       0,                                      /* VERTWS       */
-       0,                                      /* NVERTWS      */
-       0,                                      /* HORIZWS      */
-       0,                                      /* NHORIZWS     */
-       EXTRA_SIZE(struct regnode_1),           /* FOLDCHAR     */
        0,                                      /* OPTIMIZED    */
        0,                                      /* PSEUDO       */
 };
@@ -394,31 +403,35 @@ static const char reg_off_by_arg[] = {
        0,      /* SEOL         */
        0,      /* BOUND        */
        0,      /* BOUNDL       */
+       0,      /* BOUNDU       */
+       0,      /* BOUNDA       */
        0,      /* NBOUND       */
        0,      /* NBOUNDL      */
+       0,      /* NBOUNDU      */
+       0,      /* NBOUNDA      */
        0,      /* GPOS         */
        0,      /* REG_ANY      */
        0,      /* SANY         */
        0,      /* CANY         */
        0,      /* ANYOF        */
-       0,      /* ALNUM        */
-       0,      /* ALNUML       */
-       0,      /* NALNUM       */
-       0,      /* NALNUML      */
-       0,      /* SPACE        */
-       0,      /* SPACEL       */
-       0,      /* NSPACE       */
-       0,      /* NSPACEL      */
-       0,      /* DIGIT        */
-       0,      /* DIGITL       */
-       0,      /* NDIGIT       */
-       0,      /* NDIGITL      */
+       0,      /* POSIXD       */
+       0,      /* POSIXL       */
+       0,      /* POSIXU       */
+       0,      /* POSIXA       */
+       0,      /* NPOSIXD      */
+       0,      /* NPOSIXL      */
+       0,      /* NPOSIXU      */
+       0,      /* NPOSIXA      */
        0,      /* CLUMP        */
        0,      /* BRANCH       */
        0,      /* BACK         */
        0,      /* EXACT        */
        0,      /* EXACTF       */
        0,      /* EXACTFL      */
+       0,      /* EXACTFU      */
+       0,      /* EXACTFA      */
+       0,      /* EXACTFU_SS   */
+       0,      /* EXACTFA_NO_TRIE */
        0,      /* NOTHING      */
        0,      /* TAIL         */
        0,      /* STAR         */
@@ -433,6 +446,13 @@ static const char reg_off_by_arg[] = {
        0,      /* REF          */
        0,      /* REFF         */
        0,      /* REFFL        */
+       0,      /* REFFU        */
+       0,      /* REFFA        */
+       0,      /* NREF         */
+       0,      /* NREFF        */
+       0,      /* NREFFL       */
+       0,      /* NREFFU       */
+       0,      /* NREFFA       */
        2,      /* IFMATCH      */
        2,      /* UNLESSM      */
        1,      /* SUSPEND      */
@@ -450,9 +470,6 @@ static const char reg_off_by_arg[] = {
        0,      /* AHOCORASICKC */
        0,      /* GOSUB        */
        0,      /* GOSTART      */
-       0,      /* NREF         */
-       0,      /* NREFF        */
-       0,      /* NREFFL       */
        0,      /* NGROUPP      */
        0,      /* INSUBP       */
        0,      /* DEFINEP      */
@@ -467,11 +484,6 @@ static const char reg_off_by_arg[] = {
        0,      /* CUTGROUP     */
        0,      /* KEEPS        */
        0,      /* LNBREAK      */
-       0,      /* VERTWS       */
-       0,      /* NVERTWS      */
-       0,      /* HORIZWS      */
-       0,      /* NHORIZWS     */
-       0,      /* FOLDCHAR     */
        0,      /* OPTIMIZED    */
        0,      /* PSEUDO       */
 };
@@ -495,86 +507,89 @@ EXTCONST char * const PL_reg_name[] = {
        "SEOL",                         /* 0x08 */
        "BOUND",                        /* 0x09 */
        "BOUNDL",                       /* 0x0a */
-       "NBOUND",                       /* 0x0b */
-       "NBOUNDL",                      /* 0x0c */
-       "GPOS",                         /* 0x0d */
-       "REG_ANY",                      /* 0x0e */
-       "SANY",                         /* 0x0f */
-       "CANY",                         /* 0x10 */
-       "ANYOF",                        /* 0x11 */
-       "ALNUM",                        /* 0x12 */
-       "ALNUML",                       /* 0x13 */
-       "NALNUM",                       /* 0x14 */
-       "NALNUML",                      /* 0x15 */
-       "SPACE",                        /* 0x16 */
-       "SPACEL",                       /* 0x17 */
-       "NSPACE",                       /* 0x18 */
-       "NSPACEL",                      /* 0x19 */
-       "DIGIT",                        /* 0x1a */
-       "DIGITL",                       /* 0x1b */
-       "NDIGIT",                       /* 0x1c */
-       "NDIGITL",                      /* 0x1d */
+       "BOUNDU",                       /* 0x0b */
+       "BOUNDA",                       /* 0x0c */
+       "NBOUND",                       /* 0x0d */
+       "NBOUNDL",                      /* 0x0e */
+       "NBOUNDU",                      /* 0x0f */
+       "NBOUNDA",                      /* 0x10 */
+       "GPOS",                         /* 0x11 */
+       "REG_ANY",                      /* 0x12 */
+       "SANY",                         /* 0x13 */
+       "CANY",                         /* 0x14 */
+       "ANYOF",                        /* 0x15 */
+       "POSIXD",                       /* 0x16 */
+       "POSIXL",                       /* 0x17 */
+       "POSIXU",                       /* 0x18 */
+       "POSIXA",                       /* 0x19 */
+       "NPOSIXD",                      /* 0x1a */
+       "NPOSIXL",                      /* 0x1b */
+       "NPOSIXU",                      /* 0x1c */
+       "NPOSIXA",                      /* 0x1d */
        "CLUMP",                        /* 0x1e */
        "BRANCH",                       /* 0x1f */
        "BACK",                         /* 0x20 */
        "EXACT",                        /* 0x21 */
        "EXACTF",                       /* 0x22 */
        "EXACTFL",                      /* 0x23 */
-       "NOTHING",                      /* 0x24 */
-       "TAIL",                         /* 0x25 */
-       "STAR",                         /* 0x26 */
-       "PLUS",                         /* 0x27 */
-       "CURLY",                        /* 0x28 */
-       "CURLYN",                       /* 0x29 */
-       "CURLYM",                       /* 0x2a */
-       "CURLYX",                       /* 0x2b */
-       "WHILEM",                       /* 0x2c */
-       "OPEN",                         /* 0x2d */
-       "CLOSE",                        /* 0x2e */
-       "REF",                          /* 0x2f */
-       "REFF",                         /* 0x30 */
-       "REFFL",                        /* 0x31 */
-       "IFMATCH",                      /* 0x32 */
-       "UNLESSM",                      /* 0x33 */
-       "SUSPEND",                      /* 0x34 */
-       "IFTHEN",                       /* 0x35 */
-       "GROUPP",                       /* 0x36 */
-       "LONGJMP",                      /* 0x37 */
-       "BRANCHJ",                      /* 0x38 */
-       "EVAL",                         /* 0x39 */
-       "MINMOD",                       /* 0x3a */
-       "LOGICAL",                      /* 0x3b */
-       "RENUM",                        /* 0x3c */
-       "TRIE",                         /* 0x3d */
-       "TRIEC",                        /* 0x3e */
-       "AHOCORASICK",                  /* 0x3f */
-       "AHOCORASICKC",                 /* 0x40 */
-       "GOSUB",                        /* 0x41 */
-       "GOSTART",                      /* 0x42 */
-       "NREF",                         /* 0x43 */
-       "NREFF",                        /* 0x44 */
-       "NREFFL",                       /* 0x45 */
-       "NGROUPP",                      /* 0x46 */
-       "INSUBP",                       /* 0x47 */
-       "DEFINEP",                      /* 0x48 */
-       "ENDLIKE",                      /* 0x49 */
-       "OPFAIL",                       /* 0x4a */
-       "ACCEPT",                       /* 0x4b */
-       "VERB",                         /* 0x4c */
-       "PRUNE",                        /* 0x4d */
-       "MARKPOINT",                    /* 0x4e */
-       "SKIP",                         /* 0x4f */
-       "COMMIT",                       /* 0x50 */
-       "CUTGROUP",                     /* 0x51 */
-       "KEEPS",                        /* 0x52 */
-       "LNBREAK",                      /* 0x53 */
-       "VERTWS",                       /* 0x54 */
-       "NVERTWS",                      /* 0x55 */
-       "HORIZWS",                      /* 0x56 */
-       "NHORIZWS",                     /* 0x57 */
-       "FOLDCHAR",                     /* 0x58 */
-       "OPTIMIZED",                    /* 0x59 */
-       "PSEUDO",                       /* 0x5a */
+       "EXACTFU",                      /* 0x24 */
+       "EXACTFA",                      /* 0x25 */
+       "EXACTFU_SS",                   /* 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 */
+       "IFMATCH",                      /* 0x3d */
+       "UNLESSM",                      /* 0x3e */
+       "SUSPEND",                      /* 0x3f */
+       "IFTHEN",                       /* 0x40 */
+       "GROUPP",                       /* 0x41 */
+       "LONGJMP",                      /* 0x42 */
+       "BRANCHJ",                      /* 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 */
@@ -625,32 +640,32 @@ EXTCONST char * const PL_reg_name[] = {
 EXTCONST char * PL_reg_extflags_name[];
 #else
 EXTCONST char * const PL_reg_extflags_name[] = {
-       /* Bits in extflags defined: 11111111111111111111111001111111 */
+       /* Bits in extflags defined: 11111110111111111111111111111111 */
        "MULTILINE",        /* 0x00000001 */
        "SINGLELINE",       /* 0x00000002 */
        "FOLD",             /* 0x00000004 */
        "EXTENDED",         /* 0x00000008 */
        "KEEPCOPY",         /* 0x00000010 */
-       "LOCALE",           /* 0x00000020 */
-       "UNICODE",          /* 0x00000040 */
-       "UNUSED_BIT_7",     /* 0x00000080 */
-       "UNUSED_BIT_8",     /* 0x00000100 */
-       "ANCH_BOL",         /* 0x00000200 */
-       "ANCH_MBOL",        /* 0x00000400 */
-       "ANCH_SBOL",        /* 0x00000800 */
-       "ANCH_GPOS",        /* 0x00001000 */
-       "GPOS_SEEN",        /* 0x00002000 */
-       "GPOS_FLOAT",       /* 0x00004000 */
-       "LOOKBEHIND_SEEN",  /* 0x00008000 */
+       "CHARSET0",         /* 0x00000020 : "CHARSET" - 0x000000e0 */
+       "CHARSET1",         /* 0x00000040 : "CHARSET" - 0x000000e0 */
+       "CHARSET2",         /* 0x00000080 : "CHARSET" - 0x000000e0 */
+       "SPLIT",            /* 0x00000100 */
+       "IS_ANCHORED",      /* 0x00000200 */
+       "UNUSED1",          /* 0x00000400 */
+       "UNUSED2",          /* 0x00000800 */
+       "UNUSED3",          /* 0x00001000 */
+       "UNUSED4",          /* 0x00002000 */
+       "UNUSED5",          /* 0x00004000 */
+       "NO_INPLACE_SUBST", /* 0x00008000 */
        "EVAL_SEEN",        /* 0x00010000 */
-       "CANY_SEEN",        /* 0x00020000 */
-       "NOSCAN",           /* 0x00040000 */
+       "UNUSED8",          /* 0x00020000 */
+       "UNBOUNDED_QUANTIFIER_SEEN",/* 0x00040000 */
        "CHECK_ALL",        /* 0x00080000 */
        "MATCH_UTF8",       /* 0x00100000 */
        "USE_INTUIT_NOML",  /* 0x00200000 */
        "USE_INTUIT_ML",    /* 0x00400000 */
        "INTUIT_TAIL",      /* 0x00800000 */
-       "SPLIT",            /* 0x01000000 */
+       "UNUSED_BIT_24",    /* 0x01000000 */
        "COPY_DONE",        /* 0x02000000 */
        "TAINTED_SEEN",     /* 0x04000000 */
        "TAINTED",          /* 0x08000000 */
@@ -661,6 +676,29 @@ EXTCONST char * const PL_reg_extflags_name[] = {
 };
 #endif /* DOINIT */
 
+/* PL_reg_intflags_name[] - Opcode/state names in string form, for debugging */
+
+#ifndef DOINIT
+EXTCONST char * PL_reg_intflags_name[];
+#else
+EXTCONST char * const PL_reg_intflags_name[] = {
+       "SKIP",                       /* 0x00000001 - PREGf_SKIP */
+       "IMPLICIT",                   /* 0x00000002 - PREGf_IMPLICIT -  Converted .* to ^.*  */
+       "NAUGHTY",                    /* 0x00000004 - PREGf_NAUGHTY -  how exponential is this pattern?  */
+       "VERBARG_SEEN",               /* 0x00000008 - PREGf_VERBARG_SEEN */
+       "CUTGROUP_SEEN",              /* 0x00000010 - PREGf_CUTGROUP_SEEN */
+       "USE_RE_EVAL",                /* 0x00000020 - PREGf_USE_RE_EVAL -  compiled with "use re 'eval'"  */
+       "NOSCAN",                     /* 0x00000040 - PREGf_NOSCAN */
+       "CANY_SEEN",                  /* 0x00000080 - PREGf_CANY_SEEN */
+       "GPOS_SEEN",                  /* 0x00000100 - PREGf_GPOS_SEEN */
+       "GPOS_FLOAT",                 /* 0x00000200 - PREGf_GPOS_FLOAT */
+       "ANCH_BOL",                   /* 0x00000400 - PREGf_ANCH_BOL */
+       "ANCH_MBOL",                  /* 0x00000800 - PREGf_ANCH_MBOL */
+       "ANCH_SBOL",                  /* 0x00001000 - PREGf_ANCH_SBOL */
+       "ANCH_GPOS",                  /* 0x00002000 - PREGf_ANCH_GPOS */
+};
+#endif /* DOINIT */
+
 /* The following have no fixed length. U8 so we can do strchr() on it. */
 #define REGNODE_VARIES(node) (PL_varies_bitmask[(node) >> 3] & (1 << ((node) & 7)))
 
@@ -669,7 +707,8 @@ EXTCONST U8 PL_varies[] __attribute__deprecated__;
 #else
 EXTCONST U8 PL_varies[] __attribute__deprecated__ = {
     CLUMP, BRANCH, BACK, STAR, PLUS, CURLY, CURLYN, CURLYM, CURLYX, WHILEM,
-    REF, REFF, REFFL, SUSPEND, IFTHEN, BRANCHJ, NREF, NREFF, NREFFL,
+    REF, REFF, REFFL, REFFU, REFFA, NREF, NREFF, NREFFL, NREFFU, NREFFA,
+    SUSPEND, IFTHEN, BRANCHJ,
     0
 };
 #endif /* DOINIT */
@@ -678,7 +717,7 @@ EXTCONST U8 PL_varies[] __attribute__deprecated__ = {
 EXTCONST U8 PL_varies_bitmask[];
 #else
 EXTCONST U8 PL_varies_bitmask[] = {
-    0x00, 0x00, 0x00, 0xC0, 0xC1, 0x9F, 0x33, 0x01, 0x38, 0x00, 0x00, 0x00
+    0x00, 0x00, 0x00, 0xC0, 0x01, 0xFC, 0xF9, 0x9F, 0x09, 0x00, 0x00, 0x00
 };
 #endif /* DOINIT */
 
@@ -690,9 +729,8 @@ EXTCONST U8 PL_varies_bitmask[] = {
 EXTCONST U8 PL_simple[] __attribute__deprecated__;
 #else
 EXTCONST U8 PL_simple[] __attribute__deprecated__ = {
-    REG_ANY, SANY, CANY, ANYOF, ALNUM, ALNUML, NALNUM, NALNUML, SPACE,
-    SPACEL, NSPACE, NSPACEL, DIGIT, NDIGIT, VERTWS, NVERTWS, HORIZWS,
-    NHORIZWS,
+    REG_ANY, SANY, CANY, ANYOF, POSIXD, POSIXL, POSIXU, POSIXA, NPOSIXD,
+    NPOSIXL, NPOSIXU, NPOSIXA,
     0
 };
 #endif /* DOINIT */
@@ -701,7 +739,7 @@ EXTCONST U8 PL_simple[] __attribute__deprecated__ = {
 EXTCONST U8 PL_simple_bitmask[];
 #else
 EXTCONST U8 PL_simple_bitmask[] = {
-    0x00, 0xC0, 0xFF, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x00
+    0x00, 0x00, 0xFC, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 #endif /* DOINIT */