This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
regcomp.sym: Add node type ANYOF_POSIXL
[perl5.git] / regnodes.h
index b1cc6b3..590cba5 100644 (file)
 
 /* Regops and State definitions */
 
-#define REGNODE_MAX            108
-#define REGMATCH_STATE_MAX     148
+#define REGNODE_MAX            98
+#define REGMATCH_STATE_MAX     138
 
 #define        END                     0       /* 0000 End of program. */
 #define        SUCCEED                 1       /* 0x01 Return from a subroutine, basically. */
-#define        BOL                     2       /* 0x02 Match "" at beginning of line. */
-#define        MBOL                    3       /* 0x03 Same, assuming multiline. */
-#define        SBOL                    4       /* 0x04 Same, assuming singleline. */
-#define        EOS                     5       /* 0x05 Match "" at end of string. */
-#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 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        ANYOFV                  22      /* 0x16 Match character in (or not in) this class, can match-multiple chars */
-#define        ALNUM                   23      /* 0x17 Match any alphanumeric character using native charset semantics for non-utf8 */
-#define        ALNUML                  24      /* 0x18 Match any alphanumeric char in locale */
-#define        ALNUMU                  25      /* 0x19 Match any alphanumeric char using Unicode semantics */
-#define        ALNUMA                  26      /* 0x1a Match [A-Za-z_0-9] */
-#define        NALNUM                  27      /* 0x1b Match any non-alphanumeric character using native charset semantics for non-utf8 */
-#define        NALNUML                 28      /* 0x1c Match any non-alphanumeric char in locale */
-#define        NALNUMU                 29      /* 0x1d Match any non-alphanumeric char using Unicode semantics */
-#define        NALNUMA                 30      /* 0x1e Match [^A-Za-z_0-9] */
-#define        SPACE                   31      /* 0x1f Match any whitespace character using native charset semantics for non-utf8 */
-#define        SPACEL                  32      /* 0x20 Match any whitespace char in locale */
-#define        SPACEU                  33      /* 0x21 Match any whitespace char using Unicode semantics */
-#define        SPACEA                  34      /* 0x22 Match [ \t\n\f\r] */
-#define        NSPACE                  35      /* 0x23 Match any non-whitespace character using native charset semantics for non-utf8 */
-#define        NSPACEL                 36      /* 0x24 Match any non-whitespace char in locale */
-#define        NSPACEU                 37      /* 0x25 Match any non-whitespace char using Unicode semantics */
-#define        NSPACEA                 38      /* 0x26 Match [^ \t\n\f\r] */
-#define        DIGIT                   39      /* 0x27 Match any numeric character using native charset semantics for non-utf8 */
-#define        DIGITL                  40      /* 0x28 Match any numeric character in locale */
-#define        DIGITA                  41      /* 0x29 Match [0-9] */
-#define        NDIGIT                  42      /* 0x2a Match any non-numeric character using native charset semantics for non-utf8 */
-#define        NDIGITL                 43      /* 0x2b Match any non-numeric character in locale */
-#define        NDIGITA                 44      /* 0x2c Match [^0-9] */
-#define        CLUMP                   45      /* 0x2d Match any extended grapheme cluster sequence */
-#define        BRANCH                  46      /* 0x2e Match this alternative, or the next... */
-#define        BACK                    47      /* 0x2f Match "", "next" ptr points backward. */
-#define        EXACT                   48      /* 0x30 Match this string (preceded by length). */
-#define        EXACTF                  49      /* 0x31 Match this string, folded, native charset semantics for non-utf8 (prec. by length). */
-#define        EXACTFL                 50      /* 0x32 Match this string, folded in locale (w/len). */
-#define        EXACTFU                 51      /* 0x33 Match this string, folded, Unicode semantics for non-utf8 (prec. by length). */
-#define        NOTHING                 52      /* 0x34 Match empty string. */
-#define        TAIL                    53      /* 0x35 Match empty string. Can jump here from outside. */
-#define        STAR                    54      /* 0x36 Match this (simple) thing 0 or more times. */
-#define        PLUS                    55      /* 0x37 Match this (simple) thing 1 or more times. */
-#define        CURLY                   56      /* 0x38 Match this simple thing {n,m} times. */
-#define        CURLYN                  57      /* 0x39 Capture next-after-this simple thing */
-#define        CURLYM                  58      /* 0x3a Capture this medium-complex thing {n,m} times. */
-#define        CURLYX                  59      /* 0x3b Match this complex thing {n,m} times. */
-#define        WHILEM                  60      /* 0x3c Do curly processing and see if rest matches. */
-#define        OPEN                    61      /* 0x3d Mark this point in input as start of */
-#define        CLOSE                   62      /* 0x3e Analogous to OPEN. */
-#define        REF                     63      /* 0x3f Match some already matched string */
-#define        REFF                    64      /* 0x40 Match already matched string, folded using native charset semantics 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 semantics for non-utf8 */
-#define        NREF                    67      /* 0x43 Match some already matched string */
-#define        NREFF                   68      /* 0x44 Match already matched string, folded using native charset semantics for non-utf8 */
-#define        NREFFL                  69      /* 0x45 Match already matched string, folded in loc. */
-#define        NREFFU                  70      /* 0x46 Match already matched string, folded using unicode semantics for non-utf8 */
-#define        IFMATCH                 71      /* 0x47 Succeeds if the following matches. */
-#define        UNLESSM                 72      /* 0x48 Fails if the following matches. */
-#define        SUSPEND                 73      /* 0x49 "Independent" sub-RE. */
-#define        IFTHEN                  74      /* 0x4a Switch, should be preceded by switcher . */
-#define        GROUPP                  75      /* 0x4b Whether the group matched. */
-#define        LONGJMP                 76      /* 0x4c Jump far away. */
-#define        BRANCHJ                 77      /* 0x4d BRANCH with long offset. */
-#define        EVAL                    78      /* 0x4e Execute some Perl code. */
-#define        MINMOD                  79      /* 0x4f Next operator is not greedy. */
-#define        LOGICAL                 80      /* 0x50 Next opcode should set the flag only. */
-#define        RENUM                   81      /* 0x51 Group with independently numbered parens. */
-#define        TRIE                    82      /* 0x52 Match many EXACT(F[LU]?)? at once. flags==type */
-#define        TRIEC                   83      /* 0x53 Same as TRIE, but with embedded charclass data */
-#define        AHOCORASICK             84      /* 0x54 Aho Corasick stclass. flags==type */
-#define        AHOCORASICKC            85      /* 0x55 Same as AHOCORASICK, but with embedded charclass data */
-#define        GOSUB                   86      /* 0x56 recurse to paren arg1 at (signed) ofs arg2 */
-#define        GOSTART                 87      /* 0x57 recurse to start of pattern */
-#define        NGROUPP                 88      /* 0x58 Whether the group matched. */
-#define        INSUBP                  89      /* 0x59 Whether we are in a specific recurse. */
-#define        DEFINEP                 90      /* 0x5a Never execute directly. */
-#define        ENDLIKE                 91      /* 0x5b Used only for the type field of verbs */
-#define        OPFAIL                  92      /* 0x5c Same as (?!) */
-#define        ACCEPT                  93      /* 0x5d Accepts the current matched string. */
-#define        VERB                    94      /* 0x5e Used only for the type field of verbs */
-#define        PRUNE                   95      /* 0x5f Pattern fails at this startpoint if no-backtracking through this */
-#define        MARKPOINT               96      /* 0x60 Push the current location for rollback by cut. */
-#define        SKIP                    97      /* 0x61 On failure skip forward (to the mark) before retrying */
-#define        COMMIT                  98      /* 0x62 Pattern fails outright if backtracking through this */
-#define        CUTGROUP                99      /* 0x63 On failure go to the next alternation in the group */
-#define        KEEPS                   100     /* 0x64 $& begins here. */
-#define        LNBREAK                 101     /* 0x65 generic newline pattern */
-#define        VERTWS                  102     /* 0x66 vertical whitespace         (Perl 6) */
-#define        NVERTWS                 103     /* 0x67 not vertical whitespace     (Perl 6) */
-#define        HORIZWS                 104     /* 0x68 horizontal whitespace       (Perl 6) */
-#define        NHORIZWS                105     /* 0x69 not horizontal whitespace   (Perl 6) */
-#define        FOLDCHAR                106     /* 0x6a codepoint with tricky case folding properties. */
-#define        OPTIMIZED               107     /* 0x6b Placeholder for dump. */
-#define        PSEUDO                  108     /* 0x6c Pseudo opcode for internal use. */
+#define        SBOL                    2       /* 0x02 Match "" at beginning of line: /^/, /\A/ */
+#define        BOL                     2       /* 0x02 type alias */
+#define        MBOL                    3       /* 0x03 Same, assuming multiline: /^/m */
+#define        SEOL                    4       /* 0x04 Match "" at end of line: /$/ */
+#define        EOL                     4       /* 0x04 type alias */
+#define        MEOL                    5       /* 0x05 Same, assuming multiline: /$/m */
+#define        EOS                     6       /* 0x06 Match "" at end of string: /\z/ */
+#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        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        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        ANYOF                   18      /* 0x12 Match character in (or not in) this class, single char match only */
+#define        ANYOFD                  19      /* 0x13 Like ANYOF, but /d is in effect */
+#define        ANYOFL                  20      /* 0x14 Like ANYOF, but /l is in effect */
+#define        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        POSIXD                  23      /* 0x17 Some [[:class:]] under /d; the FLAGS field gives which one */
+#define        POSIXL                  24      /* 0x18 Some [[:class:]] under /l; the FLAGS field gives which one */
+#define        POSIXU                  25      /* 0x19 Some [[:class:]] under /u; the FLAGS field gives which one */
+#define        POSIXA                  26      /* 0x1a Some [[:class:]] under /a; the FLAGS field gives which one */
+#define        NPOSIXD                 27      /* 0x1b complement of POSIXD, [[:^class:]] */
+#define        NPOSIXL                 28      /* 0x1c complement of POSIXL, [[:^class:]] */
+#define        NPOSIXU                 29      /* 0x1d complement of POSIXU, [[:^class:]] */
+#define        NPOSIXA                 30      /* 0x1e complement of POSIXA, [[:^class:]] */
+#define        ASCII                   31      /* 0x1f [[:ascii:]] */
+#define        NASCII                  32      /* 0x20 [[:^ascii:]] */
+#define        CLUMP                   33      /* 0x21 Match any extended grapheme cluster sequence */
+#define        BRANCH                  34      /* 0x22 Match this alternative, or the next... */
+#define        EXACT                   35      /* 0x23 Match this string (preceded by length). */
+#define        EXACTL                  36      /* 0x24 Like EXACT, but /l is in effect (used so locale-related warnings can be checked for). */
+#define        EXACTF                  37      /* 0x25 Match this non-UTF-8 string (not guaranteed to be folded) using /id rules (w/len). */
+#define        EXACTFL                 38      /* 0x26 Match this string (not guaranteed to be folded) using /il rules (w/len). */
+#define        EXACTFU                 39      /* 0x27 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        EXACTFAA                40      /* 0x28 Match this string (not guaranteed to be folded) using /iaa rules (w/len). */
+#define        EXACTFU_SS              41      /* 0x29 Match this string (folded iff in UTF-8, length in folding may change even if not in UTF-8) using /iu rules (w/len). */
+#define        EXACTFLU8               42      /* 0x2a Rare circumstances: like EXACTFU, but is under /l, UTF-8, folded, and everything in it is above 255. */
+#define        EXACTFAA_NO_TRIE        43      /* 0x2b Match this string (which is not trie-able; not guaranteed to be folded) using /iaa rules (w/len). */
+#define        NOTHING                 44      /* 0x2c Match empty string. */
+#define        TAIL                    45      /* 0x2d Match empty string. Can jump here from outside. */
+#define        STAR                    46      /* 0x2e Match this (simple) thing 0 or more times. */
+#define        PLUS                    47      /* 0x2f Match this (simple) thing 1 or more times. */
+#define        CURLY                   48      /* 0x30 Match this simple thing {n,m} times. */
+#define        CURLYN                  49      /* 0x31 Capture next-after-this simple thing */
+#define        CURLYM                  50      /* 0x32 Capture this medium-complex thing {n,m} times. */
+#define        CURLYX                  51      /* 0x33 Match this complex thing {n,m} times. */
+#define        WHILEM                  52      /* 0x34 Do curly processing and see if rest matches. */
+#define        OPEN                    53      /* 0x35 Mark this point in input as start of #n. */
+#define        CLOSE                   54      /* 0x36 Close corresponding OPEN of #n. */
+#define        SROPEN                  55      /* 0x37 Same as OPEN, but for script run */
+#define        SRCLOSE                 56      /* 0x38 Close preceding SROPEN */
+#define        REF                     57      /* 0x39 Match some already matched string */
+#define        REFF                    58      /* 0x3a Match already matched string, folded using native charset rules for non-utf8 */
+#define        REFFL                   59      /* 0x3b Match already matched string, folded in loc. */
+#define        REFFU                   60      /* 0x3c Match already matched string, folded using unicode rules for non-utf8 */
+#define        REFFA                   61      /* 0x3d Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
+#define        NREF                    62      /* 0x3e Match some already matched string */
+#define        NREFF                   63      /* 0x3f Match already matched string, folded using native charset rules for non-utf8 */
+#define        NREFFL                  64      /* 0x40 Match already matched string, folded in loc. */
+#define        NREFFU                  65      /* 0x41 Match already matched string, folded using unicode rules for non-utf8 */
+#define        NREFFA                  66      /* 0x42 Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
+#define        LONGJMP                 67      /* 0x43 Jump far away. */
+#define        BRANCHJ                 68      /* 0x44 BRANCH with long offset. */
+#define        IFMATCH                 69      /* 0x45 Succeeds if the following matches. */
+#define        UNLESSM                 70      /* 0x46 Fails if the following matches. */
+#define        SUSPEND                 71      /* 0x47 "Independent" sub-RE. */
+#define        IFTHEN                  72      /* 0x48 Switch, should be preceded by switcher. */
+#define        GROUPP                  73      /* 0x49 Whether the group matched. */
+#define        EVAL                    74      /* 0x4a Execute some Perl code. */
+#define        MINMOD                  75      /* 0x4b Next operator is not greedy. */
+#define        LOGICAL                 76      /* 0x4c Next opcode should set the flag only. */
+#define        RENUM                   77      /* 0x4d Group with independently numbered parens. */
+#define        TRIE                    78      /* 0x4e Match many EXACT(F[ALU]?)? at once. flags==type */
+#define        TRIEC                   79      /* 0x4f Same as TRIE, but with embedded charclass data */
+#define        AHOCORASICK             80      /* 0x50 Aho Corasick stclass. flags==type */
+#define        AHOCORASICKC            81      /* 0x51 Same as AHOCORASICK, but with embedded charclass data */
+#define        GOSUB                   82      /* 0x52 recurse to paren arg1 at (signed) ofs arg2 */
+#define        NGROUPP                 83      /* 0x53 Whether the group matched. */
+#define        INSUBP                  84      /* 0x54 Whether we are in a specific recurse. */
+#define        DEFINEP                 85      /* 0x55 Never execute directly. */
+#define        ENDLIKE                 86      /* 0x56 Used only for the type field of verbs */
+#define        OPFAIL                  87      /* 0x57 Same as (?!), but with verb arg */
+#define        ACCEPT                  88      /* 0x58 Accepts the current matched string, with verbar */
+#define        VERB                    89      /* 0x59 Used only for the type field of verbs */
+#define        PRUNE                   90      /* 0x5a Pattern fails at this startpoint if no-backtracking through this */
+#define        MARKPOINT               91      /* 0x5b Push the current location for rollback by cut. */
+#define        SKIP                    92      /* 0x5c On failure skip forward (to the mark) before retrying */
+#define        COMMIT                  93      /* 0x5d Pattern fails outright if backtracking through this */
+#define        CUTGROUP                94      /* 0x5e On failure go to the next alternation in the group */
+#define        KEEPS                   95      /* 0x5f $& begins here. */
+#define        LNBREAK                 96      /* 0x60 generic newline pattern */
+#define        OPTIMIZED               97      /* 0x61 Placeholder for dump. */
+#define        PSEUDO                  98      /* 0x62 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 */
-#define        EVAL_AB                 (REGNODE_MAX + 3)       /* state for EVAL */
-#define        EVAL_AB_fail            (REGNODE_MAX + 4)       /* state for EVAL */
-#define        CURLYX_end              (REGNODE_MAX + 5)       /* state for CURLYX */
-#define        CURLYX_end_fail         (REGNODE_MAX + 6)       /* state for CURLYX */
-#define        WHILEM_A_pre            (REGNODE_MAX + 7)       /* state for WHILEM */
-#define        WHILEM_A_pre_fail       (REGNODE_MAX + 8)       /* state for WHILEM */
-#define        WHILEM_A_min            (REGNODE_MAX + 9)       /* state for WHILEM */
-#define        WHILEM_A_min_fail       (REGNODE_MAX + 10)      /* state for WHILEM */
-#define        WHILEM_A_max            (REGNODE_MAX + 11)      /* state for WHILEM */
-#define        WHILEM_A_max_fail       (REGNODE_MAX + 12)      /* state for WHILEM */
-#define        WHILEM_B_min            (REGNODE_MAX + 13)      /* state for WHILEM */
-#define        WHILEM_B_min_fail       (REGNODE_MAX + 14)      /* state for WHILEM */
-#define        WHILEM_B_max            (REGNODE_MAX + 15)      /* state for WHILEM */
-#define        WHILEM_B_max_fail       (REGNODE_MAX + 16)      /* state for WHILEM */
-#define        BRANCH_next             (REGNODE_MAX + 17)      /* state for BRANCH */
-#define        BRANCH_next_fail        (REGNODE_MAX + 18)      /* state for BRANCH */
-#define        CURLYM_A                (REGNODE_MAX + 19)      /* state for CURLYM */
-#define        CURLYM_A_fail           (REGNODE_MAX + 20)      /* state for CURLYM */
-#define        CURLYM_B                (REGNODE_MAX + 21)      /* state for CURLYM */
-#define        CURLYM_B_fail           (REGNODE_MAX + 22)      /* state for CURLYM */
-#define        IFMATCH_A               (REGNODE_MAX + 23)      /* state for IFMATCH */
-#define        IFMATCH_A_fail          (REGNODE_MAX + 24)      /* state for IFMATCH */
-#define        CURLY_B_min_known       (REGNODE_MAX + 25)      /* state for CURLY */
-#define        CURLY_B_min_known_fail  (REGNODE_MAX + 26)      /* state for CURLY */
+#define        EVAL_                 (REGNODE_MAX + 3)       /* state for EVAL */
+#define        EVAL_B_fail             (REGNODE_MAX + 4)       /* state for EVAL */
+#define        EVAL_postponed_AB       (REGNODE_MAX + 5)       /* state for EVAL */
+#define        EVAL_postponed_AB_fail  (REGNODE_MAX + 6)       /* state for EVAL */
+#define        CURLYX_end              (REGNODE_MAX + 7)       /* state for CURLYX */
+#define        CURLYX_end_fail         (REGNODE_MAX + 8)       /* state for CURLYX */
+#define        WHILEM_A_pre            (REGNODE_MAX + 9)       /* state for WHILEM */
+#define        WHILEM_A_pre_fail       (REGNODE_MAX + 10)      /* state for WHILEM */
+#define        WHILEM_A_min            (REGNODE_MAX + 11)      /* state for WHILEM */
+#define        WHILEM_A_min_fail       (REGNODE_MAX + 12)      /* state for WHILEM */
+#define        WHILEM_A_max            (REGNODE_MAX + 13)      /* state for WHILEM */
+#define        WHILEM_A_max_fail       (REGNODE_MAX + 14)      /* state for WHILEM */
+#define        WHILEM_B_min            (REGNODE_MAX + 15)      /* state for WHILEM */
+#define        WHILEM_B_min_fail       (REGNODE_MAX + 16)      /* state for WHILEM */
+#define        WHILEM_B_max            (REGNODE_MAX + 17)      /* state for WHILEM */
+#define        WHILEM_B_max_fail       (REGNODE_MAX + 18)      /* state for WHILEM */
+#define        BRANCH_next             (REGNODE_MAX + 19)      /* state for BRANCH */
+#define        BRANCH_next_fail        (REGNODE_MAX + 20)      /* state for BRANCH */
+#define        CURLYM_A                (REGNODE_MAX + 21)      /* state for CURLYM */
+#define        CURLYM_A_fail           (REGNODE_MAX + 22)      /* state for CURLYM */
+#define        CURLYM_B                (REGNODE_MAX + 23)      /* state for CURLYM */
+#define        CURLYM_B_fail           (REGNODE_MAX + 24)      /* state for CURLYM */
+#define        IFMATCH_A               (REGNODE_MAX + 25)      /* state for IFMATCH */
+#define        IFMATCH_A_fail          (REGNODE_MAX + 26)      /* state for IFMATCH */
 #define        CURLY_B_min             (REGNODE_MAX + 27)      /* state for CURLY */
 #define        CURLY_B_min_fail        (REGNODE_MAX + 28)      /* state for CURLY */
 #define        CURLY_B_max             (REGNODE_MAX + 29)      /* state for CURLY */
