diff options
| -rw-r--r-- | embed.fnc | 2 | ||||
| -rw-r--r-- | embed.h | 1 | ||||
| -rw-r--r-- | proto.h | 6 | ||||
| -rw-r--r-- | regcomp.c | 24 |
4 files changed, 1 insertions, 32 deletions
@@ -2110,8 +2110,6 @@ Es |regnode*|regatom |NN RExC_state_t *pRExC_state \ |NN I32 *flagp|U32 depth Es |regnode*|regbranch |NN RExC_state_t *pRExC_state \ |NN I32 *flagp|I32 first|U32 depth -Ei |STRLEN |reguni |NN const RExC_state_t *pRExC_state \ - |UV uv|NN char *s Es |void |set_ANYOF_arg |NN RExC_state_t* const pRExC_state \ |NN regnode* const node \ |NULLOK SV* const cp_list \ @@ -996,7 +996,6 @@ #define regpiece(a,b,c) S_regpiece(aTHX_ a,b,c) #define regpposixcc(a,b,c) S_regpposixcc(aTHX_ a,b,c) #define regtail(a,b,c,d) S_regtail(aTHX_ a,b,c,d) -#define reguni(a,b,c) S_reguni(aTHX_ a,b,c) #define scan_commit(a,b,c,d) S_scan_commit(aTHX_ a,b,c,d) #define set_ANYOF_arg(a,b,c,d,e,f,g) S_set_ANYOF_arg(aTHX_ a,b,c,d,e,f,g) #define ssc_add_range(a,b,c) S_ssc_add_range(aTHX_ a,b,c) @@ -7146,12 +7146,6 @@ STATIC void S_regtail(pTHX_ RExC_state_t *pRExC_state, regnode *p, const regnode #define PERL_ARGS_ASSERT_REGTAIL \ assert(pRExC_state); assert(p); assert(val) -PERL_STATIC_INLINE STRLEN S_reguni(pTHX_ const RExC_state_t *pRExC_state, UV uv, char *s) - __attribute__nonnull__(pTHX_1) - __attribute__nonnull__(pTHX_3); -#define PERL_ARGS_ASSERT_REGUNI \ - assert(pRExC_state); assert(s) - STATIC void S_scan_commit(pTHX_ const RExC_state_t *pRExC_state, struct scan_data_t *data, SSize_t *minlenp, int is_inf) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2) @@ -702,12 +702,6 @@ static const scan_data_t zero_scan_data = a1, a2, a3, a4, REPORT_LOCATION_ARGS(offset)); \ } STMT_END - -/* Allow for side effects in s */ -#define REGC(c,s) STMT_START { \ - if (!SIZE_ONLY) *(s) = (c); else (void)(s); \ -} STMT_END - /* Macros for recording node offsets. 20001227 mjd@plover.com * Nodes are numbered 1, 2, 3, 4. Node #n's position is recorded in * element 2*n-1 of the array. Element #2n holds the byte length node #n. @@ -6648,10 +6642,6 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count, RExC_recurse_count = 0; pRExC_state->code_index = 0; -#if 0 /* REGC() is (currently) a NOP at the first pass. - * Clever compilers notice this and complain. --jhi */ - REGC((U8)REG_MAGIC, (char*)RExC_emit); -#endif DEBUG_PARSE_r( PerlIO_printf(Perl_debug_log, "Starting first pass (sizing)\n"); RExC_lastnum=0; @@ -12534,8 +12524,7 @@ tryagain: * unfolded, and we have to calculate how many EXACTish * nodes it will take; and we may run out of room in a node * in the middle of a potential multi-char fold, and have - * to back off accordingly. (Hence we can't use REGC for - * the simple case just below.) */ + * to back off accordingly. */ UV folded; if (isASCII_uni(ender)) { @@ -15837,17 +15826,6 @@ S_reg2Lanode(pTHX_ RExC_state_t *pRExC_state, const U8 op, const U32 arg1, const } /* -- reguni - emit (if appropriate) a Unicode character -*/ -PERL_STATIC_INLINE STRLEN -S_reguni(pTHX_ const RExC_state_t *pRExC_state, UV uv, char* s) -{ - PERL_ARGS_ASSERT_REGUNI; - - return SIZE_ONLY ? UNISKIP(uv) : (uvchr_to_utf8((U8*)s, uv) - (U8*)s); -} - -/* - reginsert - insert an operator in front of already-emitted operand * * Means relocating the operand. |