replace FIXNUM_P() by mrb_fixnum_p()

include/mruby/value.h

@@ -149,7 +149,7 @@ mrb_float_value(mrb_float f)
 #define mrb_fixnum(o) (o).value.i
 #define mrb_symbol(o) (o).value.sym
 #define mrb_object(o) ((struct RBasic *) (o).value.p)
-#define FIXNUM_P(o)   (mrb_type(o) == MRB_TT_FIXNUM)
+#define mrb_fixnum_p(o) (mrb_type(o) == MRB_TT_FIXNUM)
 #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)

src/array.c

@@ -719,7 +719,7 @@ mrb_ary_aset(mrb_state *mrb, mrb_value self)
   mrb_get_args(mrb, "*", &argv, &argc);
   switch(argc) {
   case 2:
-    if (FIXNUM_P(argv[0])) {
+    if (mrb_fixnum_p(argv[0])) {
       mrb_ary_set(mrb, self, mrb_fixnum(argv[0]), argv[1]);
     }
     else {

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);

src/object.c

@@ -509,7 +509,7 @@ mrb_to_integer(mrb_state *mrb, mrb_value val, const char *method)
 {
     mrb_value v;
 
-    if (FIXNUM_P(val)) return val;
+    if (mrb_fixnum_p(val)) return val;
     v = convert_type(mrb, val, "Integer", method, TRUE);
     if (!mrb_obj_is_kind_of(mrb, v, mrb->fixnum_class)) {
       const char *cname = mrb_obj_classname(mrb, val);

src/sprintf.c

@@ -800,7 +800,7 @@ retry:
               goto bin_retry;
             }
             val = mrb_flt2big(mrb, mrb_float(val));
-            if (FIXNUM_P(val)) goto bin_retry;
+            if (mrb_fixnum_p(val)) goto bin_retry;
             break;
           case MRB_TT_STRING:
             val = mrb_str_to_inum(mrb, val, 0, TRUE);

test/driver.c

@@ -32,7 +32,7 @@ check_error(mrb_state *mrb)
   mrb_value ko_test = mrb_gv_get(mrb, mrb_intern(mrb, "$ko_test"));
   mrb_value kill_test = mrb_gv_get(mrb, mrb_intern(mrb, "$kill_test"));
 
-  return FIXNUM_P(ko_test) && mrb_fixnum(ko_test) == 0 && FIXNUM_P(kill_test) && mrb_fixnum(kill_test) == 0;
+  return mrb_fixnum_p(ko_test) && mrb_fixnum(ko_test) == 0 && mrb_fixnum_p(kill_test) && mrb_fixnum(kill_test) == 0;
 }
 
 int