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

Replace f_boolcast with RBOOL macro

Browse source 
* Move f_boolcast definination

* Remove f_boolcast macro defination

* to
This commit is contained in:
S.H 2021-08-18 02:25:19 +09:00 committed by GitHub
parent 6a9bfa4d93
commit 58bd943436
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
Notes: git 2021-08-18 02:25:42 +09:00 
Merged: https://github.com/ruby/ruby/pull/4748

Merged-By: nobu <nobu@ruby-lang.org>
3 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
complex.c
View file

@ -54,8 +54,6 @@ static ID id_abs, id_arg,
#define id_quo idQuo
#define id_fdiv idFdiv
#define f_boolcast(x) ((x) ? Qtrue : Qfalse)
#define fun1(n) \
inline static VALUE \
f_##n(VALUE x)\
@ -1092,15 +1090,15 @@ nucomp_eqeq_p(VALUE self, VALUE other)
if (RB_TYPE_P(other, T_COMPLEX)) {
get_dat2(self, other);
return f_boolcast(f_eqeq_p(adat->real, bdat->real) &&
return RBOOL(f_eqeq_p(adat->real, bdat->real) &&
f_eqeq_p(adat->imag, bdat->imag));
}
if (k_numeric_p(other) && f_real_p(other)) {
get_dat1(self);
return f_boolcast(f_eqeq_p(dat->real, other) && f_zero_p(dat->imag));
return RBOOL(f_eqeq_p(dat->real, other) && f_zero_p(dat->imag));
}
return f_boolcast(f_eqeq_p(other, self));
return RBOOL(f_eqeq_p(other, self));
}
static bool
@ -1354,7 +1352,7 @@ nucomp_eql_p(VALUE self, VALUE other)
if (RB_TYPE_P(other, T_COMPLEX)) {
get_dat2(self, other);
return f_boolcast((CLASS_OF(adat->real) == CLASS_OF(bdat->real)) &&
return RBOOL((CLASS_OF(adat->real) == CLASS_OF(bdat->real)) &&
(CLASS_OF(adat->imag) == CLASS_OF(bdat->imag)) &&
f_eqeq_p(self, other));

5
math.c
View file

@ -620,12 +620,11 @@ math_sqrt(VALUE unused_obj, VALUE x)
return rb_math_sqrt(x);
}
#define f_boolcast(x) ((x) ? Qtrue : Qfalse)
inline static VALUE
f_negative_p(VALUE x)
{
if (FIXNUM_P(x))
return f_boolcast(FIX2LONG(x) < 0);
return RBOOL(FIX2LONG(x) < 0);
return rb_funcall(x, '<', 1, INT2FIX(0));
}
inline static VALUE
@ -633,7 +632,7 @@ f_signbit(VALUE x)
{
if (RB_TYPE_P(x, T_FLOAT)) {
double f = RFLOAT_VALUE(x);
return f_boolcast(!isnan(f) && signbit(f));
return RBOOL(!isnan(f) && signbit(f));
}
return f_negative_p(x);
}

11
rational.c
View file

@ -46,7 +46,6 @@ static ID id_abs, id_integer_p,
#define id_idiv idDiv
#define id_to_i idTo_i
#define f_boolcast(x) ((x) ? Qtrue : Qfalse)
#define f_inspect rb_inspect
#define f_to_s rb_obj_as_string
@ -1136,12 +1135,12 @@ nurat_eqeq_p(VALUE self, VALUE other)
}
else {
const double d = nurat_to_double(self);
return f_boolcast(FIXNUM_ZERO_P(rb_dbl_cmp(d, NUM2DBL(other))));
return RBOOL(FIXNUM_ZERO_P(rb_dbl_cmp(d, NUM2DBL(other))));
}
}
else if (RB_FLOAT_TYPE_P(other)) {
const double d = nurat_to_double(self);
return f_boolcast(FIXNUM_ZERO_P(rb_dbl_cmp(d, RFLOAT_VALUE(other))));
return RBOOL(FIXNUM_ZERO_P(rb_dbl_cmp(d, RFLOAT_VALUE(other))));
}
else if (RB_TYPE_P(other, T_RATIONAL)) {
{
@ -1150,7 +1149,7 @@ nurat_eqeq_p(VALUE self, VALUE other)
if (INT_ZERO_P(adat->num) && INT_ZERO_P(bdat->num))
return Qtrue;
return f_boolcast(rb_int_equal(adat->num, bdat->num) &&
return RBOOL(rb_int_equal(adat->num, bdat->num) &&
rb_int_equal(adat->den, bdat->den));
}
}
@ -1201,7 +1200,7 @@ static VALUE
nurat_positive_p(VALUE self)
{
get_dat1(self);
return f_boolcast(INT_POSITIVE_P(dat->num));
return RBOOL(INT_POSITIVE_P(dat->num));
}
/*
@ -1214,7 +1213,7 @@ static VALUE
nurat_negative_p(VALUE self)
{
get_dat1(self);
return f_boolcast(INT_NEGATIVE_P(dat->num));
return RBOOL(INT_NEGATIVE_P(dat->num));
}
/*