In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/bec88f1bea9be699db294f4c38b20fef00a7f605?hp=d5ea055af7777dae01aafd5eab0b2d9233acdb9c>
- Log ----------------------------------------------------------------- commit bec88f1bea9be699db294f4c38b20fef00a7f605 Author: Karl Williamson <[email protected]> Date: Sat Jul 16 21:36:40 2016 -0600 regcomp.c: Silence compiler warning It turns out that the changes in 0854ea0b9abfd9ff71c9dca1b5a5765dad2a20bd caused two functions to no longer be used in re_comp.c ----------------------------------------------------------------------- Summary of changes: embed.fnc | 4 ++-- embed.h | 4 ++-- proto.h | 12 ++++++------ regcomp.c | 3 --- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/embed.fnc b/embed.fnc index 3ae18a3..abc1187 100644 --- a/embed.fnc +++ b/embed.fnc @@ -1546,13 +1546,13 @@ 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 -EsM |void |_append_range_to_invlist |NN SV* const invlist|const UV start|const UV end EiMRn |UV* |_invlist_array_init |NN SV* const invlist|const bool will_have_0 -EsM |void |invlist_extend |NN SV* const invlist|const UV len 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 +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 EiMRn |IV* |get_invlist_previous_index_addr|NN SV* invlist EiMn |void |invlist_set_previous_index|NN SV* const invlist|const IV index diff --git a/embed.h b/embed.h index f7511ec..b440509 100644 --- a/embed.h +++ b/embed.h @@ -954,8 +954,10 @@ #define yylex() Perl_yylex(aTHX) # 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 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_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 @@ -998,7 +1000,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 _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 _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) @@ -1018,7 +1019,6 @@ #define handle_regex_sets(a,b,c,d,e) S_handle_regex_sets(aTHX_ a,b,c,d,e) #define invlist_clone(a) S_invlist_clone(aTHX_ a) #define invlist_contents(a,b) S_invlist_contents(aTHX_ a,b) -#define invlist_extend(a,b) S_invlist_extend(aTHX_ a,b) #define invlist_highest S_invlist_highest #define invlist_is_iterating S_invlist_is_iterating #define invlist_iterfinish S_invlist_iterfinish diff --git a/proto.h b/proto.h index 5900122..ec2ae33 100644 --- a/proto.h +++ b/proto.h @@ -3799,6 +3799,9 @@ STATIC PerlIO * S_doopen_pm(pTHX_ SV *name) #endif #if !defined(PERL_EXT_RE_BUILD) # if defined(PERL_IN_REGCOMP_C) +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 IV* S_get_invlist_previous_index_addr(SV* invlist) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_GET_INVLIST_PREVIOUS_INDEX_ADDR \ @@ -3807,6 +3810,9 @@ PERL_STATIC_INLINE IV* S_get_invlist_previous_index_addr(SV* invlist) PERL_STATIC_INLINE void S_invlist_clear(pTHX_ SV* invlist); #define PERL_ARGS_ASSERT_INVLIST_CLEAR \ assert(invlist) +STATIC void S_invlist_extend(pTHX_ SV* const invlist, const UV len); +#define PERL_ARGS_ASSERT_INVLIST_EXTEND \ + assert(invlist) PERL_STATIC_INLINE IV S_invlist_previous_index(SV* const invlist) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_INVLIST_PREVIOUS_INDEX \ @@ -4847,9 +4853,6 @@ STATIC SV * S_space_join_names_mortal(pTHX_ char *const *array); assert(array) #endif #if defined(PERL_IN_REGCOMP_C) -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 \ @@ -4921,9 +4924,6 @@ STATIC SV* S_invlist_contents(pTHX_ SV* const invlist, const bool traditional_st #define PERL_ARGS_ASSERT_INVLIST_CONTENTS \ assert(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_highest(SV* const invlist) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_INVLIST_HIGHEST \ diff --git a/regcomp.c b/regcomp.c index c2b398d..e57f233 100644 --- a/regcomp.c +++ b/regcomp.c @@ -8641,7 +8641,6 @@ Perl__new_invlist_C_array(pTHX_ const UV* const list) return invlist; } -#endif /* ifndef PERL_IN_XSUB_RE */ STATIC void S_invlist_extend(pTHX_ SV* const invlist, const UV new_max) @@ -8743,8 +8742,6 @@ S__append_range_to_invlist(pTHX_ SV* const invlist, } } -#ifndef PERL_IN_XSUB_RE - SSize_t Perl__invlist_search(SV* const invlist, const UV cp) { -- Perl5 Master Repository
