summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-26 04:33:21 +0000
committerkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-26 04:33:21 +0000
commitdd72f55c50152ef6dcf01b526cec4857e0dab7b9 (patch)
tree07659238f3fc1357988d45b72bd9bae7c7f6ce0d
parent97458e2836a0378340b24610f697c6b96dd72f64 (diff)
downloadruby-dd72f55c50152ef6dcf01b526cec4857e0dab7b9.tar.gz
ruby-dd72f55c50152ef6dcf01b526cec4857e0dab7b9.tar.xz
ruby-dd72f55c50152ef6dcf01b526cec4857e0dab7b9.zip
* lib/complex.rb: be able to create Complex(0, -0.0). [ruby-list:44268]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14020 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/complex.rb3
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index aa1939b1b..3a8633d76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 26 13:28:14 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
+
+ * lib/complex.rb: be able to create Complex(0, -0.0). [ruby-list:44268]
+
Mon Nov 26 11:24:04 2007 Tanaka Akira <akr@fsij.org>
* re.c (rb_reg_fixed_encoding_p): extracted from rb_reg_prepare_re and
diff --git a/lib/complex.rb b/lib/complex.rb
index 516bbbfd8..6b086661a 100644
--- a/lib/complex.rb
+++ b/lib/complex.rb
@@ -90,6 +90,9 @@ end
def Complex(a, b = 0)
if b == 0 and (a.kind_of?(Complex) or defined? Complex::Unify)
a
+ elsif a.scalar? and b.scalar?
+ # Don't delete for -0.0
+ Complex.new(a, b)
else
Complex.new( a.real-b.imag, a.imag+b.real )
end