diff options
| author | Andy Lester <andy@petdance.com> | 2005-12-27 08:39:39 -0600 |
|---|---|---|
| committer | Steve Peters <steve@fisharerojo.org> | 2005-12-27 22:07:44 +0000 |
| commit | fabdb6c0879db76333e970b6c67260c877fc17b3 (patch) | |
| tree | 81d106dc99b2069f6968bbe00164e6bb222dc482 /pp.h | |
| parent | f319e147b252268cc6fe404c58538ec32cf8548a (diff) | |
| download | perl-fabdb6c0879db76333e970b6c67260c877fc17b3.tar.gz | |
pre-likely cleanup
Message-ID: <20051227203939.GC1781@petdance.com>
Includes a small fix to the changes in tryAMAGICbinW_var() in pp.h.
p4raw-id: //depot/perl@26505
Diffstat (limited to 'pp.h')
| -rw-r--r-- | pp.h | 20 |
1 files changed, 11 insertions, 9 deletions
@@ -398,17 +398,19 @@ and C<PUSHu>. #define AMGf_unary 8 #define tryAMAGICbinW_var(meth_enum,assign,set) STMT_START { \ - if (PL_amagic_generation) { \ - SV* tmpsv; \ - SV* const right= *(sp); SV* const left= *(sp-1);\ - if ((SvAMAGIC(left)||SvAMAGIC(right))&&\ - (tmpsv=amagic_call(left, \ + if (PL_amagic_generation) { \ + SV* const left = *(sp-1); \ + SV* const right = *(sp); \ + if ((SvAMAGIC(left)||SvAMAGIC(right))) {\ + SV * const tmpsv = amagic_call(left, \ right, \ meth_enum, \ - (assign)? AMGf_assign: 0))) {\ - SPAGAIN; \ - (void)POPs; set(tmpsv); RETURN; } \ - } \ + (assign)? AMGf_assign: 0); \ + if (tmpsv) { \ + SPAGAIN; \ + (void)POPs; set(tmpsv); RETURN; } \ + } \ + } \ } STMT_END #define tryAMAGICbinW(meth,assign,set) \ |