X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/7c932d07cab18751bfc7515b4320436273a459e2..373d867adc2d71569e45080d9e255af7d28cd3e1:/regcomp.h diff --git a/regcomp.h b/regcomp.h index c0b2c07..1766941 100644 --- a/regcomp.h +++ b/regcomp.h @@ -7,6 +7,10 @@ * License or the Artistic License, as specified in the README file. * */ + +#ifndef PERL_REGCOMP_H_ +#define PERL_REGCOMP_H_ + #include "regcharclass.h" /* Convert branch sequences to more efficient trie ops? */ @@ -27,36 +31,6 @@ #endif /* - * The "internal use only" fields in regexp.h are present to pass info from - * compile to execute that permits the execute phase to run lots faster on - * simple cases. They are: - * - * regstart sv that must begin a match; NULL if none obvious - * reganch is the match anchored (at beginning-of-line only)? - * regmust string (pointer into program) that match must include, or NULL - * [regmust changed to SV* for bminstr()--law] - * regmlen length of regmust string - * [regmlen not used currently] - * - * Regstart and reganch permit very fast decisions on suitable starting points - * for a match, cutting down the work a lot. Regmust permits fast rejection - * of lines that cannot possibly match. The regmust tests are costly enough - * that pregcomp() supplies a regmust only if the r.e. contains something - * potentially expensive (at present, the only such thing detected is * or + - * at the start of the r.e., which can involve a lot of backup). Regmlen is - * supplied because the test in pregexec() needs it and pregcomp() is computing - * it anyway. - * [regmust is now supplied always. The tests that use regmust have a - * heuristic that disables the test if it usually matches.] - * - * [In fact, we now use regmust in many cases to locate where the search - * starts in the string, so if regback is >= 0, the regmust search is never - * wasted effort. The regback variable says how many characters back from - * where regmust matched is the earliest possible start of the match. - * For instance, /[a-z].foo/ has a regmust of 'foo' and a regback of 2.] - */ - -/* * Structure for regexp "program". This is essentially a linear encoding * of a nondeterministic finite-state machine (aka syntax charts or * "railroad normal form" in parsing technology). Each node is an opcode @@ -91,7 +65,6 @@ private to the engine itself. It now lives here. */ typedef struct regexp_internal { - int name_list_idx; /* Optional data index of an array of paren names */ union { U32 *offsets; /* offset annotations 20001228 MJD data about mapping the program to the @@ -108,6 +81,7 @@ data that the regops need. Often the ARG field of a regop is an index into this structure */ struct reg_code_blocks *code_blocks;/* positions of literal (?{}) */ + int name_list_idx; /* Optional data index of an array of paren names */ regnode program[1]; /* Unwarranted chumminess with compiler. */ } regexp_internal; @@ -152,6 +126,22 @@ struct regnode_string { char string[1]; }; +struct regnode_lstring { /* Constructed this way to keep the string aligned. */ + U8 flags; + U8 type; + U16 next_off; + U32 str_len; /* Only 18 bits allowed before would overflow 'next_off' */ + char string[1]; +}; + +struct regnode_anyofhs { /* Constructed this way to keep the string aligned. */ + U8 str_len; + U8 type; + U16 next_off; + U32 arg1; /* set by set_ANYOF_arg() */ + char string[1]; +}; + /* Argument bearing node - workhorse, arg1 is often for the data field */ struct regnode_1 { @@ -161,6 +151,16 @@ struct regnode_1 { U32 arg1; }; +/* Node whose argument is 'void *', a pointer to void. This needs to be used + * very carefully in situations where pointers won't become invalid because of, + * say re-mallocs */ +struct regnode_p { + U8 flags; + U8 type; + U16 next_off; + void * arg1; +}; + /* Similar to a regnode_1 but with an extra signed argument */ struct regnode_2L { U8 flags; @@ -179,21 +179,6 @@ struct regnode_2 { U16 arg2; }; -/* This give the number of code points that can be in the bitmap of an ANYOF - * node. The shift number must currently be one of: 8..12. It can't be less - * than 8 (256) because some code relies on it being at least that. Above 12 - * (4096), and you start running into warnings that some data structure widths - * have been exceeded, though the test suite as of this writing still passes - * for up through 16, which is as high as anyone would ever want to go, - * encompassing all of the Unicode BMP, and thus including all the economically - * important world scripts. At 12 most of them are: including Arabic, - * Cyrillic, Greek, Hebrew, Indian subcontinent, Latin, and Thai; but not Han, - * Japanese, nor Korean. (The regarglen structure in regnodes.h is a U8, and - * the trie types TRIEC and AHOCORASICKC are larger than U8 for shift values - * below above 12.) Be sure to benchmark before changing, as larger sizes do - * significantly slow down the test suite */ -#define NUM_ANYOF_CODE_POINTS (1 << 8) - #define ANYOF_BITMAP_SIZE (NUM_ANYOF_CODE_POINTS / 8) /* 8 bits/Byte */ /* Note that these form structs which are supersets of the next smaller one, by @@ -291,11 +276,13 @@ struct regnode_ssc { #undef ARG2 #define ARG(p) ARG_VALUE(ARG_LOC(p)) +#define ARGp(p) ARG_VALUE(ARGp_LOC(p)) #define ARG1(p) ARG_VALUE(ARG1_LOC(p)) #define ARG2(p) ARG_VALUE(ARG2_LOC(p)) #define ARG2L(p) ARG_VALUE(ARG2L_LOC(p)) #define ARG_SET(p, val) ARG__SET(ARG_LOC(p), (val)) +#define ARGp_SET(p, val) ARG__SET(ARGp_LOC(p), (val)) #define ARG1_SET(p, val) ARG__SET(ARG1_LOC(p), (val)) #define ARG2_SET(p, val) ARG__SET(ARG2_LOC(p), (val)) #define ARG2L_SET(p, val) ARG__SET(ARG2L_LOC(p), (val)) @@ -320,19 +307,61 @@ struct regnode_ssc { #undef OP #undef OPERAND -#undef MASK #undef STRING #define OP(p) ((p)->type) #define FLAGS(p) ((p)->flags) /* Caution: Doesn't apply to all \ regnode types. For some, it's the \ character set of the regnode */ -#define OPERAND(p) (((struct regnode_string *)p)->string) -#define MASK(p) ((char*)OPERAND(p)) -#define STR_LEN(p) (((struct regnode_string *)p)->str_len) -#define STRING(p) (((struct regnode_string *)p)->string) -#define STR_SZ(l) ((l + sizeof(regnode) - 1) / sizeof(regnode)) -#define NODE_SZ_STR(p) (STR_SZ(STR_LEN(p))+1) +#define STR_LENs(p) (__ASSERT_(OP(p) != LEXACT && OP(p) != LEXACT_REQ8) \ + ((struct regnode_string *)p)->str_len) +#define STRINGs(p) (__ASSERT_(OP(p) != LEXACT && OP(p) != LEXACT_REQ8) \ + ((struct regnode_string *)p)->string) +#define OPERANDs(p) STRINGs(p) + +/* Long strings. Currently limited to length 18 bits, which handles a 262000 + * byte string. The limiting factor is the 16 bit 'next_off' field, which + * points to the next regnode, so the furthest away it can be is 2**16. On + * most architectures, regnodes are 2**2 bytes long, so that yields 2**18 + * bytes. Should a longer string be desired, we could increase it to 26 bits + * fairly easily, by changing this node to have longj type which causes the ARG + * field to be used for the link to the next regnode (although code would have + * to be changed to account for this), and then use a combination of the flags + * and next_off fields for the length. To get 34 bit length, also change the + * node to be an ARG2L, using the second 32 bit field for the length, and not + * using the flags nor next_off fields at all. One could have an llstring node + * and even an lllstring type. */ +#define STR_LENl(p) (__ASSERT_(OP(p) == LEXACT || OP(p) == LEXACT_REQ8) \ + (((struct regnode_lstring *)p)->str_len)) +#define STRINGl(p) (__ASSERT_(OP(p) == LEXACT || OP(p) == LEXACT_REQ8) \ + (((struct regnode_lstring *)p)->string)) +#define OPERANDl(p) STRINGl(p) + +#define STR_LEN(p) ((OP(p) == LEXACT || OP(p) == LEXACT_REQ8) \ + ? STR_LENl(p) : STR_LENs(p)) +#define STRING(p) ((OP(p) == LEXACT || OP(p) == LEXACT_REQ8) \ + ? STRINGl(p) : STRINGs(p)) +#define OPERAND(p) STRING(p) + +/* The number of (smallest) regnode equivalents that a string of length l bytes + * occupies */ +#define STR_SZ(l) (((l) + sizeof(regnode) - 1) / sizeof(regnode)) + +/* The number of (smallest) regnode equivalents that the EXACTISH node 'p' + * occupies */ +#define NODE_SZ_STR(p) (STR_SZ(STR_LEN(p)) + 1 + regarglen[(p)->type]) + +#define setSTR_LEN(p,v) \ + STMT_START{ \ + if (OP(p) == LEXACT || OP(p) == LEXACT_REQ8) \ + ((struct regnode_lstring *)(p))->str_len = (v); \ + else \ + ((struct regnode_string *)(p))->str_len = (v); \ + } STMT_END + +#define ANYOFR_BASE_BITS 20 +#define ANYOFRbase(p) (ARG(p) & ((1 << ANYOFR_BASE_BITS) - 1)) +#define ANYOFRdelta(p) (ARG(p) >> ANYOFR_BASE_BITS) #undef NODE_ALIGN #undef ARG_LOC @@ -341,6 +370,7 @@ struct regnode_ssc { #define NODE_ALIGN(node) #define ARG_LOC(p) (((struct regnode_1 *)p)->arg1) +#define ARGp_LOC(p) (((struct regnode_p *)p)->arg1) #define ARG1_LOC(p) (((struct regnode_2 *)p)->arg1) #define ARG2_LOC(p) (((struct regnode_2 *)p)->arg2) #define ARG2L_LOC(p) (((struct regnode_2L *)p)->arg2) @@ -348,8 +378,6 @@ struct regnode_ssc { #define NODE_STEP_REGNODE 1 /* sizeof(regnode)/sizeof(regnode) */ #define EXTRA_STEP_2ARGS EXTRA_SIZE(struct regnode_2) -#define NODE_STEP_B 4 - #define NEXTOPER(p) ((p) + NODE_STEP_REGNODE) #define PREVOPER(p) ((p) - NODE_STEP_REGNODE) @@ -371,6 +399,12 @@ struct regnode_ssc { * that have a longer argument */ \ (offset) += regarglen[op]; \ } STMT_END +#define FILL_ADVANCE_NODE_ARGp(offset, op, arg) \ + STMT_START { \ + ARGp_SET(REGNODE_p(offset), arg); \ + FILL_ADVANCE_NODE(offset, op); \ + (offset) += regarglen[op]; \ + } STMT_END #define FILL_ADVANCE_NODE_2L_ARG(offset, op, arg1, arg2) \ STMT_START { \ ARG_SET(REGNODE_p(offset), arg1); \ @@ -381,9 +415,6 @@ struct regnode_ssc { #define REG_MAGIC 0234 -#define SIZE_ONLY FALSE -#define PASS1 SIZE_ONLY -#define PASS2 (! SIZE_ONLY) /* An ANYOF node is basically a bitmap with the index being a code point. If * the bit for that code point is 1, the code point matches; if 0, it doesn't * match (complemented if inverted). There is an additional mechanism to deal @@ -403,7 +434,7 @@ struct regnode_ssc { * * 1) The bitmap has a compiled-in very finite size. So something else needs * to be used to specify if a code point that is too large for the bitmap - * actually matches. The mechanism currently is a swash or inversion + * actually matches. The mechanism currently is an inversion * list. ANYOF_ONLY_HAS_BITMAP, described above, being TRUE indicates * there are no matches of too-large code points. But if it is FALSE, * then almost certainly there are matches too large for the bitmap. (The @@ -414,7 +445,7 @@ struct regnode_ssc { * 2) A subset of item 1) is if all possible code points outside the bitmap * match. This is a common occurrence when the class is complemented, * like /[^ij]/. Therefore a bit is reserved to indicate this, - * rather than having an expensive swash created, + * rather than having an inversion list created, * ANYOF_MATCHES_ALL_ABOVE_BITMAP. * 3) Under /d rules, it can happen that code points that are in the upper * latin1 range (\x80-\xFF or their equivalents on EBCDIC platforms) match @@ -427,12 +458,12 @@ struct regnode_ssc { * handled. But it can be a shared flag: see 5) below. * 4) Also under /d rules, something like /[\Wfoo]/ will match everything in * the \x80-\xFF range, unless the string being matched against is UTF-8. - * A swash could be created for this case, but this is relatively common, - * and it turns out that it's all or nothing: if any one of these code - * points matches, they all do. Hence a single bit suffices. We use a - * shared flag that doesn't take up space by itself: - * ANYOF_SHARED_d_MATCHES_ALL_NON_UTF8_NON_ASCII_non_d_WARN_SUPER. - * This also implies 1), with one exception: [:^cntrl:]. + * An inversion list could be created for this case, but this is + * relatively common, and it turns out that it's all or nothing: if any + * one of these code points matches, they all do. Hence a single bit + * suffices. We use a shared flag that doesn't take up space by itself: + * ANYOF_SHARED_d_MATCHES_ALL_NON_UTF8_NON_ASCII_non_d_WARN_SUPER. This + * also implies 1), with one exception: [:^cntrl:]. * 5) A user-defined \p{} property may not have been defined by the time the * regex is compiled. In this case, we don't know until runtime what it * will match, so we have to assume it could match anything, including @@ -508,9 +539,9 @@ struct regnode_ssc { #define ANYOFL_FOLD 0x04 /* Shared bit set only with ANYOFL and SSC nodes: - * If ANYOFL_FOLD is set, this means there are potential matches valid - * only if the locale is a UTF-8 one. - * If ANYOFL_FOLD is NOT set, this means to warn if the runtime locale + * If ANYOFL_FOLD is set, this flag indicates there are potential matches + * valid only if the locale is a UTF-8 one. + * If ANYOFL_FOLD is NOT set, this flag means to warn if the runtime locale * isn't a UTF-8 one (and the generated node assumes a UTF-8 locale). * None of INVERT, POSIXL, * ANYOF_SHARED_d_UPPER_LATIN1_UTF8_STRING_MATCHES_non_d_RUNTIME_USER_PROP @@ -539,10 +570,11 @@ struct regnode_ssc { /* Shared bit: * Under /d it means the ANYOFD node matches more things if the target * string is encoded in UTF-8; any such things will be non-ASCII, - * characters that are < 256, and can be accessed via the swash. + * characters that are < 256, and can be accessed via the inversion + * list. * When not under /d, it means the ANYOF node contains a user-defined * property that wasn't yet defined at the time the regex was compiled, - * and so must be looked up at runtime, by creating a swash + * and so must be looked up at runtime, by creating an inversion list. * (These uses are mutually exclusive because a user-defined property is * specified by \p{}, and \p{} implies /u which deselects /d). The long macro * name is to make sure that you are cautioned about its shared nature. Only @@ -713,6 +745,8 @@ struct regnode_ssc { # define UCHARAT(p) ((int)*(p)&CHARMASK) #endif +/* Number of regnode equivalents that 'guy' occupies beyond the size of the + * smallest regnode. */ #define EXTRA_SIZE(guy) ((sizeof(guy)-1)/sizeof(struct regnode)) #define REG_ZERO_LEN_SEEN 0x00000001 @@ -772,9 +806,9 @@ END_EXTERN_C * l - start op for literal (?{EVAL}) item * L - start op for literal (?{EVAL}) item, with separate CV (qr//) * r - pointer to an embedded code-containing qr, e.g. /ab$qr/ - * s - swash for Unicode-style character class, and the multicharacter - * strings resulting from casefolding the single-character entries - * in the character class + * s - inversion list for Unicode-style character class, and the + * multicharacter strings resulting from casefolding the single-character + * entries in the character class * t - trie struct * u - trie struct's widecharmap (a HV, so can't share, must dup) * also used for revcharmap and words under DEBUGGING @@ -944,6 +978,9 @@ typedef struct _reg_ac_data reg_ac_data; #define RE_TRIE_MAXBUF_NAME "\022E_TRIE_MAXBUF" #define RE_DEBUG_FLAGS "\022E_DEBUG_FLAGS" +#define RE_COMPILE_RECURSION_INIT 1000 +#define RE_COMPILE_RECURSION_LIMIT "\022E_COMPILE_RECURSION_LIMIT" + /* RE_DEBUG_FLAGS is used to control what debug output is emitted @@ -992,90 +1029,96 @@ re.pm, especially to the documentation. #define RE_DEBUG_EXECUTE_TRIE 0x000400 /* Extra */ -#define RE_DEBUG_EXTRA_MASK 0xFF0000 -#define RE_DEBUG_EXTRA_TRIE 0x010000 -#define RE_DEBUG_EXTRA_OFFSETS 0x020000 -#define RE_DEBUG_EXTRA_OFFDEBUG 0x040000 -#define RE_DEBUG_EXTRA_STATE 0x080000 -#define RE_DEBUG_EXTRA_OPTIMISE 0x100000 -#define RE_DEBUG_EXTRA_BUFFERS 0x400000 -#define RE_DEBUG_EXTRA_GPOS 0x800000 +#define RE_DEBUG_EXTRA_MASK 0x3FF0000 +#define RE_DEBUG_EXTRA_TRIE 0x0010000 +#define RE_DEBUG_EXTRA_OFFSETS 0x0020000 +#define RE_DEBUG_EXTRA_OFFDEBUG 0x0040000 +#define RE_DEBUG_EXTRA_STATE 0x0080000 +#define RE_DEBUG_EXTRA_OPTIMISE 0x0100000 +#define RE_DEBUG_EXTRA_BUFFERS 0x0400000 +#define RE_DEBUG_EXTRA_GPOS 0x0800000 +#define RE_DEBUG_EXTRA_DUMP_PRE_OPTIMIZE 0x1000000 +#define RE_DEBUG_EXTRA_WILDCARD 0x2000000 /* combined */ -#define RE_DEBUG_EXTRA_STACK 0x280000 +#define RE_DEBUG_EXTRA_STACK 0x0280000 -#define RE_DEBUG_FLAG(x) (re_debug_flags & x) +#define RE_DEBUG_FLAG(x) (re_debug_flags & (x)) /* Compile */ #define DEBUG_COMPILE_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_COMPILE_MASK) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_COMPILE_MASK)) x ) #define DEBUG_PARSE_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_COMPILE_PARSE) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_COMPILE_PARSE)) x ) #define DEBUG_OPTIMISE_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_COMPILE_OPTIMISE) x ) -#define DEBUG_PARSE_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_COMPILE_PARSE) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_COMPILE_OPTIMISE)) x ) #define DEBUG_DUMP_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_COMPILE_DUMP) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_COMPILE_DUMP)) x ) #define DEBUG_TRIE_COMPILE_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_COMPILE_TRIE) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_COMPILE_TRIE)) x ) #define DEBUG_FLAGS_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_COMPILE_FLAGS) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_COMPILE_FLAGS)) x ) #define DEBUG_TEST_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_COMPILE_TEST) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_COMPILE_TEST)) x ) /* Execute */ #define DEBUG_EXECUTE_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_EXECUTE_MASK) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXECUTE_MASK)) x ) #define DEBUG_INTUIT_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_EXECUTE_INTUIT) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXECUTE_INTUIT)) x ) #define DEBUG_MATCH_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_EXECUTE_MATCH) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXECUTE_MATCH)) x ) #define DEBUG_TRIE_EXECUTE_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_EXECUTE_TRIE) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXECUTE_TRIE)) x ) /* Extra */ #define DEBUG_EXTRA_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_EXTRA_MASK) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXTRA_MASK)) x ) #define DEBUG_OFFSETS_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_EXTRA_OFFSETS) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXTRA_OFFSETS)) x ) #define DEBUG_STATE_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_EXTRA_STATE) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXTRA_STATE)) x ) #define DEBUG_STACK_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_EXTRA_STACK) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXTRA_STACK)) x ) #define DEBUG_BUFFERS_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_EXTRA_BUFFERS) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXTRA_BUFFERS)) x ) #define DEBUG_OPTIMISE_MORE_r(x) DEBUG_r( \ - if ((RE_DEBUG_EXTRA_OPTIMISE|RE_DEBUG_COMPILE_OPTIMISE) == \ - (re_debug_flags & (RE_DEBUG_EXTRA_OPTIMISE|RE_DEBUG_COMPILE_OPTIMISE)) ) x ) + if (DEBUG_v_TEST || ((RE_DEBUG_EXTRA_OPTIMISE|RE_DEBUG_COMPILE_OPTIMISE) == \ + RE_DEBUG_FLAG(RE_DEBUG_EXTRA_OPTIMISE|RE_DEBUG_COMPILE_OPTIMISE))) x ) #define MJD_OFFSET_DEBUG(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_EXTRA_OFFDEBUG) \ + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXTRA_OFFDEBUG)) \ Perl_warn_nocontext x ) #define DEBUG_TRIE_COMPILE_MORE_r(x) DEBUG_TRIE_COMPILE_r( \ - if (re_debug_flags & RE_DEBUG_EXTRA_TRIE) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXTRA_TRIE)) x ) #define DEBUG_TRIE_EXECUTE_MORE_r(x) DEBUG_TRIE_EXECUTE_r( \ - if (re_debug_flags & RE_DEBUG_EXTRA_TRIE) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXTRA_TRIE)) x ) #define DEBUG_TRIE_r(x) DEBUG_r( \ - if (re_debug_flags & (RE_DEBUG_COMPILE_TRIE \ + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_COMPILE_TRIE \ | RE_DEBUG_EXECUTE_TRIE )) x ) #define DEBUG_GPOS_r(x) DEBUG_r( \ - if (re_debug_flags & RE_DEBUG_EXTRA_GPOS) x ) + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXTRA_GPOS)) x ) -/* initialization */ -/* get_sv() can return NULL during global destruction. */ -#define GET_RE_DEBUG_FLAGS DEBUG_r({ \ - SV * re_debug_flags_sv = NULL; \ - re_debug_flags_sv = PL_curcop ? get_sv(RE_DEBUG_FLAGS, GV_ADD) : NULL; \ - if (re_debug_flags_sv) { \ - if (!SvIOK(re_debug_flags_sv)) \ - sv_setuv(re_debug_flags_sv, RE_DEBUG_COMPILE_DUMP | RE_DEBUG_EXECUTE_MASK ); \ - re_debug_flags=SvIV(re_debug_flags_sv); \ - }\ -}) +#define DEBUG_DUMP_PRE_OPTIMIZE_r(x) DEBUG_r( \ + if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXTRA_DUMP_PRE_OPTIMIZE)) x ) +/* initialization */ #ifdef DEBUGGING -#define GET_RE_DEBUG_FLAGS_DECL volatile IV re_debug_flags = 0; \ - PERL_UNUSED_VAR(re_debug_flags); GET_RE_DEBUG_FLAGS; +#define DECLARE_AND_GET_RE_DEBUG_FLAGS \ + volatile IV re_debug_flags = 0; PERL_UNUSED_VAR(re_debug_flags); \ + STMT_START { \ + SV * re_debug_flags_sv = NULL; \ + /* get_sv() can return NULL during global destruction. */ \ + re_debug_flags_sv = PL_curcop ? get_sv(RE_DEBUG_FLAGS, GV_ADD) : NULL; \ + if (re_debug_flags_sv) { \ + if (!SvIOK(re_debug_flags_sv)) /* If doesnt exist set to default */\ + sv_setuv(re_debug_flags_sv, \ + /* These defaults should be kept in sync with re.pm */ \ + RE_DEBUG_COMPILE_DUMP | RE_DEBUG_EXECUTE_MASK ); \ + re_debug_flags=SvIV(re_debug_flags_sv); \ + } \ + } STMT_END + +#define isDEBUG_WILDCARD (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXTRA_WILDCARD)) #define RE_PV_COLOR_DECL(rpv,rlen,isuni,dsv,pv,l,m,c1,c2) \ const char * const rpv = \ @@ -1104,12 +1147,13 @@ re.pm, especially to the documentation. #else /* if not DEBUGGING */ -#define GET_RE_DEBUG_FLAGS_DECL +#define DECLARE_AND_GET_RE_DEBUG_FLAGS #define RE_PV_COLOR_DECL(rpv,rlen,isuni,dsv,pv,l,m,c1,c2) #define RE_SV_ESCAPE(rpv,isuni,dsv,sv,m) #define RE_PV_QUOTED_DECL(rpv,isuni,dsv,pv,l,m) #define RE_SV_DUMPLEN(ItEm) #define RE_SV_TAIL(ItEm) +#define isDEBUG_WILDCARD 0 #endif /* DEBUG RELATED DEFINES */ @@ -1123,6 +1167,33 @@ typedef enum { WB_BOUND } bound_type; +/* This unpacks the FLAGS field of ANYOF[HR]x nodes. The value it contains + * gives the strict lower bound for the UTF-8 start byte of any code point + * matchable by the node, and a loose upper bound as well. + * + * The low bound is stored in the upper 6 bits, plus 0xC0. + * The loose upper bound is determined from the lowest 2 bits and the low bound + * (called x) as follows: + * + * 11 The upper limit of the range can be as much as (EF - x) / 8 + * 10 The upper limit of the range can be as much as (EF - x) / 4 + * 01 The upper limit of the range can be as much as (EF - x) / 2 + * 00 The upper limit of the range can be as much as EF + * + * For motivation of this design, see commit message in + * 3146c00a633e9cbed741e10146662fbcedfdb8d3 */ +#ifdef EBCDIC +# define MAX_ANYOF_HRx_BYTE 0xF4 +#else +# define MAX_ANYOF_HRx_BYTE 0xEF +#endif +#define LOWEST_ANYOF_HRx_BYTE(b) (((b) >> 2) + 0xC0) +#define HIGHEST_ANYOF_HRx_BYTE(b) \ + (LOWEST_ANYOF_HRx_BYTE(b) \ + + ((MAX_ANYOF_HRx_BYTE - LOWEST_ANYOF_HRx_BYTE(b)) >> ((b) & 3))) + +#endif /* PERL_REGCOMP_H_ */ + /* * ex: set ts=8 sts=4 sw=4 et: */