Rename ambiguous function names.

`mrb_iv_p` -> `mrb_iv_name_sym_p`
`mrb_iv_check` -> `mrb_iv_name_sym_check`

4 files changed, 11 insertions, 11 deletions

diff --git a/include/mruby/variable.h b/include/mruby/variable.h
index a4394fbd3..a0fbca1f9 100644
--- a/include/mruby/variable.h
+++ b/include/mruby/variable.h
@@ -40,8 +40,8 @@ MRB_API void mrb_const_set(mrb_state*, mrb_value, mrb_sym, mrb_value);
 MRB_API mrb_bool mrb_const_defined(mrb_state*, mrb_value, mrb_sym);
 MRB_API void mrb_const_remove(mrb_state*, mrb_value, mrb_sym);
 
-MRB_API mrb_bool mrb_iv_p(mrb_state *mrb, mrb_sym sym);
-MRB_API void mrb_iv_check(mrb_state *mrb, mrb_sym sym);
+MRB_API mrb_bool mrb_iv_name_sym_p(mrb_state *mrb, mrb_sym sym);
+MRB_API void mrb_iv_name_sym_check(mrb_state *mrb, mrb_sym sym);
 MRB_API mrb_value mrb_obj_iv_get(mrb_state *mrb, struct RObject *obj, mrb_sym sym);
 MRB_API void mrb_obj_iv_set(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v);
 MRB_API mrb_bool mrb_obj_iv_defined(mrb_state *mrb, struct RObject *obj, mrb_sym sym);
diff --git a/src/class.c b/src/class.c
index 97b5df926..d3a1e2fb2 100644
--- a/src/class.c
+++ b/src/class.c
@@ -1480,7 +1480,7 @@ mrb_mod_attr_reader(mrb_state *mrb, mrb_value mod)
     mrb_str_cat_lit(mrb, str, "@");
     mrb_str_cat_str(mrb, str, name);
     sym = mrb_intern_str(mrb, str);
-    mrb_iv_check(mrb, sym);
+    mrb_iv_name_sym_check(mrb, sym);
     name = mrb_symbol_value(sym);
     p = mrb_proc_new_cfunc_with_env(mrb, attr_reader, 1, &name);
     MRB_METHOD_FROM_PROC(m, p);
@@ -1525,7 +1525,7 @@ mrb_mod_attr_writer(mrb_state *mrb, mrb_value mod)
     mrb_str_cat_lit(mrb, str, "@");
     mrb_str_cat_str(mrb, str, name);
     sym = mrb_intern_str(mrb, str);
-    mrb_iv_check(mrb, sym);
+    mrb_iv_name_sym_check(mrb, sym);
     attr = mrb_symbol_value(sym);
 
     /* prepare method name (name=) */
diff --git a/src/kernel.c b/src/kernel.c
index 7459c83af..50ad50f00 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -575,7 +575,7 @@ mrb_obj_ivar_defined(mrb_state *mrb, mrb_value self)
   mrb_sym sym;
 
   mrb_get_args(mrb, "n", &sym);
-  mrb_iv_check(mrb, sym);
+  mrb_iv_name_sym_check(mrb, sym);
   return mrb_bool_value(mrb_iv_defined(mrb, self, sym));
 }
 
@@ -605,7 +605,7 @@ mrb_obj_ivar_get(mrb_state *mrb, mrb_value self)
   mrb_sym iv_name;
 
   mrb_get_args(mrb, "n", &iv_name);
-  mrb_iv_check(mrb, iv_name);
+  mrb_iv_name_sym_check(mrb, iv_name);
   return mrb_iv_get(mrb, self, iv_name);
 }
 
@@ -636,7 +636,7 @@ mrb_obj_ivar_set(mrb_state *mrb, mrb_value self)
   mrb_value val;
 
   mrb_get_args(mrb, "no", &iv_name, &val);
-  mrb_iv_check(mrb, iv_name);
+  mrb_iv_name_sym_check(mrb, iv_name);
   mrb_iv_set(mrb, self, iv_name, val);
   return val;
 }
@@ -951,7 +951,7 @@ mrb_obj_remove_instance_variable(mrb_state *mrb, mrb_value self)
   mrb_value val;
 
   mrb_get_args(mrb, "n", &sym);
-  mrb_iv_check(mrb, sym);
+  mrb_iv_name_sym_check(mrb, sym);
   val = mrb_iv_remove(mrb, self, sym);
   if (mrb_undef_p(val)) {
     mrb_name_error(mrb, sym, "instance variable %S not defined", mrb_sym2str(mrb, sym));
diff --git a/src/variable.c b/src/variable.c
index 6612c186f..e753f8d29 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -393,7 +393,7 @@ mrb_iv_defined(mrb_state *mrb, mrb_value obj, mrb_sym sym)
 #define identchar(c) (ISALNUM(c) || (c) == '_' || !ISASCII(c))
 
 MRB_API mrb_bool
-mrb_iv_p(mrb_state *mrb, mrb_sym iv_name)
+mrb_iv_name_sym_p(mrb_state *mrb, mrb_sym iv_name)
 {
   const char *s;
   mrb_int i, len;
@@ -409,9 +409,9 @@ mrb_iv_p(mrb_state *mrb, mrb_sym iv_name)
 }
 
 MRB_API void
-mrb_iv_check(mrb_state *mrb, mrb_sym iv_name)
+mrb_iv_name_sym_check(mrb_state *mrb, mrb_sym iv_name)
 {
-  if (!mrb_iv_p(mrb, iv_name)) {
+  if (!mrb_iv_name_sym_p(mrb, iv_name)) {
     mrb_name_error(mrb, iv_name, "'%S' is not allowed as an instance variable name", mrb_sym2str(mrb, iv_name));
   }
 }