From 3ba521ae9e238c91198404845e4f213ce541b13d Mon Sep 17 00:00:00 2001 From: Yukihiro Matz Matsumoto Date: Sun, 4 Nov 2012 04:49:43 +0900 Subject: replace FIXNUM_P() by mrb_fixnum_p() --- src/numeric.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/numeric.c') diff --git a/src/numeric.c b/src/numeric.c index c1491ac51..e4d9c9ff9 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -97,7 +97,7 @@ num_pow(mrb_state *mrb, mrb_value x) mrb_float d; mrb_get_args(mrb, "o", &y); - if (FIXNUM_P(x) && FIXNUM_P(y)) both_int = TRUE; + if (mrb_fixnum_p(x) && mrb_fixnum_p(y)) both_int = TRUE; d = pow(mrb_to_flo(mrb, x), mrb_to_flo(mrb, y)); if (both_int && FIXABLE(d)) return mrb_fixnum_value((mrb_int)d); @@ -682,7 +682,7 @@ fix_succ(mrb_state *mrb, mrb_value num) static mrb_value int_succ(mrb_state *mrb, mrb_value num) { - if (FIXNUM_P(num)) return fix_succ(mrb, num); + if (mrb_fixnum_p(num)) return fix_succ(mrb, num); return mrb_funcall(mrb, num, "+", 1, mrb_fixnum_value(1)); } @@ -697,7 +697,7 @@ mrb_fixnum_mul(mrb_state *mrb, mrb_value x, mrb_value y) a = mrb_fixnum(x); if (a == 0) return x; - if (FIXNUM_P(y)) { + if (mrb_fixnum_p(y)) { mrb_int b, c; b = mrb_fixnum(y); @@ -774,7 +774,7 @@ fix_mod(mrb_state *mrb, mrb_value x) mrb_get_args(mrb, "o", &y); a = mrb_fixnum(x); - if (FIXNUM_P(y) && (b=mrb_fixnum(y)) != 0) { + if (mrb_fixnum_p(y) && (b=mrb_fixnum(y)) != 0) { mrb_int mod; if (mrb_fixnum(y) == 0) { @@ -803,7 +803,7 @@ fix_divmod(mrb_state *mrb, mrb_value x) mrb_value y; mrb_get_args(mrb, "o", &y); - if (FIXNUM_P(y)) { + if (mrb_fixnum_p(y)) { mrb_int div, mod; if (mrb_fixnum(y) == 0) { @@ -877,7 +877,7 @@ fix_rev(mrb_state *mrb, mrb_value num) static mrb_value bit_coerce(mrb_state *mrb, mrb_value x) { - while (!FIXNUM_P(x)) { + while (!mrb_fixnum_p(x)) { if (mrb_type(x) == MRB_TT_FLOAT) { mrb_raise(mrb, E_TYPE_ERROR, "can't convert Float into Integer"); } @@ -1076,7 +1076,7 @@ mrb_fixnum_plus(mrb_state *mrb, mrb_value x, mrb_value y) a = mrb_fixnum(x); if (a == 0) return y; - if (FIXNUM_P(y)) { + if (mrb_fixnum_p(y)) { mrb_int b, c; b = mrb_fixnum(y); @@ -1114,7 +1114,7 @@ mrb_fixnum_minus(mrb_state *mrb, mrb_value x, mrb_value y) mrb_int a; a = mrb_fixnum(x); - if (FIXNUM_P(y)) { + if (mrb_fixnum_p(y)) { mrb_int b, c; b = mrb_fixnum(y); -- cgit v1.2.3 From da88627a37cb1d5ca8d31bb14f3b3d8bb4d7e33e Mon Sep 17 00:00:00 2001 From: Yukihiro Matz Matsumoto Date: Sun, 4 Nov 2012 04:51:13 +0900 Subject: add mrb_float_p() --- include/mruby/value.h | 1 + src/numeric.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/numeric.c') diff --git a/include/mruby/value.h b/include/mruby/value.h index 819ce6b7b..1e0316a90 100644 --- a/include/mruby/value.h +++ b/include/mruby/value.h @@ -150,6 +150,7 @@ mrb_float_value(mrb_float f) #define mrb_symbol(o) (o).value.sym #define mrb_object(o) ((struct RBasic *) (o).value.p) #define mrb_fixnum_p(o) (mrb_type(o) == MRB_TT_FIXNUM) +#define mrb_float_p(o) (mrb_type(o) == MRB_TT_FLOAT) #define mrb_undef_p(o) (mrb_type(o) == MRB_TT_UNDEF) #define mrb_nil_p(o) (mrb_type(o) == MRB_TT_FALSE && !(o).value.i) #define mrb_test(o) (mrb_type(o) != MRB_TT_FALSE) diff --git a/src/numeric.c b/src/numeric.c index e4d9c9ff9..562562340 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -878,7 +878,7 @@ static mrb_value bit_coerce(mrb_state *mrb, mrb_value x) { while (!mrb_fixnum_p(x)) { - if (mrb_type(x) == MRB_TT_FLOAT) { + if (mrb_float_p(x)) { mrb_raise(mrb, E_TYPE_ERROR, "can't convert Float into Integer"); } x = mrb_to_int(mrb, x); -- cgit v1.2.3