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

Make internal predicate functions to return simple boolean

Browse source
This commit is contained in:
Nobuyoshi Nakada 2021-09-02 17:12:17 +09:00
parent d1d76f2428
commit 137fde717b
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
complex.c
View file

@ -338,29 +338,26 @@ VALUE rb_flo_is_finite_p(VALUE num);
inline static int inline static int
f_finite_p(VALUE x) f_finite_p(VALUE x)
{ {
if (RB_INTEGER_TYPE_P(x)) { if (RB_INTEGER_TYPE_P(x) || RB_TYPE_P(x, T_RATIONAL)) {
return TRUE; return TRUE;
} }
else if (RB_FLOAT_TYPE_P(x)) { else if (RB_FLOAT_TYPE_P(x)) {
return (int)rb_flo_is_finite_p(x); return (int)rb_flo_is_finite_p(x);
} }
else if (RB_TYPE_P(x, T_RATIONAL)) {
return TRUE;
}
return RTEST(rb_funcallv(x, id_finite_p, 0, 0)); return RTEST(rb_funcallv(x, id_finite_p, 0, 0));
} }
VALUE rb_flo_is_infinite_p(VALUE num); VALUE rb_flo_is_infinite_p(VALUE num);
inline static VALUE inline static int
f_infinite_p(VALUE x) f_infinite_p(VALUE x)
{ {
if (RB_INTEGER_TYPE_P(x) || RB_TYPE_P(x, T_RATIONAL)) { if (RB_INTEGER_TYPE_P(x) || RB_TYPE_P(x, T_RATIONAL)) {
return Qnil; return FALSE;
} }
else if (RB_FLOAT_TYPE_P(x)) { else if (RB_FLOAT_TYPE_P(x)) {
return rb_flo_is_infinite_p(x); return RTEST(rb_flo_is_infinite_p(x));
} }
return rb_funcallv(x, id_infinite_p, 0, 0); return RTEST(rb_funcallv(x, id_infinite_p, 0, 0));
} }
inline static int inline static int
@ -1469,7 +1466,7 @@ rb_complex_infinite_p(VALUE self)
{ {
get_dat1(self); get_dat1(self);
if (NIL_P(f_infinite_p(dat->real)) && NIL_P(f_infinite_p(dat->imag))) { if (!f_infinite_p(dat->real) && !f_infinite_p(dat->imag)) {
return Qnil; return Qnil;
} }
return ONE; return ONE;

2
rational.c
View file

@ -128,7 +128,7 @@ f_abs(VALUE x)
} }
inline static VALUE inline static int
f_integer_p(VALUE x) f_integer_p(VALUE x)
{ {
return RB_INTEGER_TYPE_P(x); return RB_INTEGER_TYPE_P(x);