Global renaming regarding `integer` and `float`.

Consistent number conversion function names:
* `mrb_value` to immediate (C) value
  * `mrb_int()` -> `mrb_as_int()`
  * `mrb_to_flo()` -> `mrb_as_float()`
* `mrb_value` to `mrb_value` (converted)
  * `mrb_to_int()'
  * `mrb_Integer()` - removed
  * `mrb_Float()` -> `mrb_to_float`

Consistent function name (avoid `_flo` suffix):
* `mrb_div_flo()` -> `mrb_div_float`

1 files changed, 19 insertions, 23 deletions

diff --git a/mrbgems/mruby-rational/src/rational.c b/mrbgems/mruby-rational/src/rational.c
index 0e3581f9a..15189dd88 100644
--- a/mrbgems/mruby-rational/src/rational.c
+++ b/mrbgems/mruby-rational/src/rational.c
@@ -255,20 +255,20 @@ rational_s_new(mrb_state *mrb, mrb_value self)
     }
     else {
       mrb_float numf = (mrb_float)numerator;
-      mrb_float denomf = mrb_to_flo(mrb, denomv);
+      mrb_float denomf = mrb_as_float(mrb, denomv);
 
       return rational_new_f(mrb, numf/denomf);
     }
   }
   else {
-    mrb_float numf = mrb_to_flo(mrb, numv);
+    mrb_float numf = mrb_as_float(mrb, numv);
     mrb_float denomf;
 
     if (mrb_integer_p(denomv)) {
       denomf = (mrb_float)mrb_integer(denomv);
     }
     else {
-      denomf = mrb_to_flo(mrb, denomv);
+      denomf = mrb_as_float(mrb, denomv);
     }
     return rational_new_f(mrb, numf/denomf);
   }
@@ -278,7 +278,7 @@ rational_s_new(mrb_state *mrb, mrb_value self)
 
 #ifndef MRB_NO_FLOAT
 static mrb_float
-rat_to_flo(struct mrb_rational *p)
+rat_float(struct mrb_rational *p)
 {
   mrb_float f;
 
@@ -296,7 +296,7 @@ static mrb_value
 rational_to_f(mrb_state *mrb, mrb_value self)
 {
   struct mrb_rational *p = rational_ptr(mrb, self);
-  return mrb_float_value(mrb, rat_to_flo(p));
+  return mrb_float_value(mrb, rat_float(p));
 }
 #endif
 
@@ -346,8 +346,8 @@ rational_m(mrb_state *mrb, mrb_value self)
     return rational_new_i(mrb, mrb_integer(a), mrb_integer(b));
   }
   else {
-    mrb_float x = mrb_to_flo(mrb, a);
-    mrb_float y = mrb_to_flo(mrb, b);
+    mrb_float x = mrb_as_float(mrb, a);
+    mrb_float y = mrb_as_float(mrb, b);
     return rational_new_f(mrb, x/y);
   }
 #endif
@@ -436,7 +436,7 @@ rational_cmp(mrb_state *mrb, mrb_value x)
 #ifndef MRB_NO_FLOAT
   case MRB_TT_FLOAT:
     {
-      mrb_float a = rat_to_flo(p1), b = mrb_to_flo(mrb, y);
+      mrb_float a = rat_float(p1), b = mrb_as_float(mrb, y);
       if (a > b)
         return mrb_fixnum_value(1);
       else if (a < b)
@@ -458,7 +458,7 @@ rational_cmp(mrb_state *mrb, mrb_value x)
 #endif
 #ifdef MRB_USE_COMPLEX
   case MRB_TT_COMPLEX:
-    x = mrb_complex_new(mrb, rat_to_flo(p1), 0);
+    x = mrb_complex_new(mrb, rat_float(p1), 0);
     return mrb_funcall_id(mrb, x, MRB_OPSYM(cmp), 1, y);
 #endif
   default:
@@ -480,10 +480,6 @@ rational_minus(mrb_state *mrb, mrb_value x)
   return rational_new(mrb, -n, p->denominator);
 }
 
-#ifndef MRB_NO_FLOAT
-mrb_float mrb_div_flo(mrb_float, mrb_float);
-#endif
-
 static mrb_value
 rational_add(mrb_state *mrb, mrb_value x)
 {
@@ -514,7 +510,7 @@ rational_add(mrb_state *mrb, mrb_value x)
   case MRB_TT_FLOAT:
     {
       mrb_float z = p1->numerator + mrb_float(y) * p1->denominator;
-      return mrb_float_value(mrb, mrb_div_flo(z, (mrb_float)p1->denominator));
+      return mrb_float_value(mrb, mrb_div_float(z, (mrb_float)p1->denominator));
     }
 #endif
 
@@ -551,7 +547,7 @@ rational_sub(mrb_state *mrb, mrb_value x)
 
 #if defined(MRB_USE_COMPLEX)
   case MRB_TT_COMPLEX:
-    x = mrb_complex_new(mrb, rat_to_flo(p1), 0);
+    x = mrb_complex_new(mrb, rat_float(p1), 0);
     return mrb_funcall_id(mrb, x, MRB_OPSYM(sub), 1, y);
 #endif
 
@@ -559,8 +555,8 @@ rational_sub(mrb_state *mrb, mrb_value x)
   case MRB_TT_FLOAT:
   default:
     {
-      mrb_float z = p1->numerator - mrb_to_flo(mrb, y) * p1->denominator;
-      return mrb_float_value(mrb, mrb_div_flo(z, (mrb_float)p1->denominator));
+      mrb_float z = p1->numerator - mrb_as_float(mrb, y) * p1->denominator;
+      return mrb_float_value(mrb, mrb_div_float(z, (mrb_float)p1->denominator));
     }
 #else
   default:
@@ -596,7 +592,7 @@ rational_mul(mrb_state *mrb, mrb_value x)
   case MRB_TT_FLOAT:
     {
       mrb_float z = p1->numerator * mrb_float(y);
-      return mrb_float_value(mrb, mrb_div_flo(z, (mrb_float)p1->denominator));
+      return mrb_float_value(mrb, mrb_div_float(z, (mrb_float)p1->denominator));
   }
 #endif
 
@@ -630,7 +626,7 @@ mrb_rational_div(mrb_state *mrb, mrb_value x)
 
 #if defined(MRB_USE_COMPLEX)
   case MRB_TT_COMPLEX:
-    x = mrb_complex_new(mrb, rat_to_flo(p1), 0);
+    x = mrb_complex_new(mrb, rat_float(p1), 0);
     return mrb_funcall_id(mrb, x, MRB_OPSYM(div), 1, y);
 #endif
 
@@ -638,8 +634,8 @@ mrb_rational_div(mrb_state *mrb, mrb_value x)
 #ifndef MRB_NO_FLOAT
   case MRB_TT_FLOAT:
     {
-      mrb_float z = mrb_div_flo((mrb_float)p1->numerator, mrb_to_flo(mrb, y));
-      return mrb_float_value(mrb, mrb_div_flo(z, (mrb_float)p1->denominator));
+      mrb_float z = mrb_div_float((mrb_float)p1->numerator, mrb_as_float(mrb, y));
+      return mrb_float_value(mrb, mrb_div_float(z, (mrb_float)p1->denominator));
     }
 #else
     mrb_raise(mrb, E_TYPE_ERROR, "non integer division");
@@ -673,7 +669,7 @@ rational_int_div(mrb_state *mrb, mrb_value x)
   case MRB_TT_FLOAT:
     mrb_raise(mrb, E_TYPE_ERROR, "non integer multiplication");
 #else
-    return mrb_float_value(mrb, mrb_div_flo((mrb_float)a, mrb_to_flo(mrb, y)));
+    return mrb_float_value(mrb, mrb_div_float((mrb_float)a, mrb_as_float(mrb, y)));
 #endif
   }
 }
@@ -700,7 +696,7 @@ rational_int_quo(mrb_state *mrb, mrb_value x)
 #ifdef MRB_NO_FLOAT
     mrb_raise(mrb, E_TYPE_ERROR, "non integer multiplication");
 #else
-    return mrb_float_value(mrb, mrb_div_flo((mrb_float)a, mrb_to_flo(mrb, y)));
+    return mrb_float_value(mrb, mrb_div_float((mrb_float)a, mrb_as_float(mrb, y)));
 #endif
   }
 }