In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/b4fd0ac8061d586061c5235f99033a5b56fc97b8?hp=de353015643cf10b437d714d3483c1209e079916>
- Log ----------------------------------------------------------------- commit b4fd0ac8061d586061c5235f99033a5b56fc97b8 Author: Tony Cook <[email protected]> Date: Fri Jul 5 16:01:06 2013 +1000 minor clean up of the refactoring of d6a4f4b531 - the values assigned to format_name are unused under PERL_MAD, hence format_name is unused - and PL_madskills is #defined to 0 when not under PERL_MAD ----------------------------------------------------------------------- Summary of changes: toke.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/toke.c b/toke.c index e4a79a9..f1c695e 100644 --- a/toke.c +++ b/toke.c @@ -8505,7 +8505,9 @@ Perl_yylex(pTHX) expectation attrful; bool have_name, have_proto; const int key = tmp; +#ifndef PERL_MAD SV *format_name = NULL; +#endif #ifdef PERL_MAD SV *tmpwhite = 0; @@ -8537,9 +8539,10 @@ Perl_yylex(pTHX) #ifdef PERL_MAD if (PL_madskills) nametoke = newSVpvn_flags(s, d - s, SvUTF8(PL_linestr)); -#endif +#else if (key == KEY_format) format_name = S_newSV_maybe_utf8(aTHX_ s, d - s); +#endif *PL_tokenbuf = '&'; if (memchr(tmpbuf, ':', len) || key != KEY_sub || pad_findmy_pvn( @@ -8588,8 +8591,6 @@ Perl_yylex(pTHX) #else if (format_name) { start_force(PL_curforce); - if (PL_madskills) - curmad('X', newSVpvn(start,s-start)); NEXTVAL_NEXTTOKE.opval = (OP*)newSVOP(OP_CONST,0, format_name); NEXTVAL_NEXTTOKE.opval->op_private |= OPpCONST_BARE; -- Perl5 Master Repository
