diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-13 01:03:25 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-13 01:03:25 +0000 |
commit | 2adcc421f386ac8f8d59858a02422ffcaf0b1f49 (patch) | |
tree | 5a1b9fb13a9b8d5547f1b11ce853220344b726c6 /lib/cmath.rb | |
parent | 8f8000beee6847392e32be94389195cf3618cf9c (diff) |
merges r20646 and r20647 from trunk into ruby_1_9_1.
* lib/cmath.rb (sqrt): should pass nan or infinity to the original
method.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20703 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/cmath.rb')
-rw-r--r-- | lib/cmath.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/cmath.rb b/lib/cmath.rb index 00bcc9087f..95a30c336b 100644 --- a/lib/cmath.rb +++ b/lib/cmath.rb @@ -57,10 +57,10 @@ module CMath def sqrt(z) if z.real? - if z >= 0 - sqrt!(z) - else + if z < 0 Complex(0, sqrt!(-z)) + else + sqrt!(z) end else if z.imag < 0 |