From f57870844dd491bbe4dfce939fbd94948f04db4d Mon Sep 17 00:00:00 2001 From: wyhaines Date: Tue, 14 Jul 2009 19:28:58 +0000 Subject: Adjust #angle/#arg NaN return as per issue #1715 and recent rubyspec changes. Adjust angle/arg handling of (-0.0).angle as per r23960 & recent rubyspec changes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@24109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/complex.rb | 4 +++- version.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index eab125d212..d111e081e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jul 14 13:14:00 2009 Kirk Haines + + * lib/complex.rb: Adjust #angle/#arg NaN return as per issue #1715 and recent rubyspec changes. Adjust angle/arg handling of (-0.0).angle as per r23960 & recent rubyspec changes. + Mon Jul 13 12:00:00 2009 Kirk Haines * numeric.c, bignum.c: Applied changes from r23730. Infinity is > any bignum number in comparisons. diff --git a/lib/complex.rb b/lib/complex.rb index 9300f391e8..5b8ac25ff8 100644 --- a/lib/complex.rb +++ b/lib/complex.rb @@ -58,8 +58,10 @@ class Numeric # See Complex#arg. # def arg - if self >= 0 + if self > 0 || (self == 0 && self.to_s != '-0.0') # This string comparison stuff is gross. Better way? return 0 + elsif self.to_f.nan? + return self else return Math::PI end diff --git a/version.h b/version.h index 3998543cdc..4517b253e6 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-06-08" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20090608 -#define RUBY_PATCHLEVEL 379 +#define RUBY_PATCHLEVEL 380 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3