string.h: rename `mrb_str_to_inum` to `mrb_str_to_integer`.

Consistent naming: `integer` to represent integer packed in `mrb_value`
instead of `inum`.

5 files changed, 12 insertions, 10 deletions

diff --git a/include/mruby/string.h b/include/mruby/string.h
index b214aa7c8..b296832af 100644
--- a/include/mruby/string.h
+++ b/include/mruby/string.h
@@ -355,7 +355,9 @@ MRB_API mrb_value mrb_str_dup(mrb_state *mrb, mrb_value str);
  */
 MRB_API mrb_value mrb_str_intern(mrb_state *mrb, mrb_value self);
 
-MRB_API mrb_value mrb_str_to_inum(mrb_state *mrb, mrb_value str, mrb_int base, mrb_bool badcheck);
+MRB_API mrb_value mrb_str_to_integer(mrb_state *mrb, mrb_value str, mrb_int base, mrb_bool badcheck);
+/* obsolete: use mrb_str_to_integer() */
+#define mrb_str_to_inum(mrb, str, base, badcheck) mrb_str_to_integer(mrb, str, base, badcheck)
 MRB_API double mrb_str_to_dbl(mrb_state *mrb, mrb_value str, mrb_bool badcheck);
 
 /**
diff --git a/mrbgems/mruby-kernel-ext/src/kernel.c b/mrbgems/mruby-kernel-ext/src/kernel.c
index de386c590..83c6eda81 100644
--- a/mrbgems/mruby-kernel-ext/src/kernel.c
+++ b/mrbgems/mruby-kernel-ext/src/kernel.c
@@ -151,7 +151,7 @@ mrb_f_integer(mrb_state *mrb, mrb_value self)
 
     case MRB_TT_STRING:
     string_conv:
-      return mrb_str_to_inum(mrb, val, base, TRUE);
+      return mrb_str_to_integer(mrb, val, base, TRUE);
 
     default:
       break;
diff --git a/mrbgems/mruby-sprintf/src/sprintf.c b/mrbgems/mruby-sprintf/src/sprintf.c
index 93ddf2ad5..095269be3 100644
--- a/mrbgems/mruby-sprintf/src/sprintf.c
+++ b/mrbgems/mruby-sprintf/src/sprintf.c
@@ -860,7 +860,7 @@ retry:
             goto bin_retry;
 #endif
           case MRB_TT_STRING:
-            val = mrb_str_to_inum(mrb, val, 0, TRUE);
+            val = mrb_str_to_integer(mrb, val, 0, TRUE);
             goto bin_retry;
           case MRB_TT_INTEGER:
             v = mrb_integer(val);
diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c
index 8fafcc089..e3dabcc18 100644
--- a/mrbgems/mruby-string-ext/src/string.c
+++ b/mrbgems/mruby-string-ext/src/string.c
@@ -835,13 +835,13 @@ mrb_str_count(mrb_state *mrb, mrb_value str)
 static mrb_value
 mrb_str_hex(mrb_state *mrb, mrb_value self)
 {
-  return mrb_str_to_inum(mrb, self, 16, FALSE);
+  return mrb_str_to_integer(mrb, self, 16, FALSE);
 }
 
 static mrb_value
 mrb_str_oct(mrb_state *mrb, mrb_value self)
 {
-  return mrb_str_to_inum(mrb, self, 8, FALSE);
+  return mrb_str_to_integer(mrb, self, 8, FALSE);
 }
 
 /*
diff --git a/src/string.c b/src/string.c
index 1a8b01c66..41027165a 100644
--- a/src/string.c
+++ b/src/string.c
@@ -2199,7 +2199,7 @@ mrb_str_split_m(mrb_state *mrb, mrb_value str)
 }
 
 static mrb_value
-mrb_str_len_to_inum(mrb_state *mrb, const char *str, size_t len, mrb_int base, int badcheck)
+mrb_str_len_to_integer(mrb_state *mrb, const char *str, size_t len, mrb_int base, int badcheck)
 {
   const char *p = str;
   const char *pend = str + len;
@@ -2394,7 +2394,7 @@ mrb_string_cstr(mrb_state *mrb, mrb_value str)
 }
 
 MRB_API mrb_value
-mrb_str_to_inum(mrb_state *mrb, mrb_value str, mrb_int base, mrb_bool badcheck)
+mrb_str_to_integer(mrb_state *mrb, mrb_value str, mrb_int base, mrb_bool badcheck)
 {
   const char *s;
   mrb_int len;
@@ -2402,7 +2402,7 @@ mrb_str_to_inum(mrb_state *mrb, mrb_value str, mrb_int base, mrb_bool badcheck)
   mrb_ensure_string_type(mrb, str);
   s = RSTRING_PTR(str);
   len = RSTRING_LEN(str);
-  return mrb_str_len_to_inum(mrb, s, len, base, badcheck);
+  return mrb_str_len_to_integer(mrb, s, len, base, badcheck);
 }
 
 /* 15.2.10.5.38 */
@@ -2435,7 +2435,7 @@ mrb_str_to_i(mrb_state *mrb, mrb_value self)
   if (base < 0 || 36 < base) {
     mrb_raisef(mrb, E_ARGUMENT_ERROR, "illegal radix %i", base);
   }
-  return mrb_str_to_inum(mrb, self, base, FALSE);
+  return mrb_str_to_integer(mrb, self, base, FALSE);
 }
 
 #ifndef MRB_NO_FLOAT
@@ -2459,7 +2459,7 @@ mrb_str_len_to_dbl(mrb_state *mrb, const char *s, size_t len, mrb_bool badcheck)
     mrb_value x;
 
     if (!badcheck) return 0.0;
-    x = mrb_str_len_to_inum(mrb, p, pend-p, 0, badcheck);
+    x = mrb_str_len_to_integer(mrb, p, pend-p, 0, badcheck);
     if (mrb_integer_p(x))
       d = (double)mrb_integer(x);
     else /* if (mrb_float_p(x)) */