From 8baad2d31caaea76b52c04d05c8dad905f94a91a Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 1 Nov 2016 07:51:55 +0000 Subject: [PATCH] bignum.c: use RB_INTEGER_TYPE_P * bignum.c (rb_big_and, rb_big_or, rb_big_xor): use dedicated macro RB_INTEGER_TYPE_P instead of combination of FIXNUM_P and RB_BIGNUM_TYPE_P. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- bignum.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bignum.c b/bignum.c index 600cdad9f7..18919d09c3 100644 --- a/bignum.c +++ b/bignum.c @@ -5385,7 +5385,7 @@ big_op(VALUE x, VALUE y, enum big_op_t op) VALUE rel; int n; - if (FIXNUM_P(y) || RB_BIGNUM_TYPE_P(y)) { + if (RB_INTEGER_TYPE_P(y)) { rel = rb_big_cmp(x, y); } else if (RB_FLOAT_TYPE_P(y)) { @@ -6285,7 +6285,7 @@ rb_big_and(VALUE x, VALUE y) BDIGIT tmph; long tmpn; - if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) { + if (!RB_INTEGER_TYPE_P(y)) { return rb_num_coerce_bit(x, y, '&'); } @@ -6404,7 +6404,7 @@ rb_big_or(VALUE x, VALUE y) BDIGIT tmph; long tmpn; - if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) { + if (!RB_INTEGER_TYPE_P(y)) { return rb_num_coerce_bit(x, y, '|'); } @@ -6498,7 +6498,7 @@ rb_big_xor(VALUE x, VALUE y) BDIGIT tmph; long tmpn; - if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) { + if (!RB_INTEGER_TYPE_P(y)) { return rb_num_coerce_bit(x, y, '^'); } @@ -6665,7 +6665,7 @@ rb_big_hash(VALUE x) static VALUE rb_int_coerce(VALUE x, VALUE y) { - if (FIXNUM_P(y) || RB_BIGNUM_TYPE_P(y)) { + if (RB_INTEGER_TYPE_P(y)) { return rb_assoc_new(y, x); } else {