archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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
Download patch file Download diff file Expand all files Collapse all files

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));
}
/*