From 00777ea256748efd5fe31910515aa0b69536e006 Mon Sep 17 00:00:00 2001
From: tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 16 Sep 2008 22:04:19 +0000
Subject: 	* numeric.c: provides predicate real? instead of scalar?.

	* complex.c: follows the above change.

	* lib/cmath.c: ditto.



git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19393 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_complex.rb  | 10 ++++++----
 test/ruby/test_numeric.rb  |  4 ++--
 test/ruby/test_rational.rb | 10 ++++++----
 3 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'test/ruby')

diff --git a/test/ruby/test_complex.rb b/test/ruby/test_complex.rb
index af2311ca0..6a5eb0c48 100644
--- a/test/ruby/test_complex.rb
+++ b/test/ruby/test_complex.rb
@@ -243,7 +243,6 @@ class Complex_Test < Test::Unit::TestCase
     c = Complex(1)
 
     if defined?(Complex::Unify)
-      assert_equal(true, c.scalar?)
 =begin
       assert_equal(true, c.finite?)
       assert_equal(false, c.infinite?)
@@ -251,13 +250,14 @@ class Complex_Test < Test::Unit::TestCase
       assert_equal(true, c.integer?)
       assert_equal(false, c.float?)
       assert_equal(true, c.rational?)
+=end
       assert_equal(true, c.real?)
+=begin
       assert_equal(false, c.complex?)
       assert_equal(true, c.exact?)
       assert_equal(false, c.inexact?)
 =end
     else
-      assert_equal(false, c.scalar?)
 =begin
       assert_equal(true, c.finite?)
       assert_equal(false, c.infinite?)
@@ -265,7 +265,9 @@ class Complex_Test < Test::Unit::TestCase
       assert_equal(false, c.integer?)
       assert_equal(false, c.float?)
       assert_equal(false, c.rational?)
+=end
       assert_equal(false, c.real?)
+=begin
       assert_equal(true, c.complex?)
       assert_equal(true, c.exact?)
       assert_equal(false, c.inexact?)
@@ -882,8 +884,8 @@ class Complex_Test < Test::Unit::TestCase
   end
 
   def test_supp
-    assert_equal(true, 1.scalar?)
-    assert_equal(true, 1.1.scalar?)
+    assert_equal(true, 1.real?)
+    assert_equal(true, 1.1.real?)
 
     assert_equal(1, 1.real)
     assert_equal(0, 1.image)
diff --git a/test/ruby/test_numeric.rb b/test/ruby/test_numeric.rb
index 3db054fda..0dd7b2e99 100644
--- a/test/ruby/test_numeric.rb
+++ b/test/ruby/test_numeric.rb
@@ -72,8 +72,8 @@ class TestNumeric < Test::Unit::TestCase
     end
   end
 
-  def test_scalar_p
-    assert(Numeric.new.scalar?)
+  def test_real_p
+    assert(Numeric.new.real?)
   end
 
   def test_integer_p
diff --git a/test/ruby/test_rational.rb b/test/ruby/test_rational.rb
index de8c31dbc..a35157592 100644
--- a/test/ruby/test_rational.rb
+++ b/test/ruby/test_rational.rb
@@ -249,7 +249,6 @@ class Rational_Test < Test::Unit::TestCase
     c = Rational(1)
 
     if defined?(Rational::Unify)
-      assert_equal(true, c.scalar?)
 =begin
       assert_equal(true, c.finite?)
       assert_equal(false, c.infinite?)
@@ -257,13 +256,14 @@ class Rational_Test < Test::Unit::TestCase
       assert_equal(true, c.integer?)
       assert_equal(false, c.float?)
       assert_equal(true, c.rational?)
+=end
       assert_equal(true, c.real?)
+=begin
       assert_equal(false, c.complex?)
       assert_equal(true, c.exact?)
       assert_equal(false, c.inexact?)
 =end
     else
-      assert_equal(true, c.scalar?)
 =begin
       assert_equal(true, c.finite?)
       assert_equal(false, c.infinite?)
@@ -271,7 +271,9 @@ class Rational_Test < Test::Unit::TestCase
       assert_equal(false, c.integer?)
       assert_equal(false, c.float?)
       assert_equal(true, c.rational?)
+=end
       assert_equal(true, c.real?)
+=begin
       assert_equal(false, c.complex?)
       assert_equal(true, c.exact?)
       assert_equal(false, c.inexact?)
@@ -1054,8 +1056,8 @@ class Rational_Test < Test::Unit::TestCase
   end
 
   def test_supp
-    assert_equal(true, 1.scalar?)
-    assert_equal(true, 1.1.scalar?)
+    assert_equal(true, 1.real?)
+    assert_equal(true, 1.1.real?)
 
     assert_equal(1, 1.numerator)
     assert_equal(9, 9.numerator)
-- 
cgit