/* Regops and State definitions */
-#define REGNODE_MAX 90
-#define REGMATCH_STATE_MAX 130
+#define REGNODE_MAX 97
+#define REGMATCH_STATE_MAX 139
#define END 0 /* 0000 End of program. */
#define SUCCEED 1 /* 0x01 Return from a subroutine, basically. */
#define 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 Match "" at any word boundary using native charset rules for non-utf8 */
-#define BOUNDL 9 /* 0x09 Match "" at any locale word boundary */
-#define BOUNDU 10 /* 0x0a Match "" at any word boundary using Unicode rules */
-#define BOUNDA 11 /* 0x0b Match "" at any word boundary using ASCII rules */
-#define NBOUND 12 /* 0x0c Match "" at any word non-boundary using native charset rules for non-utf8 */
-#define NBOUNDL 13 /* 0x0d Match "" at any locale word non-boundary */
-#define NBOUNDU 14 /* 0x0e Match "" at any word non-boundary using Unicode rules */
-#define NBOUNDA 15 /* 0x0f Match "" at any word non-boundary using ASCII rules */
+#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 CANY 18 /* 0x12 Match any one byte. */
-#define ANYOF 19 /* 0x13 Match character in (or not in) this class, single char match only */
-#define POSIXD 20 /* 0x14 Some [[:class:]] under /d; the FLAGS field gives which one */
-#define POSIXL 21 /* 0x15 Some [[:class:]] under /l; the FLAGS field gives which one */
-#define POSIXU 22 /* 0x16 Some [[:class:]] under /u; the FLAGS field gives which one */
-#define POSIXA 23 /* 0x17 Some [[:class:]] under /a; the FLAGS field gives which one */
-#define NPOSIXD 24 /* 0x18 complement of POSIXD, [[:^class:]] */
-#define NPOSIXL 25 /* 0x19 complement of POSIXL, [[:^class:]] */
-#define NPOSIXU 26 /* 0x1a complement of POSIXU, [[:^class:]] */
-#define NPOSIXA 27 /* 0x1b complement of POSIXA, [[:^class:]] */
-#define CLUMP 28 /* 0x1c Match any extended grapheme cluster sequence */
-#define BRANCH 29 /* 0x1d Match this alternative, or the next... */
-#define EXACT 30 /* 0x1e Match this string (preceded by length). */
-#define EXACTF 31 /* 0x1f Match this non-UTF-8 string (not guaranteed to be folded) using /id rules (w/len). */
-#define EXACTFL 32 /* 0x20 Match this string (not guaranteed to be folded) using /il rules (w/len). */
-#define EXACTFU 33 /* 0x21 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 34 /* 0x22 Match this string (not guaranteed to be folded) using /iaa rules (w/len). */
-#define EXACTFU_SS 35 /* 0x23 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 36 /* 0x24 Match this string (which is not trie-able; not guaranteed to be folded) using /iaa rules (w/len). */
-#define NOTHING 37 /* 0x25 Match empty string. */
-#define TAIL 38 /* 0x26 Match empty string. Can jump here from outside. */
-#define STAR 39 /* 0x27 Match this (simple) thing 0 or more times. */
-#define PLUS 40 /* 0x28 Match this (simple) thing 1 or more times. */
-#define CURLY 41 /* 0x29 Match this simple thing {n,m} times. */
-#define CURLYN 42 /* 0x2a Capture next-after-this simple thing */
-#define CURLYM 43 /* 0x2b Capture this medium-complex thing {n,m} times. */
-#define CURLYX 44 /* 0x2c Match this complex thing {n,m} times. */
-#define WHILEM 45 /* 0x2d Do curly processing and see if rest matches. */
-#define OPEN 46 /* 0x2e Mark this point in input as start of #n. */
-#define CLOSE 47 /* 0x2f Analogous to OPEN. */
-#define REF 48 /* 0x30 Match some already matched string */
-#define REFF 49 /* 0x31 Match already matched string, folded using native charset rules for non-utf8 */
-#define REFFL 50 /* 0x32 Match already matched string, folded in loc. */
-#define REFFU 51 /* 0x33 Match already matched string, folded using unicode rules for non-utf8 */
-#define REFFA 52 /* 0x34 Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
-#define NREF 53 /* 0x35 Match some already matched string */
-#define NREFF 54 /* 0x36 Match already matched string, folded using native charset rules for non-utf8 */
-#define NREFFL 55 /* 0x37 Match already matched string, folded in loc. */
-#define NREFFU 56 /* 0x38 Match already matched string, folded using unicode rules for non-utf8 */
-#define NREFFA 57 /* 0x39 Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
-#define LONGJMP 58 /* 0x3a Jump far away. */
-#define BRANCHJ 59 /* 0x3b BRANCH with long offset. */
-#define IFMATCH 60 /* 0x3c Succeeds if the following matches. */
-#define UNLESSM 61 /* 0x3d Fails if the following matches. */
-#define SUSPEND 62 /* 0x3e "Independent" sub-RE. */
-#define IFTHEN 63 /* 0x3f Switch, should be preceded by switcher. */
-#define GROUPP 64 /* 0x40 Whether the group matched. */
-#define EVAL 65 /* 0x41 Execute some Perl code. */
-#define MINMOD 66 /* 0x42 Next operator is not greedy. */
-#define LOGICAL 67 /* 0x43 Next opcode should set the flag only. */
-#define RENUM 68 /* 0x44 Group with independently numbered parens. */
-#define TRIE 69 /* 0x45 Match many EXACT(F[ALU]?)? at once. flags==type */
-#define TRIEC 70 /* 0x46 Same as TRIE, but with embedded charclass data */
-#define AHOCORASICK 71 /* 0x47 Aho Corasick stclass. flags==type */
-#define AHOCORASICKC 72 /* 0x48 Same as AHOCORASICK, but with embedded charclass data */
-#define GOSUB 73 /* 0x49 recurse to paren arg1 at (signed) ofs arg2 */
-#define GOSTART 74 /* 0x4a recurse to start of pattern */
-#define NGROUPP 75 /* 0x4b Whether the group matched. */
-#define INSUBP 76 /* 0x4c Whether we are in a specific recurse. */
-#define DEFINEP 77 /* 0x4d Never execute directly. */
-#define ENDLIKE 78 /* 0x4e Used only for the type field of verbs */
-#define OPFAIL 79 /* 0x4f Same as (?!) */
-#define ACCEPT 80 /* 0x50 Accepts the current matched string. */
-#define VERB 81 /* 0x51 Used only for the type field of verbs */
-#define PRUNE 82 /* 0x52 Pattern fails at this startpoint if no-backtracking through this */
-#define MARKPOINT 83 /* 0x53 Push the current location for rollback by cut. */
-#define SKIP 84 /* 0x54 On failure skip forward (to the mark) before retrying */
-#define COMMIT 85 /* 0x55 Pattern fails outright if backtracking through this */
-#define CUTGROUP 86 /* 0x56 On failure go to the next alternation in the group */
-#define KEEPS 87 /* 0x57 $& begins here. */
-#define LNBREAK 88 /* 0x58 generic newline pattern */
-#define OPTIMIZED 89 /* 0x59 Placeholder for dump. */
-#define PSEUDO 90 /* 0x5a Pseudo opcode for internal use. */
+#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 ANYOFM 21 /* 0x15 Like ANYOF, but matches an invariant byte as determined by the mask and arg */
+#define POSIXD 22 /* 0x16 Some [[:class:]] under /d; the FLAGS field gives which one */
+#define POSIXL 23 /* 0x17 Some [[:class:]] under /l; the FLAGS field gives which one */
+#define POSIXU 24 /* 0x18 Some [[:class:]] under /u; the FLAGS field gives which one */
+#define POSIXA 25 /* 0x19 Some [[:class:]] under /a; the FLAGS field gives which one */
+#define NPOSIXD 26 /* 0x1a complement of POSIXD, [[:^class:]] */
+#define NPOSIXL 27 /* 0x1b complement of POSIXL, [[:^class:]] */
+#define NPOSIXU 28 /* 0x1c complement of POSIXU, [[:^class:]] */
+#define NPOSIXA 29 /* 0x1d complement of POSIXA, [[:^class:]] */
+#define ASCII 30 /* 0x1e [[:ascii:]] */
+#define NASCII 31 /* 0x1f [[:^ascii:]] */
+#define CLUMP 32 /* 0x20 Match any extended grapheme cluster sequence */
+#define BRANCH 33 /* 0x21 Match this alternative, or the next... */
+#define EXACT 34 /* 0x22 Match this string (preceded by length). */
+#define EXACTL 35 /* 0x23 Like EXACT, but /l is in effect (used so locale-related warnings can be checked for). */
+#define EXACTF 36 /* 0x24 Match this non-UTF-8 string (not guaranteed to be folded) using /id rules (w/len). */
+#define EXACTFL 37 /* 0x25 Match this string (not guaranteed to be folded) using /il rules (w/len). */
+#define EXACTFU 38 /* 0x26 Match this string (folded iff in UTF-8, length in folding doesn't change if not in UTF-8) using /iu rules (w/len). */
+#define EXACTFAA 39 /* 0x27 Match this string (not guaranteed to be folded) using /iaa rules (w/len). */
+#define EXACTFU_SS 40 /* 0x28 Match this string (folded iff in UTF-8, length in folding may change even if not in UTF-8) using /iu rules (w/len). */
+#define EXACTFLU8 41 /* 0x29 Rare circumstances: like EXACTFU, but is under /l, UTF-8, folded, and everything in it is above 255. */
+#define EXACTFAA_NO_TRIE 42 /* 0x2a Match this string (which is not trie-able; not guaranteed to be folded) using /iaa rules (w/len). */
+#define NOTHING 43 /* 0x2b Match empty string. */
+#define TAIL 44 /* 0x2c Match empty string. Can jump here from outside. */
+#define STAR 45 /* 0x2d Match this (simple) thing 0 or more times. */
+#define PLUS 46 /* 0x2e Match this (simple) thing 1 or more times. */
+#define CURLY 47 /* 0x2f Match this simple thing {n,m} times. */
+#define CURLYN 48 /* 0x30 Capture next-after-this simple thing */
+#define CURLYM 49 /* 0x31 Capture this medium-complex thing {n,m} times. */
+#define CURLYX 50 /* 0x32 Match this complex thing {n,m} times. */
+#define WHILEM 51 /* 0x33 Do curly processing and see if rest matches. */
+#define OPEN 52 /* 0x34 Mark this point in input as start of #n. */
+#define CLOSE 53 /* 0x35 Close corresponding OPEN of #n. */
+#define SROPEN 54 /* 0x36 Same as OPEN, but for script run */
+#define SRCLOSE 55 /* 0x37 Close preceding SROPEN */
+#define REF 56 /* 0x38 Match some already matched string */
+#define REFF 57 /* 0x39 Match already matched string, folded using native charset rules for non-utf8 */
+#define REFFL 58 /* 0x3a Match already matched string, folded in loc. */
+#define REFFU 59 /* 0x3b Match already matched string, folded using unicode rules for non-utf8 */
+#define REFFA 60 /* 0x3c Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
+#define NREF 61 /* 0x3d Match some already matched string */
+#define NREFF 62 /* 0x3e Match already matched string, folded using native charset rules for non-utf8 */
+#define NREFFL 63 /* 0x3f Match already matched string, folded in loc. */
+#define NREFFU 64 /* 0x40 Match already matched string, folded using unicode rules for non-utf8 */
+#define NREFFA 65 /* 0x41 Match already matched string, folded using unicode rules for non-utf8, no mixing ASCII, non-ASCII */
+#define LONGJMP 66 /* 0x42 Jump far away. */
+#define BRANCHJ 67 /* 0x43 BRANCH with long offset. */
+#define IFMATCH 68 /* 0x44 Succeeds if the following matches. */
+#define UNLESSM 69 /* 0x45 Fails if the following matches. */
+#define SUSPEND 70 /* 0x46 "Independent" sub-RE. */
+#define IFTHEN 71 /* 0x47 Switch, should be preceded by switcher. */
+#define GROUPP 72 /* 0x48 Whether the group matched. */
+#define EVAL 73 /* 0x49 Execute some Perl code. */
+#define MINMOD 74 /* 0x4a Next operator is not greedy. */
+#define LOGICAL 75 /* 0x4b Next opcode should set the flag only. */
+#define RENUM 76 /* 0x4c Group with independently numbered parens. */
+#define TRIE 77 /* 0x4d Match many EXACT(F[ALU]?)? at once. flags==type */
+#define TRIEC 78 /* 0x4e Same as TRIE, but with embedded charclass data */
+#define AHOCORASICK 79 /* 0x4f Aho Corasick stclass. flags==type */
+#define AHOCORASICKC 80 /* 0x50 Same as AHOCORASICK, but with embedded charclass data */
+#define GOSUB 81 /* 0x51 recurse to paren arg1 at (signed) ofs arg2 */
+#define NGROUPP 82 /* 0x52 Whether the group matched. */
+#define INSUBP 83 /* 0x53 Whether we are in a specific recurse. */
+#define DEFINEP 84 /* 0x54 Never execute directly. */
+#define ENDLIKE 85 /* 0x55 Used only for the type field of verbs */
+#define OPFAIL 86 /* 0x56 Same as (?!), but with verb arg */
+#define ACCEPT 87 /* 0x57 Accepts the current matched string, with verbar */
+#define VERB 88 /* 0x58 Used only for the type field of verbs */
+#define PRUNE 89 /* 0x59 Pattern fails at this startpoint if no-backtracking through this */
+#define MARKPOINT 90 /* 0x5a Push the current location for rollback by cut. */
+#define SKIP 91 /* 0x5b On failure skip forward (to the mark) before retrying */
+#define COMMIT 92 /* 0x5c Pattern fails outright if backtracking through this */
+#define CUTGROUP 93 /* 0x5d On failure go to the next alternation in the group */
+#define KEEPS 94 /* 0x5e $& begins here. */
+#define LNBREAK 95 /* 0x5f generic newline pattern */
+#define OPTIMIZED 96 /* 0x60 Placeholder for dump. */
+#define PSEUDO 97 /* 0x61 Pseudo opcode for internal use. */
/* ------------ States ------------- */
#define TRIE_next (REGNODE_MAX + 1) /* state for TRIE */
#define TRIE_next_fail (REGNODE_MAX + 2) /* state for TRIE */
-#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 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 */
-#define CURLY_B_max_fail (REGNODE_MAX + 30) /* state for CURLY */
-#define COMMIT_next (REGNODE_MAX + 31) /* state for COMMIT */
-#define COMMIT_next_fail (REGNODE_MAX + 32) /* state for COMMIT */
-#define MARKPOINT_next (REGNODE_MAX + 33) /* state for MARKPOINT */
-#define MARKPOINT_next_fail (REGNODE_MAX + 34) /* state for MARKPOINT */
-#define SKIP_next (REGNODE_MAX + 35) /* state for SKIP */
-#define SKIP_next_fail (REGNODE_MAX + 36) /* state for SKIP */
-#define CUTGROUP_next (REGNODE_MAX + 37) /* state for CUTGROUP */
-#define CUTGROUP_next_fail (REGNODE_MAX + 38) /* state for CUTGROUP */
-#define KEEPS_next (REGNODE_MAX + 39) /* state for KEEPS */
-#define KEEPS_next_fail (REGNODE_MAX + 40) /* state for KEEPS */
+#define EVAL_B (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_known (REGNODE_MAX + 27) /* state for CURLY */
+#define CURLY_B_min_known_fail (REGNODE_MAX + 28) /* state for CURLY */
+#define CURLY_B_min (REGNODE_MAX + 29) /* state for CURLY */
+#define CURLY_B_min_fail (REGNODE_MAX + 30) /* state for CURLY */
+#define CURLY_B_max (REGNODE_MAX + 31) /* state for CURLY */
+#define CURLY_B_max_fail (REGNODE_MAX + 32) /* state for CURLY */
+#define COMMIT_next (REGNODE_MAX + 33) /* state for COMMIT */
+#define COMMIT_next_fail (REGNODE_MAX + 34) /* state for COMMIT */
+#define MARKPOINT_next (REGNODE_MAX + 35) /* state for MARKPOINT */
+#define MARKPOINT_next_fail (REGNODE_MAX + 36) /* state for MARKPOINT */
+#define SKIP_next (REGNODE_MAX + 37) /* state for SKIP */
+#define SKIP_next_fail (REGNODE_MAX + 38) /* state for SKIP */
+#define CUTGROUP_next (REGNODE_MAX + 39) /* state for CUTGROUP */
+#define CUTGROUP_next_fail (REGNODE_MAX + 40) /* state for CUTGROUP */
+#define KEEPS_next (REGNODE_MAX + 41) /* state for KEEPS */
+#define KEEPS_next_fail (REGNODE_MAX + 42) /* state for KEEPS */
/* PL_regkind[] What type of regop or state is this. */
NBOUND, /* NBOUNDA */
REG_ANY, /* REG_ANY */
REG_ANY, /* SANY */
- REG_ANY, /* CANY */
ANYOF, /* ANYOF */
+ ANYOF, /* ANYOFD */
+ ANYOF, /* ANYOFL */
+ ANYOFM, /* ANYOFM */
POSIXD, /* POSIXD */
POSIXD, /* POSIXL */
POSIXD, /* POSIXU */
NPOSIXD, /* NPOSIXL */
NPOSIXD, /* NPOSIXU */
NPOSIXD, /* NPOSIXA */
+ ASCII, /* ASCII */
+ ASCII, /* NASCII */
CLUMP, /* CLUMP */
BRANCH, /* BRANCH */
EXACT, /* EXACT */
+ EXACT, /* EXACTL */
EXACT, /* EXACTF */
EXACT, /* EXACTFL */
EXACT, /* EXACTFU */
- EXACT, /* EXACTFA */
+ EXACT, /* EXACTFAA */
EXACT, /* EXACTFU_SS */
- EXACT, /* EXACTFA_NO_TRIE */
+ EXACT, /* EXACTFLU8 */
+ EXACT, /* EXACTFAA_NO_TRIE */
NOTHING, /* NOTHING */
NOTHING, /* TAIL */
STAR, /* STAR */
WHILEM, /* WHILEM */
OPEN, /* OPEN */
CLOSE, /* CLOSE */
+ SROPEN, /* SROPEN */
+ SRCLOSE, /* SRCLOSE */
REF, /* REF */
REF, /* REFF */
REF, /* REFFL */
TRIE, /* AHOCORASICK */
TRIE, /* AHOCORASICKC */
GOSUB, /* GOSUB */
- GOSTART, /* GOSTART */
NGROUPP, /* NGROUPP */
INSUBP, /* INSUBP */
DEFINEP, /* DEFINEP */
/* ------------ 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 */
};
#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, /* NBOUNDA */
0, /* REG_ANY */
0, /* SANY */
- 0, /* CANY */
EXTRA_SIZE(struct regnode_1), /* ANYOF */
+ EXTRA_SIZE(struct regnode_1), /* ANYOFD */
+ EXTRA_SIZE(struct regnode_1), /* ANYOFL */
+ EXTRA_SIZE(struct regnode_1), /* ANYOFM */
0, /* POSIXD */
0, /* POSIXL */
0, /* POSIXU */
0, /* NPOSIXL */
0, /* NPOSIXU */
0, /* NPOSIXA */
+ 0, /* ASCII */
+ 0, /* NASCII */
0, /* CLUMP */
0, /* BRANCH */
0, /* EXACT */
+ 0, /* EXACTL */
0, /* EXACTF */
0, /* EXACTFL */
0, /* EXACTFU */
- 0, /* EXACTFA */
+ 0, /* EXACTFAA */
0, /* EXACTFU_SS */
- 0, /* EXACTFA_NO_TRIE */
+ 0, /* EXACTFLU8 */
+ 0, /* EXACTFAA_NO_TRIE */
0, /* NOTHING */
0, /* TAIL */
0, /* STAR */
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), /* 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 */
0, /* NBOUNDA */
0, /* REG_ANY */
0, /* SANY */
- 0, /* CANY */
0, /* ANYOF */
+ 0, /* ANYOFD */
+ 0, /* ANYOFL */
+ 0, /* ANYOFM */
0, /* POSIXD */
0, /* POSIXL */
0, /* POSIXU */
0, /* NPOSIXL */
0, /* NPOSIXU */
0, /* NPOSIXA */
+ 0, /* ASCII */
+ 0, /* NASCII */
0, /* CLUMP */
0, /* BRANCH */
0, /* EXACT */
+ 0, /* EXACTL */
0, /* EXACTF */
0, /* EXACTFL */
0, /* EXACTFU */
- 0, /* EXACTFA */
+ 0, /* EXACTFAA */
0, /* EXACTFU_SS */
- 0, /* EXACTFA_NO_TRIE */
+ 0, /* EXACTFLU8 */
+ 0, /* EXACTFAA_NO_TRIE */
0, /* NOTHING */
0, /* TAIL */
0, /* STAR */
0, /* WHILEM */
0, /* OPEN */
0, /* CLOSE */
+ 0, /* SROPEN */
+ 0, /* SRCLOSE */
0, /* REF */
0, /* REFF */
0, /* REFFL */
0, /* AHOCORASICK */
0, /* AHOCORASICKC */
0, /* GOSUB */
- 0, /* GOSTART */
0, /* NGROUPP */
0, /* INSUBP */
0, /* DEFINEP */
#endif /* REG_COMP_C */
+
/* reg_name[] - Opcode/state names in string form, for debugging */
#ifndef DOINIT
"NBOUNDA", /* 0x0f */
"REG_ANY", /* 0x10 */
"SANY", /* 0x11 */
- "CANY", /* 0x12 */
- "ANYOF", /* 0x13 */
- "POSIXD", /* 0x14 */
- "POSIXL", /* 0x15 */
- "POSIXU", /* 0x16 */
- "POSIXA", /* 0x17 */
- "NPOSIXD", /* 0x18 */
- "NPOSIXL", /* 0x19 */
- "NPOSIXU", /* 0x1a */
- "NPOSIXA", /* 0x1b */
- "CLUMP", /* 0x1c */
- "BRANCH", /* 0x1d */
- "EXACT", /* 0x1e */
- "EXACTF", /* 0x1f */
- "EXACTFL", /* 0x20 */
- "EXACTFU", /* 0x21 */
- "EXACTFA", /* 0x22 */
- "EXACTFU_SS", /* 0x23 */
- "EXACTFA_NO_TRIE", /* 0x24 */
- "NOTHING", /* 0x25 */
- "TAIL", /* 0x26 */
- "STAR", /* 0x27 */
- "PLUS", /* 0x28 */
- "CURLY", /* 0x29 */
- "CURLYN", /* 0x2a */
- "CURLYM", /* 0x2b */
- "CURLYX", /* 0x2c */
- "WHILEM", /* 0x2d */
- "OPEN", /* 0x2e */
- "CLOSE", /* 0x2f */
- "REF", /* 0x30 */
- "REFF", /* 0x31 */
- "REFFL", /* 0x32 */
- "REFFU", /* 0x33 */
- "REFFA", /* 0x34 */
- "NREF", /* 0x35 */
- "NREFF", /* 0x36 */
- "NREFFL", /* 0x37 */
- "NREFFU", /* 0x38 */
- "NREFFA", /* 0x39 */
- "LONGJMP", /* 0x3a */
- "BRANCHJ", /* 0x3b */
- "IFMATCH", /* 0x3c */
- "UNLESSM", /* 0x3d */
- "SUSPEND", /* 0x3e */
- "IFTHEN", /* 0x3f */
- "GROUPP", /* 0x40 */
- "EVAL", /* 0x41 */
- "MINMOD", /* 0x42 */
- "LOGICAL", /* 0x43 */
- "RENUM", /* 0x44 */
- "TRIE", /* 0x45 */
- "TRIEC", /* 0x46 */
- "AHOCORASICK", /* 0x47 */
- "AHOCORASICKC", /* 0x48 */
- "GOSUB", /* 0x49 */
- "GOSTART", /* 0x4a */
- "NGROUPP", /* 0x4b */
- "INSUBP", /* 0x4c */
- "DEFINEP", /* 0x4d */
- "ENDLIKE", /* 0x4e */
- "OPFAIL", /* 0x4f */
- "ACCEPT", /* 0x50 */
- "VERB", /* 0x51 */
- "PRUNE", /* 0x52 */
- "MARKPOINT", /* 0x53 */
- "SKIP", /* 0x54 */
- "COMMIT", /* 0x55 */
- "CUTGROUP", /* 0x56 */
- "KEEPS", /* 0x57 */
- "LNBREAK", /* 0x58 */
- "OPTIMIZED", /* 0x59 */
- "PSEUDO", /* 0x5a */
+ "ANYOF", /* 0x12 */
+ "ANYOFD", /* 0x13 */
+ "ANYOFL", /* 0x14 */
+ "ANYOFM", /* 0x15 */
+ "POSIXD", /* 0x16 */
+ "POSIXL", /* 0x17 */
+ "POSIXU", /* 0x18 */
+ "POSIXA", /* 0x19 */
+ "NPOSIXD", /* 0x1a */
+ "NPOSIXL", /* 0x1b */
+ "NPOSIXU", /* 0x1c */
+ "NPOSIXA", /* 0x1d */
+ "ASCII", /* 0x1e */
+ "NASCII", /* 0x1f */
+ "CLUMP", /* 0x20 */
+ "BRANCH", /* 0x21 */
+ "EXACT", /* 0x22 */
+ "EXACTL", /* 0x23 */
+ "EXACTF", /* 0x24 */
+ "EXACTFL", /* 0x25 */
+ "EXACTFU", /* 0x26 */
+ "EXACTFAA", /* 0x27 */
+ "EXACTFU_SS", /* 0x28 */
+ "EXACTFLU8", /* 0x29 */
+ "EXACTFAA_NO_TRIE", /* 0x2a */
+ "NOTHING", /* 0x2b */
+ "TAIL", /* 0x2c */
+ "STAR", /* 0x2d */
+ "PLUS", /* 0x2e */
+ "CURLY", /* 0x2f */
+ "CURLYN", /* 0x30 */
+ "CURLYM", /* 0x31 */
+ "CURLYX", /* 0x32 */
+ "WHILEM", /* 0x33 */
+ "OPEN", /* 0x34 */
+ "CLOSE", /* 0x35 */
+ "SROPEN", /* 0x36 */
+ "SRCLOSE", /* 0x37 */
+ "REF", /* 0x38 */
+ "REFF", /* 0x39 */
+ "REFFL", /* 0x3a */
+ "REFFU", /* 0x3b */
+ "REFFA", /* 0x3c */
+ "NREF", /* 0x3d */
+ "NREFF", /* 0x3e */
+ "NREFFL", /* 0x3f */
+ "NREFFU", /* 0x40 */
+ "NREFFA", /* 0x41 */
+ "LONGJMP", /* 0x42 */
+ "BRANCHJ", /* 0x43 */
+ "IFMATCH", /* 0x44 */
+ "UNLESSM", /* 0x45 */
+ "SUSPEND", /* 0x46 */
+ "IFTHEN", /* 0x47 */
+ "GROUPP", /* 0x48 */
+ "EVAL", /* 0x49 */
+ "MINMOD", /* 0x4a */
+ "LOGICAL", /* 0x4b */
+ "RENUM", /* 0x4c */
+ "TRIE", /* 0x4d */
+ "TRIEC", /* 0x4e */
+ "AHOCORASICK", /* 0x4f */
+ "AHOCORASICKC", /* 0x50 */
+ "GOSUB", /* 0x51 */
+ "NGROUPP", /* 0x52 */
+ "INSUBP", /* 0x53 */
+ "DEFINEP", /* 0x54 */
+ "ENDLIKE", /* 0x55 */
+ "OPFAIL", /* 0x56 */
+ "ACCEPT", /* 0x57 */
+ "VERB", /* 0x58 */
+ "PRUNE", /* 0x59 */
+ "MARKPOINT", /* 0x5a */
+ "SKIP", /* 0x5b */
+ "COMMIT", /* 0x5c */
+ "CUTGROUP", /* 0x5d */
+ "KEEPS", /* 0x5e */
+ "LNBREAK", /* 0x5f */
+ "OPTIMIZED", /* 0x60 */
+ "PSEUDO", /* 0x61 */
/* ------------ States ------------- */
"TRIE_next", /* REGNODE_MAX +0x01 */
"TRIE_next_fail", /* REGNODE_MAX +0x02 */
- "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 */
- "CURLY_B_min", /* REGNODE_MAX +0x1b */
- "CURLY_B_min_fail", /* REGNODE_MAX +0x1c */
- "CURLY_B_max", /* REGNODE_MAX +0x1d */
- "CURLY_B_max_fail", /* REGNODE_MAX +0x1e */
- "COMMIT_next", /* REGNODE_MAX +0x1f */
- "COMMIT_next_fail", /* REGNODE_MAX +0x20 */
- "MARKPOINT_next", /* REGNODE_MAX +0x21 */
- "MARKPOINT_next_fail", /* REGNODE_MAX +0x22 */
- "SKIP_next", /* REGNODE_MAX +0x23 */
- "SKIP_next_fail", /* REGNODE_MAX +0x24 */
- "CUTGROUP_next", /* REGNODE_MAX +0x25 */
- "CUTGROUP_next_fail", /* REGNODE_MAX +0x26 */
- "KEEPS_next", /* REGNODE_MAX +0x27 */
- "KEEPS_next_fail", /* REGNODE_MAX +0x28 */
+ "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_known", /* REGNODE_MAX +0x1b */
+ "CURLY_B_min_known_fail", /* REGNODE_MAX +0x1c */
+ "CURLY_B_min", /* REGNODE_MAX +0x1d */
+ "CURLY_B_min_fail", /* REGNODE_MAX +0x1e */
+ "CURLY_B_max", /* REGNODE_MAX +0x1f */
+ "CURLY_B_max_fail", /* REGNODE_MAX +0x20 */
+ "COMMIT_next", /* REGNODE_MAX +0x21 */
+ "COMMIT_next_fail", /* REGNODE_MAX +0x22 */
+ "MARKPOINT_next", /* REGNODE_MAX +0x23 */
+ "MARKPOINT_next_fail", /* REGNODE_MAX +0x24 */
+ "SKIP_next", /* REGNODE_MAX +0x25 */
+ "SKIP_next_fail", /* REGNODE_MAX +0x26 */
+ "CUTGROUP_next", /* REGNODE_MAX +0x27 */
+ "CUTGROUP_next_fail", /* REGNODE_MAX +0x28 */
+ "KEEPS_next", /* REGNODE_MAX +0x29 */
+ "KEEPS_next_fail", /* REGNODE_MAX +0x2a */
};
#endif /* DOINIT */
EXTCONST char * PL_reg_extflags_name[];
#else
EXTCONST char * const PL_reg_extflags_name[] = {
- /* Bits in extflags defined: 11111111111111110000011111111111 */
+ /* Bits in extflags defined: 11111111111111110000111111111111 */
"MULTILINE", /* 0x00000001 */
"SINGLELINE", /* 0x00000002 */
"FOLD", /* 0x00000004 */
"CHARSET0", /* 0x00000080 : "CHARSET" - 0x00000380 */
"CHARSET1", /* 0x00000100 : "CHARSET" - 0x00000380 */
"CHARSET2", /* 0x00000200 : "CHARSET" - 0x00000380 */
- "SPLIT", /* 0x00000400 */
- "UNUSED_BIT_11", /* 0x00000800 */
+ "STRICT", /* 0x00000400 */
+ "SPLIT", /* 0x00000800 */
"UNUSED_BIT_12", /* 0x00001000 */
"UNUSED_BIT_13", /* 0x00002000 */
"UNUSED_BIT_14", /* 0x00004000 */
"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_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 */
EXTCONST U8 PL_varies_bitmask[];
#else
EXTCONST U8 PL_varies_bitmask[] = {
- 0x00, 0x00, 0x00, 0x30, 0x80, 0x3F, 0xFF, 0xCB, 0x00, 0x00, 0x00, 0x00
+ 0x00, 0x00, 0x00, 0x00, 0x03, 0xE0, 0x0F, 0xFF, 0xCB, 0x00, 0x00, 0x00, 0x00
};
#endif /* DOINIT */
EXTCONST U8 PL_simple[] __attribute__deprecated__;
#else
EXTCONST U8 PL_simple[] __attribute__deprecated__ = {
- REG_ANY, SANY, CANY, ANYOF, POSIXD, POSIXL, POSIXU, POSIXA, NPOSIXD,
- NPOSIXL, NPOSIXU, NPOSIXA,
+ REG_ANY, SANY, ANYOF, ANYOFD, ANYOFL, ANYOFM, POSIXD, POSIXL, POSIXU,
+ POSIXA, NPOSIXD, NPOSIXL, NPOSIXU, NPOSIXA, ASCII, NASCII,
0
};
#endif /* DOINIT */
EXTCONST U8 PL_simple_bitmask[];
#else
EXTCONST U8 PL_simple_bitmask[] = {
- 0x00, 0x00, 0xFF, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
#endif /* DOINIT */
https://perl5.git.perl.org / perl5.git / blobdiff