In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/f31df0ce8d77152d0d9498bf7f87177e54b824e9?hp=dec2b171031d1c5f383f3b8571146901b3fae21c>
- Log ----------------------------------------------------------------- commit f31df0ce8d77152d0d9498bf7f87177e54b824e9 Author: Karl Williamson <[email protected]> Date: Wed Jul 20 01:43:47 2016 -0600 regcomp.c: Silence compiler warning These functions are no longer needed in re_comp.c ----------------------------------------------------------------------- Summary of changes: embed.fnc | 4 ++-- embed.h | 4 ++-- proto.h | 20 ++++++++++---------- regcomp.c | 8 ++++++-- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/embed.fnc b/embed.fnc index abc1187..c0b7a3e 100644 --- a/embed.fnc +++ b/embed.fnc @@ -1546,11 +1546,11 @@ ApRM |SV* |swash_init |NN const char* pkg|NN const char* name|NN SV* listsv|I32 ApM |UV |swash_fetch |NN SV *swash|NN const U8 *ptr|bool do_utf8 #ifdef PERL_IN_REGCOMP_C EiMR |SV* |add_cp_to_invlist |NULLOK SV* invlist|const UV cp -EiMRn |UV* |_invlist_array_init |NN SV* const invlist|const bool will_have_0 -EiMRn |UV |invlist_max |NN SV* const invlist EiM |void |invlist_set_len|NN SV* const invlist|const UV len|const bool offset EiMRn |bool |invlist_is_iterating|NN SV* const invlist #ifndef PERL_EXT_RE_BUILD +EiMRn |UV* |_invlist_array_init |NN SV* const invlist|const bool will_have_0 +EiMRn |UV |invlist_max |NN SV* const invlist EsM |void |_append_range_to_invlist |NN SV* const invlist|const UV start|const UV end EsM |void |invlist_extend |NN SV* const invlist|const UV len EsM |void |invlist_replace_list_destroys_src|NN SV *dest|NN SV *src diff --git a/embed.h b/embed.h index b440509..3acd9ef 100644 --- a/embed.h +++ b/embed.h @@ -955,9 +955,11 @@ # if !defined(PERL_EXT_RE_BUILD) # if defined(PERL_IN_REGCOMP_C) #define _append_range_to_invlist(a,b,c) S__append_range_to_invlist(aTHX_ a,b,c) +#define _invlist_array_init S__invlist_array_init #define get_invlist_previous_index_addr S_get_invlist_previous_index_addr #define invlist_clear(a) S_invlist_clear(aTHX_ a) #define invlist_extend(a,b) S_invlist_extend(aTHX_ a,b) +#define invlist_max S_invlist_max #define invlist_previous_index S_invlist_previous_index #define invlist_replace_list_destroys_src(a,b) S_invlist_replace_list_destroys_src(aTHX_ a,b) #define invlist_set_previous_index S_invlist_set_previous_index @@ -1000,7 +1002,6 @@ #define sv_or_pv_pos_u2b(a,b,c,d) S_sv_or_pv_pos_u2b(aTHX_ a,b,c,d) # endif # if defined(PERL_IN_REGCOMP_C) -#define _invlist_array_init S__invlist_array_init #define _make_exactf_invlist(a,b) S__make_exactf_invlist(aTHX_ a,b) #define add_above_Latin1_folds(a,b,c) S_add_above_Latin1_folds(aTHX_ a,b,c) #define add_cp_to_invlist(a,b) S_add_cp_to_invlist(aTHX_ a,b) @@ -1024,7 +1025,6 @@ #define invlist_iterfinish S_invlist_iterfinish #define invlist_iterinit S_invlist_iterinit #define invlist_iternext S_invlist_iternext -#define invlist_max S_invlist_max #define invlist_set_len(a,b,c) S_invlist_set_len(aTHX_ a,b,c) #define is_ssc_worth_it S_is_ssc_worth_it #define join_exact(a,b,c,d,e,f,g) S_join_exact(aTHX_ a,b,c,d,e,f,g) diff --git a/proto.h b/proto.h index ec2ae33..a06b6d0 100644 --- a/proto.h +++ b/proto.h @@ -3802,6 +3802,11 @@ STATIC PerlIO * S_doopen_pm(pTHX_ SV *name) STATIC void S__append_range_to_invlist(pTHX_ SV* const invlist, const UV start, const UV end); #define PERL_ARGS_ASSERT__APPEND_RANGE_TO_INVLIST \ assert(invlist) +PERL_STATIC_INLINE UV* S__invlist_array_init(SV* const invlist, const bool will_have_0) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT__INVLIST_ARRAY_INIT \ + assert(invlist) + PERL_STATIC_INLINE IV* S_get_invlist_previous_index_addr(SV* invlist) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_GET_INVLIST_PREVIOUS_INDEX_ADDR \ @@ -3813,6 +3818,11 @@ PERL_STATIC_INLINE void S_invlist_clear(pTHX_ SV* invlist); STATIC void S_invlist_extend(pTHX_ SV* const invlist, const UV len); #define PERL_ARGS_ASSERT_INVLIST_EXTEND \ assert(invlist) +PERL_STATIC_INLINE UV S_invlist_max(SV* const invlist) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_INVLIST_MAX \ + assert(invlist) + PERL_STATIC_INLINE IV S_invlist_previous_index(SV* const invlist) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_INVLIST_PREVIOUS_INDEX \ @@ -4853,11 +4863,6 @@ STATIC SV * S_space_join_names_mortal(pTHX_ char *const *array); assert(array) #endif #if defined(PERL_IN_REGCOMP_C) -PERL_STATIC_INLINE UV* S__invlist_array_init(SV* const invlist, const bool will_have_0) - __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT__INVLIST_ARRAY_INIT \ - assert(invlist) - STATIC SV* S__make_exactf_invlist(pTHX_ RExC_state_t *pRExC_state, regnode *node) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT__MAKE_EXACTF_INVLIST \ @@ -4945,11 +4950,6 @@ STATIC bool S_invlist_iternext(SV* invlist, UV* start, UV* end) #define PERL_ARGS_ASSERT_INVLIST_ITERNEXT \ assert(invlist); assert(start); assert(end) -PERL_STATIC_INLINE UV S_invlist_max(SV* const invlist) - __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_INVLIST_MAX \ - assert(invlist) - PERL_STATIC_INLINE void S_invlist_set_len(pTHX_ SV* const invlist, const UV len, const bool offset); #define PERL_ARGS_ASSERT_INVLIST_SET_LEN \ assert(invlist) diff --git a/regcomp.c b/regcomp.c index e57f233..7f6d5ee 100644 --- a/regcomp.c +++ b/regcomp.c @@ -8376,6 +8376,8 @@ S_reg_scan_name(pTHX_ RExC_state_t *pRExC_state, U32 flags) /* The header definitions are in F<invlist_inline.h> */ +#ifndef PERL_IN_XSUB_RE + PERL_STATIC_INLINE UV* S__invlist_array_init(SV* const invlist, const bool will_have_0) { @@ -8402,6 +8404,8 @@ S__invlist_array_init(SV* const invlist, const bool will_have_0) return zero_addr + *offset; } +#endif + PERL_STATIC_INLINE void S_invlist_set_len(pTHX_ SV* const invlist, const UV len, const bool offset) { @@ -8538,6 +8542,8 @@ S_invlist_is_iterating(SV* const invlist) return *(get_invlist_iter_addr(invlist)) < (STRLEN) UV_MAX; } +#ifndef PERL_IN_XSUB_RE + PERL_STATIC_INLINE UV S_invlist_max(SV* const invlist) { @@ -8554,8 +8560,6 @@ S_invlist_max(SV* const invlist) ? FROM_INTERNAL_SIZE(SvCUR(invlist)) - 1 : FROM_INTERNAL_SIZE(SvLEN(invlist)) - 1; } - -#ifndef PERL_IN_XSUB_RE SV* Perl__new_invlist(pTHX_ IV initial_size) { -- Perl5 Master Repository
