summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-07 12:04:43 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-07 12:04:43 +0000
commitc31f6285c71ec0ad8052205d7029986453c465ce (patch)
treee4089377558073d53e94c8fb2fc00c12f21ee909
parentb31ba1056ee4647f188b997dcb47450bfe1cb25e (diff)
complex.c: check type
* complex.c (m_cos, m_sin): determine the type by the internal type, not by a method. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62689 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--complex.c4
-rw-r--r--test/ruby/test_complex.rb14
2 files changed, 16 insertions, 2 deletions
diff --git a/complex.c b/complex.c
index 6b54d44..43f2964 100644
--- a/complex.c
+++ b/complex.c
@@ -486,7 +486,7 @@ imp1(sinh)
static VALUE
m_cos(VALUE x)
{
- if (f_real_p(x))
+ if (!RB_TYPE_P(x, T_COMPLEX))
return m_cos_bang(x);
{
get_dat1(x);
@@ -501,7 +501,7 @@ m_cos(VALUE x)
static VALUE
m_sin(VALUE x)
{
- if (f_real_p(x))
+ if (!RB_TYPE_P(x, T_COMPLEX))
return m_sin_bang(x);
{
get_dat1(x);
diff --git a/test/ruby/test_complex.rb b/test/ruby/test_complex.rb
index 48fb994..c2ed1b0 100644
--- a/test/ruby/test_complex.rb
+++ b/test/ruby/test_complex.rb
@@ -970,4 +970,18 @@ class Complex_Test < Test::Unit::TestCase
assert_equal(obj, c.real)
assert_equal(-1, c.imag)
end
+
+ def test_canonicalize_polar
+ obj = Class.new(Numeric) do
+ def initialize
+ @x = 2
+ end
+ def real?
+ (@x -= 1) > 0
+ end
+ end.new
+ assert_raise(TypeError) do
+ Complex.polar(1, obj)
+ end
+ end
end