From: Nicholas Clark Date: Sat, 24 Nov 2001 16:24:33 +0000 (+0000) Subject: Re: Smoke 13191 /pro/3gl/CPAN/perl-current X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=30de85b6294027ce5dd68a336e7f75fe8fb14941;p=p5sagit%2Fp5-mst-13.2.git Re: Smoke 13191 /pro/3gl/CPAN/perl-current Message-ID: <20011124162433.Q37621@plum.flirble.org> cmp fixes. p4raw-id: //depot/perl@13235 --- diff --git a/pp.c b/pp.c index e4354ea..15949f9 100644 --- a/pp.c +++ b/pp.c @@ -1543,6 +1543,13 @@ PP(pp_lt) } } #endif +#ifndef NV_PRESERVES_UV + else if (SvROK(TOPs) && SvROK(TOPm1s)) { + SP--; + SETs(boolSV(SvRV(TOPs) < SvRV(TOPp1s))); + RETURN; + } +#endif { dPOPnv; SETs(boolSV(TOPn < value)); @@ -1611,6 +1618,13 @@ PP(pp_gt) } } #endif +#ifndef NV_PRESERVES_UV + else if (SvROK(TOPs) && SvROK(TOPm1s)) { + SP--; + SETs(boolSV(SvRV(TOPs) > SvRV(TOPp1s))); + RETURN; + } +#endif { dPOPnv; SETs(boolSV(TOPn > value)); @@ -1679,6 +1693,13 @@ PP(pp_le) } } #endif +#ifndef NV_PRESERVES_UV + else if (SvROK(TOPs) && SvROK(TOPm1s)) { + SP--; + SETs(boolSV(SvRV(TOPs) <= SvRV(TOPp1s))); + RETURN; + } +#endif { dPOPnv; SETs(boolSV(TOPn <= value)); @@ -1747,6 +1768,13 @@ PP(pp_ge) } } #endif +#ifndef NV_PRESERVES_UV + else if (SvROK(TOPs) && SvROK(TOPm1s)) { + SP--; + SETs(boolSV(SvRV(TOPs) >= SvRV(TOPp1s))); + RETURN; + } +#endif { dPOPnv; SETs(boolSV(TOPn >= value)); @@ -1772,19 +1800,16 @@ PP(pp_ne) bool auvok = SvUOK(TOPm1s); bool buvok = SvUOK(TOPs); - if (!auvok && !buvok) { /* ## IV <=> IV ## */ - IV aiv = SvIVX(TOPm1s); - IV biv = SvIVX(TOPs); - - SP--; - SETs(boolSV(aiv != biv)); - RETURN; - } - if (auvok && buvok) { /* ## UV != UV ## */ - UV auv = SvUVX(TOPm1s); - UV buv = SvUVX(TOPs); + if (auvok == buvok) { /* ## IV == IV or UV == UV ## */ + /* Casting IV to UV before comparison isn't going to matter + on 2s complement. On 1s complement or sign&magnitude + (if we have any of them) it could make negative zero + differ from normal zero. As I understand it. (Need to + check - is negative zero implementation defined behaviour + anyway?). NWC */ + UV buv = SvUVX(POPs); + UV auv = SvUVX(TOPs); - SP--; SETs(boolSV(auv != buv)); RETURN; }