* complex.c ({nucomp,numeric}_rect): new.

	* complex.c: added some aliases
	  (::rectangular, ::rect, #rectangular, #rect, #phase,
	  #magnitude).

	* complex.c (string_to_c_internal): should not strip any null
	  bytes.

	* rational.c (string_to_r_internal): ditto.

	* rational.c (i_gcd): reverted to nurat 0.0.2's one.

	* numeric.c: added an alias (#magnitude).

	* test/ruby/test_complex.rb: added assertions.

	* test/ruby/test_rational.rb: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 208 insertions, 80 deletions

diff --git a/test/ruby/test_complex.rb b/test/ruby/test_complex.rb
index b661864519..786451febc 100644
--- a/test/ruby/test_complex.rb
+++ b/test/ruby/test_complex.rb
@@ -7,6 +7,10 @@ class Complex_Test < Test::Unit::TestCase
   def test_compsub
     c = ComplexSub.__send__(:new, 1)
     cc = ComplexSub.__send__(:convert, 1)
+
+    assert_kind_of(Numeric, c)
+    assert_kind_of(Numeric, cc)
+
     if defined?(ComplexSub::Unify)
       assert_instance_of(Fixnum, c)
       assert_instance_of(Fixnum, cc)
@@ -181,10 +185,12 @@ class Complex_Test < Test::Unit::TestCase
     assert_equal(4, c.real)
     assert_equal(5, c.image)
 
-    c = Complex(-0.0,-0.0)
+    if -0.0.to_s == '-0.0'
+      c = Complex(-0.0,-0.0)
 
-    assert_equal('-0.0', c.real.to_s)
-    assert_equal('-0.0', c.image.to_s)
+      assert_equal('-0.0', c.real.to_s)
+      assert_equal('-0.0', c.image.to_s)
+    end
 
     c = Complex.__send__(:new, 4)
 
@@ -198,11 +204,13 @@ class Complex_Test < Test::Unit::TestCase
     assert_equal(5, c.image)
     assert_equal(c.imag, c.image)
 
-    c = Complex.__send__(:new, -0.0,-0.0)
+    if -0.0.to_s == '-0.0'
+      c = Complex.__send__(:new, -0.0,-0.0)
 
-    assert_equal('-0.0', c.real.to_s)
-    assert_equal('-0.0', c.image.to_s)
-    assert_equal(c.imag.to_s, c.image.to_s)
+      assert_equal('-0.0', c.real.to_s)
+      assert_equal('-0.0', c.image.to_s)
+      assert_equal(c.imag.to_s, c.image.to_s)
+    end
 
     c = Complex.__send__(:new!, 4)
 
@@ -275,6 +283,15 @@ class Complex_Test < Test::Unit::TestCase
     assert_equal(Complex(1,1), Complex(1,1).nonzero?)
   end
 
+  def rect
+    assert_equal([1,2], Complex.rectangular(1,2).rectangular)
+    assert_equal([1,2], Complex.rect(1,2).rect)
+  end
+
+  def polar
+    assert_equal([1,2], Complex.polar(1,2).polar)
+  end
+
   def test_uplus
     assert_equal(Complex(1), +Complex(1))
     assert_equal(Complex(-1), +Complex(-1))
@@ -503,10 +520,23 @@ class Complex_Test < Test::Unit::TestCase
     assert_equal(false, Complex(1) == '')
   end
 
+  def test_unify
+    if defined?(Complex::Unify)
+      assert_instance_of(Fixnum, Complex(1,2) + Complex(-1,-2))
+      assert_instance_of(Fixnum, Complex(1,2) - Complex(1,2))
+      assert_instance_of(Fixnum, Complex(1,2) * 0)
+      assert_instance_of(Fixnum, Complex(1,2) / Complex(1,2))
+      assert_instance_of(Fixnum, Complex(1,2).div(Complex(1,2)))
+      assert_instance_of(Fixnum, Complex(1,2).quo(Complex(1,2)))
+#      assert_instance_of(Fixnum, Complex(1,2) ** 0) # mathn's bug
+    end
+  end
+
   def test_math
     c = Complex(1,2)
 
     assert_in_delta(2.236, c.abs, 0.001)
+    assert_in_delta(2.236, c.magnitude, 0.001)
     assert_equal(5, c.abs2)
 
     assert_equal(c.abs, Math.sqrt(c * c.conj))
@@ -516,6 +546,7 @@ class Complex_Test < Test::Unit::TestCase
 
     assert_in_delta(1.107, c.arg, 0.001)
     assert_in_delta(1.107, c.angle, 0.001)
+    assert_in_delta(1.107, c.phase, 0.001)
 
     r = c.polar
     assert_in_delta(2.236, r[0], 0.001)
@@ -598,6 +629,7 @@ class Complex_Test < Test::Unit::TestCase
   def test_parse
     assert_equal(Complex(0), ''.to_c)
     assert_equal(Complex(0), ' '.to_c)
+    assert_equal(Complex(5), "\f\n\r\t\v5\0".to_c)
     assert_equal(Complex(5), '5'.to_c)
     assert_equal(Complex(-5), '-5'.to_c)
     assert_equal(Complex(5,3), '5+3i'.to_c)
@@ -705,6 +737,7 @@ class Complex_Test < Test::Unit::TestCase
     assert_raise(ArgumentError){ Complex('5+3_i')}
     assert_raise(ArgumentError){ Complex('5+3i_')}
     assert_raise(ArgumentError){ Complex('5+3ix')}
+    assert_raise(ArgumentError){ Complex("5\0")}
 
     if defined?(Rational) && defined?(''.to_r)
       assert_equal(Complex(Rational(1,5)), '1/5'.to_c)
@@ -818,17 +851,36 @@ class Complex_Test < Test::Unit::TestCase
     assert_equal(0, 1.1.image)
     assert_equal(0, 1.1.imag)
 
+    assert_equal(1, 1.magnitude)
+    assert_equal(1, -1.magnitude)
+    assert_equal(1, 1.0.magnitude)
+    assert_equal(1, -1.0.magnitude)
+
     assert_equal(0, 1.arg)
     assert_equal(0, 1.angle)
+    assert_equal(0, 1.phase)
 
     assert_equal(0, 1.0.arg)
     assert_equal(0, 1.0.angle)
+    assert_equal(0, 1.0.phase)
 
     assert_equal(Math::PI, -1.arg)
     assert_equal(Math::PI, -1.angle)
+    assert_equal(Math::PI, -1.phase)
 
     assert_equal(Math::PI, -1.0.arg)
     assert_equal(Math::PI, -1.0.angle)
+    assert_equal(Math::PI, -1.0.phase)
+
+    assert_equal([1,0], 1.rect)
+    assert_equal([-1,0], -1.rect)
+    assert_equal([1,0], 1.rectangular)
+    assert_equal([-1,0], -1.rectangular)
+
+    assert_equal([1.0,0], 1.0.rect)
+    assert_equal([-1.0,0], -1.0.rect)
+    assert_equal([1.0,0], 1.0.rectangular)
+    assert_equal([-1.0,0], -1.0.rectangular)
 
     assert_equal([1,0], 1.polar)
     assert_equal([1, Math::PI], -1.polar)
@@ -846,46 +898,14 @@ class Complex_Test < Test::Unit::TestCase
     assert_equal(1.1, 1.1.conj)
     assert_equal(-1.1, -1.1.conj)
 
-    assert_equal(1, 1.numerator)
-    assert_equal(9, 9.numerator)
-    assert_equal(1, 1.denominator)
-    assert_equal(1, 9.denominator)
-
-    if defined?(Rational) && !Rational.instance_variable_get('@RCS_ID')
-      assert_equal(1.0, 1.0.numerator)
-      assert_equal(9.0, 9.0.numerator)
-      assert_equal(1.0, 1.0.denominator)
-      assert_equal(1.0, 9.0.denominator)
-    end
-
-=begin
-    if defined?(Rational) && !Rational.instance_variable_get('@RCS_ID')
-      assert_equal(Rational(1,9), 9.reciprocal)
-      assert_equal(Rational(1,9), 9.0.reciprocal)
-      assert_equal(Rational(1,9), 9.inverse)
-      assert_equal(Rational(1,9), 9.0.inverse)
-    end
-=end
-
     if defined?(Rational)
-      assert_equal(Rational(1,2), 1.quo(2))
-      assert_equal(Rational(5000000000), 10000000000.quo(2))
-      assert_equal(0.5, 1.0.quo(2))
-      assert_equal(Rational(1,4), Rational(1,2).quo(2))
       assert_equal(Complex(Rational(1,2),Rational(1)), Complex(1,2).quo(2))
     else
-      assert_equal(0.5, 1.quo(2))
-      assert_equal(5000000000.0, 10000000000.quo(2))
-      assert_equal(0.5, 1.0.quo(2))
       assert_equal(Complex(0.5,1.0), Complex(1,2).quo(2))
     end
 
 =begin
     if defined?(Rational) && !Rational.instance_variable_get('@RCS_ID')
-      assert_equal(Rational(1,2), 1.rdiv(2))
-      assert_equal(Rational(5000000000), 10000000000.rdiv(2))
-      assert_equal(Rational(1,2), 1.0.rdiv(2))
-      assert_equal(Rational(1,4), Rational(1,2).rdiv(2))
       assert_equal(Complex(Rational(1,2),Rational(1)), Complex(1,2).quo(2))
     end
 =end
diff --git a/test/ruby/test_rational.rb b/test/ruby/test_rational.rb
index eb52e3e193..b979da91d8 100644
--- a/test/ruby/test_rational.rb
+++ b/test/ruby/test_rational.rb
@@ -7,6 +7,10 @@ class Rational_Test < Test::Unit::TestCase
   def test_ratsub
     c = RationalSub.__send__(:new, 1)
     cc = RationalSub.__send__(:convert, 1)
+
+    assert_kind_of(Numeric, c)
+    assert_kind_of(Numeric, cc)
+
     if defined?(RationalSub::Unify)
       assert_instance_of(Fixnum, c)
       assert_instance_of(Fixnum, cc)
@@ -29,6 +33,21 @@ class Rational_Test < Test::Unit::TestCase
     end
   end
 
+  def test_eql_p
+    c = Rational(0)
+    c2 = Rational(0)
+    c3 = Rational(1)
+
+    assert_equal(true, c.eql?(c2))
+    assert_equal(false, c.eql?(c3))
+
+    if defined?(Rational::Unify)
+      assert_equal(true, c.eql?(0))
+    else
+      assert_equal(false, c.eql?(0))
+    end
+  end
+
   def test_hash
     assert_instance_of(Fixnum, Rational(1,2).hash)
 
@@ -180,10 +199,16 @@ class Rational_Test < Test::Unit::TestCase
     c = Rational(Rational(1,2),Rational(1,2))
     assert_equal(Rational.__send__(:new, 1), c)
 
-    assert_equal(Rational.__send__(:new, 1),Rational(1))
-    assert_equal(1.1.to_r,Rational(1.1))
-    assert_equal(Rational.__send__(:new, 1),Rational('1'))
+    assert_equal(Rational.__send__(:new, 3),Rational(3))
+    assert_equal(Rational.__send__(:new, 1),Rational(3,3))
+    assert_equal(3.3.to_r,Rational(3.3))
+    assert_equal(1,Rational(3.3,3.3))
+    assert_equal(Rational.__send__(:new, 3),Rational('3'))
+    assert_equal(Rational.__send__(:new, 1),Rational('3.0','3.0'))
+    assert_equal(Rational.__send__(:new, 1),Rational('3/3','3/3'))
     assert_raise(ArgumentError){Rational(nil)}
+    assert_raise(ArgumentError){Rational('')}
+    assert_raise(ArgumentError){Rational(Object.new)}
   end
 
   def test_attr
@@ -335,6 +360,9 @@ class Rational_Test < Test::Unit::TestCase
 
     assert_equal(Rational(1,4), c / 2)
     assert_equal(0.25, c / 2.0)
+
+    assert_raise(ZeroDivisionError){Rational(1, 3) / 0}
+    assert_raise(ZeroDivisionError){Rational(1, 3) / Rational(0)}
   end
 
   def assert_eql(exp, act, *args)
@@ -387,6 +415,41 @@ class Rational_Test < Test::Unit::TestCase
     end
   end
 
+  def test_modulo
+    c = Rational(1,2)
+    c2 = Rational(2,3)
+
+    assert_eql(Rational(1,2), c.modulo(c2))
+    assert_eql(Rational(1,2), c.modulo(2))
+    assert_eql(0.5, c.modulo(2.0))
+
+    c = Rational(301,100)
+    c2 = Rational(7,5)
+
+    assert_equal(Rational(21,100), c.modulo(c2))
+    assert_equal(Rational(-119,100), c.modulo(-c2))
+    assert_equal(Rational(119,100), (-c).modulo(c2))
+    assert_equal(Rational(-21,100), (-c).modulo(-c2))
+
+    c = Rational(301,100)
+    c2 = Rational(2)
+
+    assert_equal(Rational(101,100), c.modulo(c2))
+    assert_equal(Rational(-99,100), c.modulo(-c2))
+    assert_equal(Rational(99,100), (-c).modulo(c2))
+    assert_equal(Rational(-101,100), (-c).modulo(-c2))
+
+    unless defined?(Rational::Unify)
+      c = Rational(11)
+      c2 = Rational(3)
+
+      assert_equal(2, c.modulo(c2))
+      assert_equal(-1, c.modulo(-c2))
+      assert_equal(1, (-c).modulo(c2))
+      assert_equal(-2, (-c).modulo(-c2))
+    end
+  end
+
   def test_divmod
     c = Rational(1,2)
     c2 = Rational(2,3)
@@ -457,7 +520,44 @@ class Rational_Test < Test::Unit::TestCase
       assert_equal(3, (-c).quot(-c2))
     end
   end
+=end
+
+  def test_remainder
+    c = Rational(1,2)
+    c2 = Rational(2,3)
+
+    assert_eql(Rational(1,2), c.remainder(c2))
+    assert_eql(Rational(1,2), c.remainder(2))
+    assert_eql(0.5, c.remainder(2.0))
+
+    c = Rational(301,100)
+    c2 = Rational(7,5)
+
+    assert_equal(Rational(21,100), c.remainder(c2))
+    assert_equal(Rational(21,100), c.remainder(-c2))
+    assert_equal(Rational(-21,100), (-c).remainder(c2))
+    assert_equal(Rational(-21,100), (-c).remainder(-c2))
+
+    c = Rational(301,100)
+    c2 = Rational(2)
+
+    assert_equal(Rational(101,100), c.remainder(c2))
+    assert_equal(Rational(101,100), c.remainder(-c2))
+    assert_equal(Rational(-101,100), (-c).remainder(c2))
+    assert_equal(Rational(-101,100), (-c).remainder(-c2))
+
+    unless defined?(Rational::Unify)
+      c = Rational(11)
+      c2 = Rational(3)
+
+      assert_equal(2, c.remainder(c2))
+      assert_equal(2, c.remainder(-c2))
+      assert_equal(-2, (-c).remainder(c2))
+      assert_equal(-2, (-c).remainder(-c2))
+    end
+  end
 
+=begin
   def test_quotrem
     c = Rational(1,2)
     c2 = Rational(2,3)
@@ -696,6 +796,33 @@ class Rational_Test < Test::Unit::TestCase
     end
   end
 
+  def test_math
+    assert_equal(Rational(1,2), Rational(1,2).abs)
+    assert_equal(Rational(1,2), Rational(-1,2).abs)
+    if defined?(Complex) && !Complex.instance_variable_get('@RCS_ID')
+      assert_equal(Rational(1,2), Rational(1,2).magnitude)
+      assert_equal(Rational(1,2), Rational(-1,2).magnitude)
+    end
+
+    assert_equal(1, Rational(1,2).numerator)
+    assert_equal(2, Rational(1,2).denominator)
+  end
+
+  def test_trunc
+    [[Rational(13, 5),  [ 2,  3,  2,  3]], #  2.6
+     [Rational(5, 2),   [ 2,  3,  2,  3]], #  2.5
+     [Rational(12, 5),  [ 2,  3,  2,  2]], #  2.4
+     [Rational(-12,5),  [-3, -2, -2, -2]], # -2.4
+     [Rational(-5, 2),  [-3, -2, -2, -3]], # -2.5
+     [Rational(-13, 5), [-3, -2, -2, -3]], # -2.6
+    ].each do |i, a|
+      assert_equal(a[0], i.floor)
+      assert_equal(a[1], i.ceil)
+      assert_equal(a[2], i.truncate)
+      assert_equal(a[3], i.round)
+    end
+  end
+
   def test_to_s
     c = Rational(1,2)
 
@@ -739,6 +866,7 @@ class Rational_Test < Test::Unit::TestCase
   def test_parse
     assert_equal(Rational(0), ''.to_r)
     assert_equal(Rational(0), ' '.to_r)
+    assert_equal(Rational(5), "\f\n\r\t\v5\0".to_r)
     assert_equal(Rational(5), '5'.to_r)
     assert_equal(Rational(-5), '-5'.to_r)
     assert_equal(Rational(5,3), '5/3'.to_r)
@@ -816,6 +944,7 @@ class Rational_Test < Test::Unit::TestCase
     assert_raise(ArgumentError){ Rational('5/3_')}
     assert_raise(ArgumentError){ Rational('5/3.3')}
     assert_raise(ArgumentError){ Rational('5/3x')}
+    assert_raise(ArgumentError){ Rational("5\0")}
   end
 
 =begin
@@ -885,48 +1014,27 @@ class Rational_Test < Test::Unit::TestCase
     assert_eql(c, c.prec(Rational))
   end
 
+  def test_gcdlcm
+    assert_equal(7, 91.gcd(-49))
+    assert_equal(5, 5.gcd(0))
+    assert_equal(5, 0.gcd(5))
+    assert_equal(70, 14.lcm(35))
+    assert_equal(0, 5.lcm(0))
+    assert_equal(0, 0.lcm(5))
+    assert_equal([5,0], 0.gcdlcm(5))
+    assert_equal([5,0], 5.gcdlcm(0))
+
+    assert_equal(1, 1073741827.gcd(1073741789))
+    assert_equal(1152921470247108503, 1073741827.lcm(1073741789))
+
+    assert_equal(1, 1073741789.gcd(1073741827))
+    assert_equal(1152921470247108503, 1073741789.lcm(1073741827))
+  end
+
   def test_supp
     assert_equal(true, 1.scalar?)
     assert_equal(true, 1.1.scalar?)
 
-    if defined?(Complex)
-      assert_equal(1, 1.real)
-      assert_equal(0, 1.image)
-      assert_equal(0, 1.imag)
-
-      assert_equal(1.1, 1.1.real)
-      assert_equal(0, 1.1.image)
-      assert_equal(0, 1.1.imag)
-
-      assert_equal(0, 1.arg)
-      assert_equal(0, 1.angle)
-
-      assert_equal(0, 1.0.arg)
-      assert_equal(0, 1.0.angle)
-
-      assert_equal(Math::PI, -1.arg)
-      assert_equal(Math::PI, -1.angle)
-
-      assert_equal(Math::PI, -1.0.arg)
-      assert_equal(Math::PI, -1.0.angle)
-
-      assert_equal([1,0], 1.polar)
-      assert_equal([1, Math::PI], -1.polar)
-
-      assert_equal([1.0,0], 1.0.polar)
-      assert_equal([1.0, Math::PI], -1.0.polar)
-
-      assert_equal(1, 1.conjugate)
-      assert_equal(-1, -1.conjugate)
-      assert_equal(1, 1.conj)
-      assert_equal(-1, -1.conj)
-
-      assert_equal(1.1, 1.1.conjugate)
-      assert_equal(-1.1, -1.1.conjugate)
-      assert_equal(1.1, 1.1.conj)
-      assert_equal(-1.1, -1.1.conj)
-    end
-
     assert_equal(1, 1.numerator)
     assert_equal(9, 9.numerator)
     assert_equal(1, 1.denominator)