1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace RB_TYPE_P macro to FIXNUM_P and RB_INTEGER_TYPE_P macro

Browse Source
This commit is contained in:
S-H-GAMELINKS 2021-09-11 13:45:22 +09:00 committed by Nobuyoshi Nakada
parent 926749516e
commit af5826a25e
Notes: git 2021-09-12 11:16:34 +09:00 
Merged: https://github.com/ruby/ruby/pull/4816
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
load.c
View File

@ -208,7 +208,7 @@ features_index_add_single(const char* str, size_t len, VALUE offset, bool rb)
NIL_P(this_feature_index = (VALUE)data)) { NIL_P(this_feature_index = (VALUE)data)) {
st_insert(features_index, short_feature_key, (st_data_t)offset); st_insert(features_index, short_feature_key, (st_data_t)offset);
} }
else if (RB_TYPE_P(this_feature_index, T_FIXNUM)) { else if (FIXNUM_P(this_feature_index)) {
VALUE loaded_features = get_loaded_features(); VALUE loaded_features = get_loaded_features();
VALUE this_feature_path = RARRAY_AREF(loaded_features, FIX2LONG(this_feature_index)); VALUE this_feature_path = RARRAY_AREF(loaded_features, FIX2LONG(this_feature_index));
VALUE feature_indexes[2]; VALUE feature_indexes[2];

26
numeric.c
View File

@ -994,7 +994,7 @@ rb_float_uminus(VALUE flt)
VALUE VALUE
rb_float_plus(VALUE x, VALUE y) rb_float_plus(VALUE x, VALUE y)
{ {
if (RB_TYPE_P(y, T_FIXNUM)) { if (FIXNUM_P(y)) {
return DBL2NUM(RFLOAT_VALUE(x) + (double)FIX2LONG(y)); return DBL2NUM(RFLOAT_VALUE(x) + (double)FIX2LONG(y));
} }
else if (RB_BIGNUM_TYPE_P(y)) { else if (RB_BIGNUM_TYPE_P(y)) {
@ -1018,7 +1018,7 @@ rb_float_plus(VALUE x, VALUE y)
VALUE VALUE
rb_float_minus(VALUE x, VALUE y) rb_float_minus(VALUE x, VALUE y)
{ {
if (RB_TYPE_P(y, T_FIXNUM)) { if (FIXNUM_P(y)) {
return DBL2NUM(RFLOAT_VALUE(x) - (double)FIX2LONG(y)); return DBL2NUM(RFLOAT_VALUE(x) - (double)FIX2LONG(y));
} }
else if (RB_BIGNUM_TYPE_P(y)) { else if (RB_BIGNUM_TYPE_P(y)) {
@ -1042,7 +1042,7 @@ rb_float_minus(VALUE x, VALUE y)
VALUE VALUE
rb_float_mul(VALUE x, VALUE y) rb_float_mul(VALUE x, VALUE y)
{ {
if (RB_TYPE_P(y, T_FIXNUM)) { if (FIXNUM_P(y)) {
return DBL2NUM(RFLOAT_VALUE(x) * (double)FIX2LONG(y)); return DBL2NUM(RFLOAT_VALUE(x) * (double)FIX2LONG(y));
} }
else if (RB_BIGNUM_TYPE_P(y)) { else if (RB_BIGNUM_TYPE_P(y)) {
@ -1094,7 +1094,7 @@ rb_float_div(VALUE x, VALUE y)
double den; double den;
double ret; double ret;
if (RB_TYPE_P(y, T_FIXNUM)) { if (FIXNUM_P(y)) {
den = FIX2LONG(y); den = FIX2LONG(y);
} }
else if (RB_BIGNUM_TYPE_P(y)) { else if (RB_BIGNUM_TYPE_P(y)) {
@ -1192,7 +1192,7 @@ flo_mod(VALUE x, VALUE y)
{ {
double fy; double fy;
if (RB_TYPE_P(y, T_FIXNUM)) { if (FIXNUM_P(y)) {
fy = (double)FIX2LONG(y); fy = (double)FIX2LONG(y);
} }
else if (RB_BIGNUM_TYPE_P(y)) { else if (RB_BIGNUM_TYPE_P(y)) {
@ -1232,7 +1232,7 @@ flo_divmod(VALUE x, VALUE y)
double fy, div, mod; double fy, div, mod;
volatile VALUE a, b; volatile VALUE a, b;
if (RB_TYPE_P(y, T_FIXNUM)) { if (FIXNUM_P(y)) {
fy = (double)FIX2LONG(y); fy = (double)FIX2LONG(y);
} }
else if (RB_BIGNUM_TYPE_P(y)) { else if (RB_BIGNUM_TYPE_P(y)) {
@ -1267,7 +1267,7 @@ rb_float_pow(VALUE x, VALUE y)
dx = RFLOAT_VALUE(x); dx = RFLOAT_VALUE(x);
return DBL2NUM(dx * dx); return DBL2NUM(dx * dx);
} }
else if (RB_TYPE_P(y, T_FIXNUM)) { else if (FIXNUM_P(y)) {
dx = RFLOAT_VALUE(x); dx = RFLOAT_VALUE(x);
dy = (double)FIX2LONG(y); dy = (double)FIX2LONG(y);
} }
@ -1352,7 +1352,7 @@ rb_float_equal(VALUE x, VALUE y)
{ {
volatile double a, b; volatile double a, b;
if (RB_TYPE_P(y, T_FIXNUM) || RB_BIGNUM_TYPE_P(y)) { if (RB_INTEGER_TYPE_P(y)) {
return rb_integer_float_eq(y, x); return rb_integer_float_eq(y, x);
} }
else if (RB_TYPE_P(y, T_FLOAT)) { else if (RB_TYPE_P(y, T_FLOAT)) {
@ -1427,7 +1427,7 @@ flo_cmp(VALUE x, VALUE y)
a = RFLOAT_VALUE(x); a = RFLOAT_VALUE(x);
if (isnan(a)) return Qnil; if (isnan(a)) return Qnil;
if (RB_TYPE_P(y, T_FIXNUM) || RB_BIGNUM_TYPE_P(y)) { if (RB_INTEGER_TYPE_P(y)) {
VALUE rel = rb_integer_float_cmp(y, x); VALUE rel = rb_integer_float_cmp(y, x);
if (FIXNUM_P(rel)) if (FIXNUM_P(rel))
return LONG2FIX(-FIX2LONG(rel)); return LONG2FIX(-FIX2LONG(rel));
@ -1473,7 +1473,7 @@ rb_float_gt(VALUE x, VALUE y)
double a, b; double a, b;
a = RFLOAT_VALUE(x); a = RFLOAT_VALUE(x);
if (RB_TYPE_P(y, T_FIXNUM) || RB_BIGNUM_TYPE_P(y)) { if (RB_INTEGER_TYPE_P(y)) {
VALUE rel = rb_integer_float_cmp(y, x); VALUE rel = rb_integer_float_cmp(y, x);
if (FIXNUM_P(rel)) if (FIXNUM_P(rel))
return RBOOL(-FIX2LONG(rel) > 0); return RBOOL(-FIX2LONG(rel) > 0);
@ -1547,7 +1547,7 @@ flo_lt(VALUE x, VALUE y)
double a, b; double a, b;
a = RFLOAT_VALUE(x); a = RFLOAT_VALUE(x);
if (RB_TYPE_P(y, T_FIXNUM) || RB_BIGNUM_TYPE_P(y)) { if (RB_INTEGER_TYPE_P(y)) {
VALUE rel = rb_integer_float_cmp(y, x); VALUE rel = rb_integer_float_cmp(y, x);
if (FIXNUM_P(rel)) if (FIXNUM_P(rel))
return RBOOL(-FIX2LONG(rel) < 0); return RBOOL(-FIX2LONG(rel) < 0);
@ -1584,7 +1584,7 @@ flo_le(VALUE x, VALUE y)
double a, b; double a, b;
a = RFLOAT_VALUE(x); a = RFLOAT_VALUE(x);
if (RB_TYPE_P(y, T_FIXNUM) || RB_BIGNUM_TYPE_P(y)) { if (RB_INTEGER_TYPE_P(y)) {
VALUE rel = rb_integer_float_cmp(y, x); VALUE rel = rb_integer_float_cmp(y, x);
if (FIXNUM_P(rel)) if (FIXNUM_P(rel))
return RBOOL(-FIX2LONG(rel) <= 0); return RBOOL(-FIX2LONG(rel) <= 0);
@ -3082,7 +3082,7 @@ rb_num2ull(VALUE val)
if (NIL_P(val)) { if (NIL_P(val)) {
rb_raise(rb_eTypeError, "no implicit conversion from nil"); rb_raise(rb_eTypeError, "no implicit conversion from nil");
} }
else if (RB_TYPE_P(val, T_FIXNUM)) { else if (FIXNUM_P(val)) {
return (LONG_LONG)FIX2LONG(val); /* this is FIX2LONG, intended */ return (LONG_LONG)FIX2LONG(val); /* this is FIX2LONG, intended */
} }
else if (RB_TYPE_P(val, T_FLOAT)) { else if (RB_TYPE_P(val, T_FLOAT)) {