@@ -168,13 +160,12 @@ EXTCONST U8 PL_regkind[];
 EXTCONST U8 PL_regkind[] = {
        END,            /* END                    */
        END,            /* SUCCEED                */
-       BOL,            /* BOL                    */
-       BOL,            /* MBOL                   */
        BOL,            /* SBOL                   */
-       EOL,            /* EOS                    */
-       EOL,            /* EOL                    */
-       EOL,            /* MEOL                   */
+       BOL,            /* MBOL                   */
        EOL,            /* SEOL                   */
+       EOL,            /* MEOL                   */
+       EOL,            /* EOS                    */
+       GPOS,           /* GPOS                   */
        BOUND,          /* BOUND                  */
        BOUND,          /* BOUNDL                 */
        BOUND,          /* BOUNDU                 */
@@ -183,41 +174,34 @@ EXTCONST U8 PL_regkind[] = {
        NBOUND,         /* NBOUNDL                */
        NBOUND,         /* NBOUNDU                */
        NBOUND,         /* NBOUNDA                */
-       GPOS,           /* GPOS                   */
        REG_ANY,        /* REG_ANY                */
        REG_ANY,        /* SANY                   */
-       REG_ANY,        /* CANY                   */
        ANYOF,          /* ANYOF                  */
-       ANYOF,          /* ANYOFV                 */
-       ALNUM,          /* ALNUM                  */
-       ALNUM,          /* ALNUML                 */
-       ALNUM,          /* ALNUMU                 */
-       ALNUM,          /* ALNUMA                 */
-       NALNUM,         /* NALNUM                 */
-       NALNUM,         /* NALNUML                */
-       NALNUM,         /* NALNUMU                */
-       NALNUM,         /* NALNUMA                */
-       SPACE,          /* SPACE                  */
-       SPACE,          /* SPACEL                 */
-       SPACE,          /* SPACEU                 */
-       SPACE,          /* SPACEA                 */
-       NSPACE,         /* NSPACE                 */
-       NSPACE,         /* NSPACEL                */
-       NSPACE,         /* NSPACEU                */
-       NSPACE,         /* NSPACEA                */
-       DIGIT,          /* DIGIT                  */
-       DIGIT,          /* DIGITL                 */
-       DIGIT,          /* DIGITA                 */
-       NDIGIT,         /* NDIGIT                 */
-       NDIGIT,         /* NDIGITL                */
-       NDIGIT,         /* NDIGITA                */
+       ANYOF,          /* ANYOFD                 */
+       ANYOF,          /* ANYOFL                 */
+       ANYOF,          /* ANYOFPOSIXL            */
+       ANYOFM,         /* ANYOFM                 */
+       POSIXD,         /* POSIXD                 */
+       POSIXD,         /* POSIXL                 */
+       POSIXD,         /* POSIXU                 */
+       POSIXD,         /* POSIXA                 */
+       NPOSIXD,        /* NPOSIXD                */
+       NPOSIXD,        /* NPOSIXL                */
+       NPOSIXD,        /* NPOSIXU                */
+       NPOSIXD,        /* NPOSIXA                */
+       ASCII,          /* ASCII                  */
+       ASCII,          /* NASCII                 */
        CLUMP,          /* CLUMP                  */
        BRANCH,         /* BRANCH                 */
-       BACK,           /* BACK                   */
        EXACT,          /* EXACT                  */
+       EXACT,          /* EXACTL                 */
        EXACT,          /* EXACTF                 */
        EXACT,          /* EXACTFL                */
        EXACT,          /* EXACTFU                */
+       EXACT,          /* EXACTFAA               */
+       EXACT,          /* EXACTFU_SS             */
+       EXACT,          /* EXACTFLU8              */
+       EXACT,          /* EXACTFAA_NO_TRIE       */
        NOTHING,        /* NOTHING                */
        NOTHING,        /* TAIL                   */
        STAR,           /* STAR                   */
@@ -229,21 +213,25 @@ EXTCONST U8 PL_regkind[] = {
        WHILEM,         /* WHILEM                 */
        OPEN,           /* OPEN                   */
        CLOSE,          /* CLOSE                  */
+       SROPEN,         /* SROPEN                 */
+       SRCLOSE,        /* SRCLOSE                */
        REF,            /* REF                    */
        REF,            /* REFF                   */
        REF,            /* REFFL                  */
        REF,            /* REFFU                  */
+       REF,            /* REFFA                  */
        REF,            /* NREF                   */
        REF,            /* NREFF                  */
        REF,            /* NREFFL                 */
        REF,            /* NREFFU                 */
+       REF,            /* NREFFA                 */
+       LONGJMP,        /* LONGJMP                */
+       BRANCHJ,        /* BRANCHJ                */
        BRANCHJ,        /* IFMATCH                */
        BRANCHJ,        /* UNLESSM                */
        BRANCHJ,        /* SUSPEND                */
        BRANCHJ,        /* IFTHEN                 */
        GROUPP,         /* GROUPP                 */
-       LONGJMP,        /* LONGJMP                */
-       BRANCHJ,        /* BRANCHJ                */
        EVAL,           /* EVAL                   */
        MINMOD,         /* MINMOD                 */
        LOGICAL,        /* LOGICAL                */
@@ -253,7 +241,6 @@ EXTCONST U8 PL_regkind[] = {
        TRIE,           /* AHOCORASICK            */
        TRIE,           /* AHOCORASICKC           */
        GOSUB,          /* GOSUB                  */
-       GOSTART,        /* GOSTART                */
        NGROUPP,        /* NGROUPP                */
        INSUBP,         /* INSUBP                 */
        DEFINEP,        /* DEFINEP                */
@@ -268,18 +255,15 @@ 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 ------------- */
        TRIE,           /* TRIE_next              */
        TRIE,           /* TRIE_next_fail         */
-       EVAL,           /* EVAL_AB                */
-       EVAL,           /* EVAL_AB_fail           */
+       EVAL,           /* EVAL_B                 */
+       EVAL,           /* EVAL_B_fail            */
+       EVAL,           /* EVAL_postponed_AB      */
+       EVAL,           /* EVAL_postponed_AB_fail */
        CURLYX,         /* CURLYX_end             */
        CURLYX,         /* CURLYX_end_fail        */
        WHILEM,         /* WHILEM_A_pre           */
@@ -300,8 +284,6 @@ EXTCONST U8 PL_regkind[] = {
        CURLYM,         /* CURLYM_B_fail          */
        IFMATCH,        /* IFMATCH_A              */
        IFMATCH,        /* IFMATCH_A_fail         */
-       CURLY,          /* CURLY_B_min_known      */
-       CURLY,          /* CURLY_B_min_known_fail */
        CURLY,          /* CURLY_B_min            */
        CURLY,          /* CURLY_B_min_fail       */
        CURLY,          /* CURLY_B_max            */
@@ -319,19 +301,19 @@ EXTCONST U8 PL_regkind[] = {
 };
 #endif
 
+#ifdef REG_COMP_C
+
 /* regarglen[] - How large is the argument part of the node (in regnodes) */
 
-#ifdef REG_COMP_C
 static const U8 regarglen[] = {
        0,                                      /* END          */
        0,                                      /* SUCCEED      */
-       0,                                      /* BOL          */
-       0,                                      /* MBOL         */
        0,                                      /* SBOL         */
-       0,                                      /* EOS          */
-       0,                                      /* EOL          */
-       0,                                      /* MEOL         */
+       0,                                      /* MBOL         */
        0,                                      /* SEOL         */
+       0,                                      /* MEOL         */
+       0,                                      /* EOS          */
+       0,                                      /* GPOS         */
        0,                                      /* BOUND        */
        0,                                      /* BOUNDL       */
        0,                                      /* BOUNDU       */
@@ -340,41 +322,34 @@ static const U8 regarglen[] = {
        0,                                      /* NBOUNDL      */
        0,                                      /* NBOUNDU      */
        0,                                      /* NBOUNDA      */
-       0,                                      /* GPOS         */
        0,                                      /* REG_ANY      */
        0,                                      /* SANY         */
-       0,                                      /* CANY         */
-       0,                                      /* ANYOF        */
-       0,                                      /* ANYOFV       */
-       0,                                      /* ALNUM        */
-       0,                                      /* ALNUML       */
-       0,                                      /* ALNUMU       */
-       0,                                      /* ALNUMA       */
-       0,                                      /* NALNUM       */
-       0,                                      /* NALNUML      */
-       0,                                      /* NALNUMU      */
-       0,                                      /* NALNUMA      */
-       0,                                      /* SPACE        */
-       0,                                      /* SPACEL       */
-       0,                                      /* SPACEU       */
-       0,                                      /* SPACEA       */
-       0,                                      /* NSPACE       */
-       0,                                      /* NSPACEL      */
-       0,                                      /* NSPACEU      */
-       0,                                      /* NSPACEA      */
-       0,                                      /* DIGIT        */
-       0,                                      /* DIGITL       */
-       0,                                      /* DIGITA       */
-       0,                                      /* NDIGIT       */
-       0,                                      /* NDIGITL      */
-       0,                                      /* NDIGITA      */
+       EXTRA_SIZE(struct regnode_1),           /* ANYOF        */
+       EXTRA_SIZE(struct regnode_1),           /* ANYOFD       */
+       EXTRA_SIZE(struct regnode_1),           /* ANYOFL       */
+       EXTRA_SIZE(struct regnode_1),           /* ANYOFPOSIXL  */
+       EXTRA_SIZE(struct regnode_1),           /* ANYOFM       */
+       0,                                      /* POSIXD       */
+       0,                                      /* POSIXL       */
+       0,                                      /* POSIXU       */
+       0,                                      /* POSIXA       */
+       0,                                      /* NPOSIXD      */
+       0,                                      /* NPOSIXL      */
+       0,                                      /* NPOSIXU      */
+       0,                                      /* NPOSIXA      */
+       0,                                      /* ASCII        */
+       0,                                      /* NASCII       */
        0,                                      /* CLUMP        */
        0,                                      /* BRANCH       */
-       0,                                      /* BACK         */
        0,                                      /* EXACT        */
+       0,                                      /* EXACTL       */
        0,                                      /* EXACTF       */
        0,                                      /* EXACTFL      */
        0,                                      /* EXACTFU      */
+       0,                                      /* EXACTFAA     */
+       0,                                      /* EXACTFU_SS   */
+       0,                                      /* EXACTFLU8    */
+       0,                                      /* EXACTFAA_NO_TRIE */
        0,                                      /* NOTHING      */
        0,                                      /* TAIL         */
        0,                                      /* STAR         */
@@ -386,22 +361,26 @@ static const U8 regarglen[] = {
        0,                                      /* WHILEM       */
        EXTRA_SIZE(struct regnode_1),           /* OPEN         */
        EXTRA_SIZE(struct regnode_1),           /* CLOSE        */
+       0,                                      /* SROPEN       */
+       0,                                      /* SRCLOSE      */
        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),           /* LONGJMP      */
+       EXTRA_SIZE(struct regnode_1),           /* BRANCHJ      */
        EXTRA_SIZE(struct regnode_1),           /* IFMATCH      */
        EXTRA_SIZE(struct regnode_1),           /* UNLESSM      */
        EXTRA_SIZE(struct regnode_1),           /* SUSPEND      */
        EXTRA_SIZE(struct regnode_1),           /* IFTHEN       */
        EXTRA_SIZE(struct regnode_1),           /* GROUPP       */
-       EXTRA_SIZE(struct regnode_1),           /* LONGJMP      */
-       EXTRA_SIZE(struct regnode_1),           /* BRANCHJ      */
-       EXTRA_SIZE(struct regnode_1),           /* EVAL         */
+       EXTRA_SIZE(struct regnode_2L),          /* EVAL         */
        0,                                      /* MINMOD       */
        0,                                      /* LOGICAL      */
        EXTRA_SIZE(struct regnode_1),           /* RENUM        */
@@ -410,13 +389,12 @@ static const U8 regarglen[] = {
        EXTRA_SIZE(struct regnode_1),           /* AHOCORASICK  */
        EXTRA_SIZE(struct regnode_charclass),   /* AHOCORASICKC */
        EXTRA_SIZE(struct regnode_2L),          /* GOSUB        */
-       0,                                      /* GOSTART      */
        EXTRA_SIZE(struct regnode_1),           /* NGROUPP      */
        EXTRA_SIZE(struct regnode_1),           /* INSUBP       */
        EXTRA_SIZE(struct regnode_1),           /* DEFINEP      */
        0,                                      /* ENDLIKE      */
-       0,                                      /* OPFAIL       */
-       EXTRA_SIZE(struct regnode_1),           /* ACCEPT       */
+       EXTRA_SIZE(struct regnode_1),           /* OPFAIL       */
+       EXTRA_SIZE(struct regnode_2L),          /* ACCEPT       */
        EXTRA_SIZE(struct regnode_1),           /* VERB         */
        EXTRA_SIZE(struct regnode_1),           /* PRUNE        */
        EXTRA_SIZE(struct regnode_1),           /* MARKPOINT    */
@@ -425,11 +403,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       */
 };
@@ -439,13 +412,12 @@ static const U8 regarglen[] = {
 static const char reg_off_by_arg[] = {
        0,      /* END          */
        0,      /* SUCCEED      */
-       0,      /* BOL          */
-       0,      /* MBOL         */
        0,      /* SBOL         */
-       0,      /* EOS          */
-       0,      /* EOL          */
-       0,      /* MEOL         */
+       0,      /* MBOL         */
        0,      /* SEOL         */
+       0,      /* MEOL         */
+       0,      /* EOS          */
+       0,      /* GPOS         */
        0,      /* BOUND        */
        0,      /* BOUNDL       */
        0,      /* BOUNDU       */
@@ -454,41 +426,34 @@ static const char reg_off_by_arg[] = {
        0,      /* NBOUNDL      */
        0,      /* NBOUNDU      */
        0,      /* NBOUNDA      */
-       0,      /* GPOS         */
        0,      /* REG_ANY      */
        0,      /* SANY         */
-       0,      /* CANY         */
        0,      /* ANYOF        */
-       0,      /* ANYOFV       */
-       0,      /* ALNUM        */
-       0,      /* ALNUML       */
-       0,      /* ALNUMU       */
-       0,      /* ALNUMA       */
-       0,      /* NALNUM       */
-       0,      /* NALNUML      */
-       0,      /* NALNUMU      */
-       0,      /* NALNUMA      */
-       0,      /* SPACE        */
-       0,      /* SPACEL       */
-       0,      /* SPACEU       */
-       0,      /* SPACEA       */
-       0,      /* NSPACE       */
-       0,      /* NSPACEL      */
-       0,      /* NSPACEU      */
-       0,      /* NSPACEA      */
-       0,      /* DIGIT        */
-       0,      /* DIGITL       */
-       0,      /* DIGITA       */
-       0,      /* NDIGIT       */
-       0,      /* NDIGITL      */
-       0,      /* NDIGITA      */
+       0,      /* ANYOFD       */
+       0,      /* ANYOFL       */
+       0,      /* ANYOFPOSIXL  */
+       0,      /* ANYOFM       */
+       0,      /* POSIXD       */
+       0,      /* POSIXL       */
+       0,      /* POSIXU       */
+       0,      /* POSIXA       */
+       0,      /* NPOSIXD      */
+       0,      /* NPOSIXL      */
+       0,      /* NPOSIXU      */
+       0,      /* NPOSIXA      */
+       0,      /* ASCII        */
+       0,      /* NASCII       */
        0,      /* CLUMP        */
        0,      /* BRANCH       */
-       0,      /* BACK         */
        0,      /* EXACT        */
+       0,      /* EXACTL       */
        0,      /* EXACTF       */
        0,      /* EXACTFL      */
        0,      /* EXACTFU      */
+       0,      /* EXACTFAA     */
+       0,      /* EXACTFU_SS   */
+       0,      /* EXACTFLU8    */
+       0,      /* EXACTFAA_NO_TRIE */
        0,      /* NOTHING      */
        0,      /* TAIL         */
        0,      /* STAR         */
@@ -500,21 +465,25 @@ static const char reg_off_by_arg[] = {
        0,      /* WHILEM       */
        0,      /* OPEN         */
        0,      /* CLOSE        */
+       0,      /* SROPEN       */
+       0,      /* SRCLOSE      */
        0,      /* REF          */
        0,      /* REFF         */
        0,      /* REFFL        */
        0,      /* REFFU        */
+       0,      /* REFFA        */
        0,      /* NREF         */
        0,      /* NREFF        */
        0,      /* NREFFL       */
        0,      /* NREFFU       */
+       0,      /* NREFFA       */
+       1,      /* LONGJMP      */
+       1,      /* BRANCHJ      */
        2,      /* IFMATCH      */
        2,      /* UNLESSM      */
        1,      /* SUSPEND      */
        1,      /* IFTHEN       */
        0,      /* GROUPP       */
-       1,      /* LONGJMP      */
-       1,      /* BRANCHJ      */
        0,      /* EVAL         */
        0,      /* MINMOD       */
        0,      /* LOGICAL      */
@@ -524,7 +493,6 @@ static const char reg_off_by_arg[] = {
        0,      /* AHOCORASICK  */
        0,      /* AHOCORASICKC */
        0,      /* GOSUB        */
-       0,      /* GOSTART      */
        0,      /* NGROUPP      */
        0,      /* INSUBP       */
        0,      /* DEFINEP      */
@@ -539,17 +507,13 @@ 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       */
 };
 
 #endif /* REG_COMP_C */
 
+
 /* reg_name[] - Opcode/state names in string form, for debugging */
 
 #ifndef DOINIT
@@ -558,140 +522,130 @@ EXTCONST char * PL_reg_name[];
 EXTCONST char * const PL_reg_name[] = {
        "END",                          /* 0000 */
        "SUCCEED",                      /* 0x01 */
-       "BOL",                          /* 0x02 */
+       "SBOL",                         /* 0x02 */
        "MBOL",                         /* 0x03 */
-       "SBOL",                         /* 0x04 */
-       "EOS",                          /* 0x05 */
-       "EOL",                          /* 0x06 */
-       "MEOL",                         /* 0x07 */
-       "SEOL",                         /* 0x08 */
-       "BOUND",                        /* 0x09 */
-       "BOUNDL",                       /* 0x0a */
-       "BOUNDU",                       /* 0x0b */
-       "BOUNDA",                       /* 0x0c */
-       "NBOUND",                       /* 0x0d */
-       "NBOUNDL",                      /* 0x0e */
-       "NBOUNDU",                      /* 0x0f */
-       "NBOUNDA",                      /* 0x10 */
-       "GPOS",                         /* 0x11 */
-       "REG_ANY",                      /* 0x12 */
-       "SANY",                         /* 0x13 */
-       "CANY",                         /* 0x14 */
-       "ANYOF",                        /* 0x15 */
-       "ANYOFV",                       /* 0x16 */
-       "ALNUM",                        /* 0x17 */
-       "ALNUML",                       /* 0x18 */
-       "ALNUMU",                       /* 0x19 */
-       "ALNUMA",                       /* 0x1a */
-       "NALNUM",                       /* 0x1b */
-       "NALNUML",                      /* 0x1c */
-       "NALNUMU",                      /* 0x1d */
-       "NALNUMA",                      /* 0x1e */
-       "SPACE",                        /* 0x1f */
-       "SPACEL",                       /* 0x20 */
-       "SPACEU",                       /* 0x21 */
-       "SPACEA",                       /* 0x22 */
-       "NSPACE",                       /* 0x23 */
-       "NSPACEL",                      /* 0x24 */
-       "NSPACEU",                      /* 0x25 */
-       "NSPACEA",                      /* 0x26 */
-       "DIGIT",                        /* 0x27 */
-       "DIGITL",                       /* 0x28 */
-       "DIGITA",                       /* 0x29 */
-       "NDIGIT",                       /* 0x2a */
-       "NDIGITL",                      /* 0x2b */
-       "NDIGITA",                      /* 0x2c */
-       "CLUMP",                        /* 0x2d */
-       "BRANCH",                       /* 0x2e */
-       "BACK",                         /* 0x2f */
-       "EXACT",                        /* 0x30 */
-       "EXACTF",                       /* 0x31 */
-       "EXACTFL",                      /* 0x32 */
-       "EXACTFU",                      /* 0x33 */
-       "NOTHING",                      /* 0x34 */
-       "TAIL",                         /* 0x35 */
-       "STAR",                         /* 0x36 */
-       "PLUS",                         /* 0x37 */
-       "CURLY",                        /* 0x38 */
-       "CURLYN",                       /* 0x39 */
-       "CURLYM",                       /* 0x3a */
-       "CURLYX",                       /* 0x3b */
-       "WHILEM",                       /* 0x3c */
-       "OPEN",                         /* 0x3d */
-       "CLOSE",                        /* 0x3e */
-       "REF",                          /* 0x3f */
-       "REFF",                         /* 0x40 */
-       "REFFL",                        /* 0x41 */
-       "REFFU",                        /* 0x42 */
-       "NREF",                         /* 0x43 */
-       "NREFF",                        /* 0x44 */
-       "NREFFL",                       /* 0x45 */
-       "NREFFU",                       /* 0x46 */
-       "IFMATCH",                      /* 0x47 */
-       "UNLESSM",                      /* 0x48 */
-       "SUSPEND",                      /* 0x49 */
-       "IFTHEN",                       /* 0x4a */
-       "GROUPP",                       /* 0x4b */
-       "LONGJMP",                      /* 0x4c */
-       "BRANCHJ",                      /* 0x4d */
-       "EVAL",                         /* 0x4e */
-       "MINMOD",                       /* 0x4f */
-       "LOGICAL",                      /* 0x50 */
-       "RENUM",                        /* 0x51 */
-       "TRIE",                         /* 0x52 */
-       "TRIEC",                        /* 0x53 */
-       "AHOCORASICK",                  /* 0x54 */
-       "AHOCORASICKC",                 /* 0x55 */
-       "GOSUB",                        /* 0x56 */
-       "GOSTART",                      /* 0x57 */
-       "NGROUPP",                      /* 0x58 */
-       "INSUBP",                       /* 0x59 */
-       "DEFINEP",                      /* 0x5a */
-       "ENDLIKE",                      /* 0x5b */
-       "OPFAIL",                       /* 0x5c */
-       "ACCEPT",                       /* 0x5d */
-       "VERB",                         /* 0x5e */
-       "PRUNE",                        /* 0x5f */
-       "MARKPOINT",                    /* 0x60 */
-       "SKIP",                         /* 0x61 */
-       "COMMIT",                       /* 0x62 */
-       "CUTGROUP",                     /* 0x63 */
-       "KEEPS",                        /* 0x64 */
-       "LNBREAK",                      /* 0x65 */
-       "VERTWS",                       /* 0x66 */
-       "NVERTWS",                      /* 0x67 */
-       "HORIZWS",                      /* 0x68 */
-       "NHORIZWS",                     /* 0x69 */
-       "FOLDCHAR",                     /* 0x6a */
-       "OPTIMIZED",                    /* 0x6b */
-       "PSEUDO",                       /* 0x6c */
+       "SEOL",                         /* 0x04 */
+       "MEOL",                         /* 0x05 */
+       "EOS",                          /* 0x06 */
+       "GPOS",                         /* 0x07 */
+       "BOUND",                        /* 0x08 */
+       "BOUNDL",                       /* 0x09 */
+       "BOUNDU",                       /* 0x0a */
+       "BOUNDA",                       /* 0x0b */
+       "NBOUND",                       /* 0x0c */
+       "NBOUNDL",                      /* 0x0d */
+       "NBOUNDU",                      /* 0x0e */
+       "NBOUNDA",                      /* 0x0f */
+       "REG_ANY",                      /* 0x10 */
+       "SANY",                         /* 0x11 */
+       "ANYOF",                        /* 0x12 */
+       "ANYOFD",                       /* 0x13 */
+       "ANYOFL",                       /* 0x14 */
+       "ANYOFPOSIXL",                  /* 0x15 */
+       "ANYOFM",                       /* 0x16 */
+       "POSIXD",                       /* 0x17 */
+       "POSIXL",                       /* 0x18 */
+       "POSIXU",                       /* 0x19 */
+       "POSIXA",                       /* 0x1a */
+       "NPOSIXD",                      /* 0x1b */
+       "NPOSIXL",                      /* 0x1c */
+       "NPOSIXU",                      /* 0x1d */
+       "NPOSIXA",                      /* 0x1e */
+       "ASCII",                        /* 0x1f */
+       "NASCII",                       /* 0x20 */
+       "CLUMP",                        /* 0x21 */
+       "BRANCH",                       /* 0x22 */
+       "EXACT",                        /* 0x23 */
+       "EXACTL",                       /* 0x24 */
+       "EXACTF",                       /* 0x25 */
+       "EXACTFL",                      /* 0x26 */
+       "EXACTFU",                      /* 0x27 */
+       "EXACTFAA",                     /* 0x28 */
+       "EXACTFU_SS",                   /* 0x29 */
+       "EXACTFLU8",                    /* 0x2a */
+       "EXACTFAA_NO_TRIE",             /* 0x2b */
+       "NOTHING",                      /* 0x2c */
+       "TAIL",                         /* 0x2d */
+       "STAR",                         /* 0x2e */
+       "PLUS",                         /* 0x2f */
+       "CURLY",                        /* 0x30 */
+       "CURLYN",                       /* 0x31 */
+       "CURLYM",                       /* 0x32 */
+       "CURLYX",                       /* 0x33 */
+       "WHILEM",                       /* 0x34 */
+       "OPEN",                         /* 0x35 */
+       "CLOSE",                        /* 0x36 */
+       "SROPEN",                       /* 0x37 */
+       "SRCLOSE",                      /* 0x38 */
+       "REF",                          /* 0x39 */
+       "REFF",                         /* 0x3a */
+       "REFFL",                        /* 0x3b */
+       "REFFU",                        /* 0x3c */
+       "REFFA",                        /* 0x3d */
+       "NREF",                         /* 0x3e */
+       "NREFF",                        /* 0x3f */
+       "NREFFL",                       /* 0x40 */
+       "NREFFU",                       /* 0x41 */
+       "NREFFA",                       /* 0x42 */
+       "LONGJMP",                      /* 0x43 */
+       "BRANCHJ",                      /* 0x44 */
+       "IFMATCH",                      /* 0x45 */
+       "UNLESSM",                      /* 0x46 */
+       "SUSPEND",                      /* 0x47 */
+       "IFTHEN",                       /* 0x48 */
+       "GROUPP",                       /* 0x49 */
+       "EVAL",                         /* 0x4a */
+       "MINMOD",                       /* 0x4b */
+       "LOGICAL",                      /* 0x4c */
+       "RENUM",                        /* 0x4d */
+       "TRIE",                         /* 0x4e */
+       "TRIEC",                        /* 0x4f */
+       "AHOCORASICK",                  /* 0x50 */
+       "AHOCORASICKC",                 /* 0x51 */
+       "GOSUB",                        /* 0x52 */
+       "NGROUPP",                      /* 0x53 */
+       "INSUBP",                       /* 0x54 */
+       "DEFINEP",                      /* 0x55 */
+       "ENDLIKE",                      /* 0x56 */
+       "OPFAIL",                       /* 0x57 */
+       "ACCEPT",                       /* 0x58 */
+       "VERB",                         /* 0x59 */
+       "PRUNE",                        /* 0x5a */
+       "MARKPOINT",                    /* 0x5b */
+       "SKIP",                         /* 0x5c */
+       "COMMIT",                       /* 0x5d */
+       "CUTGROUP",                     /* 0x5e */
+       "KEEPS",                        /* 0x5f */
+       "LNBREAK",                      /* 0x60 */
+       "OPTIMIZED",                    /* 0x61 */
+       "PSEUDO",                       /* 0x62 */
        /* ------------ States ------------- */
        "TRIE_next",                    /* REGNODE_MAX +0x01 */
        "TRIE_next_fail",               /* REGNODE_MAX +0x02 */
-       "EVAL_AB",                      /* REGNODE_MAX +0x03 */
-       "EVAL_AB_fail",                 /* REGNODE_MAX +0x04 */
-       "CURLYX_end",                   /* REGNODE_MAX +0x05 */
-       "CURLYX_end_fail",              /* REGNODE_MAX +0x06 */
-       "WHILEM_A_pre",                 /* REGNODE_MAX +0x07 */
-       "WHILEM_A_pre_fail",            /* REGNODE_MAX +0x08 */
-       "WHILEM_A_min",                 /* REGNODE_MAX +0x09 */
-       "WHILEM_A_min_fail",            /* REGNODE_MAX +0x0a */
-       "WHILEM_A_max",                 /* REGNODE_MAX +0x0b */
-       "WHILEM_A_max_fail",            /* REGNODE_MAX +0x0c */
-       "WHILEM_B_min",                 /* REGNODE_MAX +0x0d */
-       "WHILEM_B_min_fail",            /* REGNODE_MAX +0x0e */
-       "WHILEM_B_max",                 /* REGNODE_MAX +0x0f */
-       "WHILEM_B_max_fail",            /* REGNODE_MAX +0x10 */
-       "BRANCH_next",                  /* REGNODE_MAX +0x11 */
-       "BRANCH_next_fail",             /* REGNODE_MAX +0x12 */
-       "CURLYM_A",                     /* REGNODE_MAX +0x13 */
-       "CURLYM_A_fail",                /* REGNODE_MAX +0x14 */
-       "CURLYM_B",                     /* REGNODE_MAX +0x15 */
-       "CURLYM_B_fail",                /* REGNODE_MAX +0x16 */
-       "IFMATCH_A",                    /* REGNODE_MAX +0x17 */
-       "IFMATCH_A_fail",               /* REGNODE_MAX +0x18 */
-       "CURLY_B_min_known",            /* REGNODE_MAX +0x19 */
-       "CURLY_B_min_known_fail",       /* REGNODE_MAX +0x1a */
+       "EVAL_B",                       /* REGNODE_MAX +0x03 */
+       "EVAL_B_fail",                  /* REGNODE_MAX +0x04 */
+       "EVAL_postponed_AB",            /* REGNODE_MAX +0x05 */
+       "EVAL_postponed_AB_fail",       /* REGNODE_MAX +0x06 */
+       "CURLYX_end",                   /* REGNODE_MAX +0x07 */
+       "CURLYX_end_fail",              /* REGNODE_MAX +0x08 */
+       "WHILEM_A_pre",                 /* REGNODE_MAX +0x09 */
+       "WHILEM_A_pre_fail",            /* REGNODE_MAX +0x0a */
+       "WHILEM_A_min",                 /* REGNODE_MAX +0x0b */
+       "WHILEM_A_min_fail",            /* REGNODE_MAX +0x0c */
+       "WHILEM_A_max",                 /* REGNODE_MAX +0x0d */
+       "WHILEM_A_max_fail",            /* REGNODE_MAX +0x0e */
+       "WHILEM_B_min",                 /* REGNODE_MAX +0x0f */
+       "WHILEM_B_min_fail",            /* REGNODE_MAX +0x10 */
+       "WHILEM_B_max",                 /* REGNODE_MAX +0x11 */
+       "WHILEM_B_max_fail",            /* REGNODE_MAX +0x12 */
+       "BRANCH_next",                  /* REGNODE_MAX +0x13 */
+       "BRANCH_next_fail",             /* REGNODE_MAX +0x14 */
+       "CURLYM_A",                     /* REGNODE_MAX +0x15 */
+       "CURLYM_A_fail",                /* REGNODE_MAX +0x16 */
+       "CURLYM_B",                     /* REGNODE_MAX +0x17 */
+       "CURLYM_B_fail",                /* REGNODE_MAX +0x18 */
+       "IFMATCH_A",                    /* REGNODE_MAX +0x19 */
+       "IFMATCH_A_fail",               /* REGNODE_MAX +0x1a */
        "CURLY_B_min",                  /* REGNODE_MAX +0x1b */
        "CURLY_B_min_fail",             /* REGNODE_MAX +0x1c */
        "CURLY_B_max",                  /* REGNODE_MAX +0x1d */
@@ -715,32 +669,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: 11111111111111111111111011111111 */
+       /* Bits in extflags defined: 11111111111111110000111111111111 */
        "MULTILINE",        /* 0x00000001 */
        "SINGLELINE",       /* 0x00000002 */
        "FOLD",             /* 0x00000004 */
        "EXTENDED",         /* 0x00000008 */
-       "KEEPCOPY",         /* 0x00000010 */
-       "CHARSET",          /* 0x000000e0 */
-       "CHARSET",          /* 0x000000e0 */
-       "CHARSET",          /* 0x000000e0 */
-       "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 */
-       "EVAL_SEEN",        /* 0x00010000 */
-       "CANY_SEEN",        /* 0x00020000 */
-       "NOSCAN",           /* 0x00040000 */
+       "EXTENDED_MORE",    /* 0x00000010 */
+       "NOCAPTURE",        /* 0x00000020 */
+       "KEEPCOPY",         /* 0x00000040 */
+       "CHARSET0",         /* 0x00000080 : "CHARSET" - 0x00000380 */
+       "CHARSET1",         /* 0x00000100 : "CHARSET" - 0x00000380 */
+       "CHARSET2",         /* 0x00000200 : "CHARSET" - 0x00000380 */
+       "STRICT",           /* 0x00000400 */
+       "SPLIT",            /* 0x00000800 */
+       "UNUSED_BIT_12",    /* 0x00001000 */
+       "UNUSED_BIT_13",    /* 0x00002000 */
+       "UNUSED_BIT_14",    /* 0x00004000 */
+       "UNUSED_BIT_15",    /* 0x00008000 */
+       "NO_INPLACE_SUBST", /* 0x00010000 */
+       "EVAL_SEEN",        /* 0x00020000 */
+       "UNBOUNDED_QUANTIFIER_SEEN",/* 0x00040000 */
        "CHECK_ALL",        /* 0x00080000 */
        "MATCH_UTF8",       /* 0x00100000 */
        "USE_INTUIT_NOML",  /* 0x00200000 */
        "USE_INTUIT_ML",    /* 0x00400000 */
        "INTUIT_TAIL",      /* 0x00800000 */
-       "SPLIT",            /* 0x01000000 */
+       "IS_ANCHORED",      /* 0x01000000 */
        "COPY_DONE",        /* 0x02000000 */
        "TAINTED_SEEN",     /* 0x04000000 */
        "TAINTED",          /* 0x08000000 */
@@ -751,6 +705,36 @@ EXTCONST char * const PL_reg_extflags_name[] = {
 };
 #endif /* DOINIT */
 
+#ifdef DEBUGGING
+#  define REG_EXTFLAGS_NAME_SIZE 32
+#endif
+
+/* 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 */
+       "GPOS_SEEN",                  /* 0x00000100 - PREGf_GPOS_SEEN */
+       "GPOS_FLOAT",                 /* 0x00000200 - PREGf_GPOS_FLOAT */
+       "ANCH_MBOL",                  /* 0x00000400 - PREGf_ANCH_MBOL */
+       "ANCH_SBOL",                  /* 0x00000800 - PREGf_ANCH_SBOL */
+       "ANCH_GPOS",                  /* 0x00001000 - PREGf_ANCH_GPOS */
+       "RECURSE_SEEN",               /* 0x00002000 - PREGf_RECURSE_SEEN */
+};
+#endif /* DOINIT */
+
+#ifdef DEBUGGING
+#  define REG_INTFLAGS_NAME_SIZE 13
+#endif
+
 /* 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)))
 
@@ -758,9 +742,9 @@ EXTCONST char * const PL_reg_extflags_name[] = {
 EXTCONST U8 PL_varies[] __attribute__deprecated__;
 #else
 EXTCONST U8 PL_varies[] __attribute__deprecated__ = {
-    ANYOFV, CLUMP, BRANCH, BACK, STAR, PLUS, CURLY, CURLYN, CURLYM, CURLYX,
-    WHILEM, REF, REFF, REFFL, REFFU, NREF, NREFF, NREFFL, NREFFU, SUSPEND,
-    IFTHEN, BRANCHJ,
+    CLUMP, BRANCH, STAR, PLUS, CURLY, CURLYN, CURLYM, CURLYX, WHILEM, REF,
+    REFF, REFFL, REFFU, REFFA, NREF, NREFF, NREFFL, NREFFU, NREFFA,
+    BRANCHJ, SUSPEND, IFTHEN,
     0
 };
 #endif /* DOINIT */
@@ -769,7 +753,7 @@ EXTCONST U8 PL_varies[] __attribute__deprecated__ = {
 EXTCONST U8 PL_varies_bitmask[];
 #else
 EXTCONST U8 PL_varies_bitmask[] = {
-    0x00, 0x00, 0x40, 0x00, 0x00, 0xE0, 0xC0, 0x9F, 0x7F, 0x26, 0x00, 0x00, 0x00, 0x00
+    0x00, 0x00, 0x00, 0x00, 0x06, 0xC0, 0x1F, 0xFE, 0x97, 0x01, 0x00, 0x00, 0x00
 };
 #endif /* DOINIT */
 
@@ -781,10 +765,9 @@ 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, ALNUMU, ALNUMA, NALNUM,
-    NALNUML, NALNUMU, NALNUMA, SPACE, SPACEL, SPACEU, SPACEA, NSPACE,
-    NSPACEL, NSPACEU, NSPACEA, DIGIT, DIGITL, DIGITA, NDIGIT, NDIGITL,
-    NDIGITA, VERTWS, NVERTWS, HORIZWS, NHORIZWS,
+    REG_ANY, SANY, ANYOF, ANYOFD, ANYOFL, ANYOFPOSIXL, ANYOFM, POSIXD,
+    POSIXL, POSIXU, POSIXA, NPOSIXD, NPOSIXL, NPOSIXU, NPOSIXA, ASCII,
+    NASCII,
     0
 };
 #endif /* DOINIT */
@@ -793,7 +776,7 @@ EXTCONST U8 PL_simple[] __attribute__deprecated__ = {
 EXTCONST U8 PL_simple_bitmask[];
 #else
 EXTCONST U8 PL_simple_bitmask[] = {
-    0x00, 0x00, 0xBC, 0xFF, 0xFF, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x03
+    0x00, 0x00, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 #endif /* DOINIT */