kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Reduce type check of arguments at Complex creation

Browse source
This commit is contained in:
Nobuyoshi Nakada 2022-10-23 13:42:36 +09:00
parent c8c136265c
commit 86450d03a8
Notes: git 2022-10-23 07:45:03 +00:00 
Merged: https://github.com/ruby/ruby/pull/6618
2 changed files with 48 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
complex.c
View file

@ -421,15 +421,22 @@ f_complex_new_bang2(VALUE klass, VALUE x, VALUE y)
return nucomp_s_new_internal(klass, x, y);
}
inline static void
WARN_UNUSED_RESULT(inline static VALUE nucomp_real_check(VALUE num));
inline static VALUE
nucomp_real_check(VALUE num)
{
if (!RB_INTEGER_TYPE_P(num) &&
!RB_FLOAT_TYPE_P(num) &&
!RB_TYPE_P(num, T_RATIONAL)) {
if (RB_TYPE_P(num, T_COMPLEX) && nucomp_real_p(num)) {
VALUE real = RCOMPLEX(num)->real;
assert(!RB_TYPE_P(real, T_COMPLEX));
return real;
}
if (!k_numeric_p(num) || !f_real_p(num))
rb_raise(rb_eTypeError, "not a real");
}
return num;
}
inline static VALUE
@ -480,16 +487,16 @@ nucomp_s_new(int argc, VALUE *argv, VALUE klass)
switch (rb_scan_args(argc, argv, "11", &real, &imag)) {
case 1:
nucomp_real_check(real);
real = nucomp_real_check(real);
imag = ZERO;
break;
default:
nucomp_real_check(real);
nucomp_real_check(imag);
real = nucomp_real_check(real);
imag = nucomp_real_check(imag);
break;
}
return nucomp_s_canonicalize_internal(klass, real, imag);
return nucomp_s_new_internal(klass, real, imag);
}
inline static VALUE
@ -611,16 +618,8 @@ m_sin(VALUE x)
}
static VALUE
f_complex_polar(VALUE klass, VALUE x, VALUE y)
f_complex_polar_real(VALUE klass, VALUE x, VALUE y)
{
if (RB_TYPE_P(x, T_COMPLEX)) {
get_dat1(x);
x = dat->real;
}
if (RB_TYPE_P(y, T_COMPLEX)) {
get_dat1(y);
y = dat->real;
}
if (f_zero_p(x) || f_zero_p(y)) {
return nucomp_s_new_internal(klass, x, RFLOAT_0);
}
@ -656,6 +655,14 @@ f_complex_polar(VALUE klass, VALUE x, VALUE y)
f_mul(x, m_sin(y)));
}
static VALUE
f_complex_polar(VALUE klass, VALUE x, VALUE y)
{
x = nucomp_real_check(x);
y = nucomp_real_check(y);
return f_complex_polar_real(klass, x, y);
}
#ifdef HAVE___COSPI
# define cospi(x) __cospi(x)
#else
@ -705,14 +712,14 @@ nucomp_s_polar(int argc, VALUE *argv, VALUE klass)
VALUE abs, arg;
argc = rb_scan_args(argc, argv, "11", &abs, &arg);
nucomp_real_check(abs);
abs = nucomp_real_check(abs);
if (argc == 2) {
nucomp_real_check(arg);
arg = nucomp_real_check(arg);
}
else {
arg = ZERO;
}
return f_complex_polar(klass, abs, arg);
return f_complex_polar_real(klass, abs, arg);
}
/*

29
test/ruby/test_complex.rb
View file

@ -1145,15 +1145,34 @@ class Complex_Test < Test::Unit::TestCase
end
def test_canonicalize_polar
obj = Class.new(Numeric) do
def initialize
@x = 2
error = "not a real"
assert_raise_with_message(TypeError, error) do
Complex.polar(1i)
end
assert_raise_with_message(TypeError, error) do
Complex.polar(1i, 0)
end
assert_raise_with_message(TypeError, error) do
Complex.polar(0, 1i)
end
n = Class.new(Numeric) do
def initialize(x = 1)
@x = x
end
def real?
(@x -= 1) > 0
end
end.new
assert_raise(TypeError) do
end
obj = n.new
assert_raise_with_message(TypeError, error) do
Complex.polar(obj)
end
obj = n.new
assert_raise_with_message(TypeError, error) do
Complex.polar(obj, 0)
end
obj = n.new
assert_raise_with_message(TypeError, error) do
Complex.polar(1, obj)
end
end