In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/4276fd3639b8e3fdebe28a2eb81d455f0f33fd05?hp=b9c48b5b74957012d9ed4b6e6cc2e067f5af2f97>
- Log ----------------------------------------------------------------- commit 4276fd3639b8e3fdebe28a2eb81d455f0f33fd05 Author: Karl Williamson <[email protected]> Date: Wed Aug 1 18:28:59 2012 -0600 regcomp.c: Remove unnecessary variable This variable was used because another was declared 'register'. But that declaration was removed by commit e1d1eefb8c88e0dcaf2bb9e6c04d7f6192be966f in 2007, making the temporary variable redundant. M regcomp.c commit 6ae172d09264ec7f9d8911353e13c74242736eb3 Author: Karl Williamson <[email protected]> Date: Wed Aug 1 17:04:13 2012 -0600 regcomp.c: inline trivial static function M embed.fnc M proto.h M regcomp.c ----------------------------------------------------------------------- Summary of changes: embed.fnc | 2 +- proto.h | 2 +- regcomp.c | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/embed.fnc b/embed.fnc index 8a6cdad..b65e41c 100644 --- a/embed.fnc +++ b/embed.fnc @@ -1051,7 +1051,7 @@ Ap |SV* |regclass_swash |NULLOK const regexp *prog \ EMs |void |add_alternate |NN AV** alternate_ptr|NN U8* string|STRLEN len EMsR |SV* |_new_invlist_C_array|NN UV* list : Not used currently: EXMs |bool |_invlistEQ |NN SV* const a|NN SV* const b|bool complement_b -EMsR |bool |_invlist_contains_cp|NN SV* const invlist|const UV cp +EMiR |bool |_invlist_contains_cp|NN SV* const invlist|const UV cp #endif Ap |I32 |pregexec |NN REGEXP * const prog|NN char* stringarg \ |NN char* strend|NN char* strbeg|I32 minend \ diff --git a/proto.h b/proto.h index ef4f8c1..55dc9ae 100644 --- a/proto.h +++ b/proto.h @@ -6359,7 +6359,7 @@ PERL_STATIC_INLINE UV* S__invlist_array_init(pTHX_ SV* const invlist, const bool #define PERL_ARGS_ASSERT__INVLIST_ARRAY_INIT \ assert(invlist) -STATIC bool S__invlist_contains_cp(pTHX_ SV* const invlist, const UV cp) +PERL_STATIC_INLINE bool S__invlist_contains_cp(pTHX_ SV* const invlist, const UV cp) __attribute__warn_unused_result__ __attribute__nonnull__(pTHX_1); #define PERL_ARGS_ASSERT__INVLIST_CONTAINS_CP \ diff --git a/regcomp.c b/regcomp.c index 17e7579..09a8f27 100644 --- a/regcomp.c +++ b/regcomp.c @@ -7946,7 +7946,7 @@ Perl__add_range_to_invlist(pTHX_ SV* invlist, const UV start, const UV end) #endif -STATIC bool +PERL_STATIC_INLINE bool S__invlist_contains_cp(pTHX_ SV* const invlist, const UV cp) { /* Does <invlist> contain code point <cp> as part of the set? */ @@ -11319,7 +11319,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state, U32 depth) register UV nextvalue; register UV prevvalue = OOB_UNICODE; register IV range = 0; - UV value = 0; /* XXX:dmq: needs to be referenceable (unfortunately) */ + UV value = 0; register regnode *ret; STRLEN numlen; IV namedclass = OOB_NAMEDCLASS; @@ -11484,13 +11484,11 @@ parseit: if this makes sense as it does change the behaviour from earlier versions, OTOH that behaviour was broken as well. */ - UV v; /* value is register so we cant & it /grrr */ - if (! grok_bslash_N(pRExC_state, NULL, &v, NULL, depth, + if (! grok_bslash_N(pRExC_state, NULL, &value, NULL, depth, TRUE /* => charclass */)) { goto parseit; } - value= v; } break; case 'p': -- Perl5 Master Repository
