replace SYM2ID() by mrb_symbol()

6 files changed, 12 insertions, 15 deletions

diff --git a/include/mruby.h b/include/mruby.h
index a35d92804..f33c9cfc0 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -302,8 +302,6 @@ void mrb_bug(const char *fmt, ...);
 
 #define E_KEY_ERROR                 (mrb_class_obj_get(mrb, "KeyError"))
 
-#define SYM2ID(x) ((x).value.sym)
-
 #define NUM2CHR_internal(x) (((mrb_type(x) == MRB_TT_STRING)&&(RSTRING_LEN(x)>=1))?\
                      RSTRING_PTR(x)[0]:(char)(mrb_fixnum_number(x)&0xff))
 #ifdef __GNUC__
diff --git a/src/etc.c b/src/etc.c
index c38f2a0bc..3d861320d 100644
--- a/src/etc.c
+++ b/src/etc.c
@@ -103,7 +103,7 @@ mrb_to_id(mrb_state *mrb, mrb_value name)
       name = mrb_str_intern(mrb, name);
       /* fall through */
     case MRB_TT_SYMBOL:
-      return SYM2ID(name);
+      return mrb_symbol(name);
   }
   return id;
 }
@@ -156,7 +156,7 @@ mrb_obj_id(mrb_value obj)
   case  MRB_TT_TRUE:
     return MakeID(1);
   case  MRB_TT_SYMBOL:
-    return MakeID(SYM2ID(obj));
+    return MakeID(mrb_symbol(obj));
   case  MRB_TT_FIXNUM:
     return MakeID2(float_id((mrb_float)mrb_fixnum(obj)), MRB_TT_FLOAT);
   case  MRB_TT_FLOAT:
diff --git a/src/re.c b/src/re.c
index ff637aecb..e2363d07a 100644
--- a/src/re.c
+++ b/src/re.c
@@ -260,7 +260,7 @@ match_backref_number(mrb_state *mrb, mrb_value match, mrb_value backref)
       return mrb_fixnum(backref);
 
     case MRB_TT_SYMBOL:
-      name = mrb_sym2name(mrb, SYM2ID(backref));
+      name = mrb_sym2name(mrb, mrb_symbol(backref));
       break;
 
     case MRB_TT_STRING:
@@ -1192,8 +1192,7 @@ mrb_match_aref(mrb_state *mrb, /*int argc, mrb_value *argv,*/ mrb_value match)
 
       switch (mrb_type(idx)) {
         case MRB_TT_SYMBOL:
-          //p = mrb_id2name(SYM2ID(idx));
-          p = mrb_sym2name(mrb, SYM2ID(idx));
+          p = mrb_sym2name(mrb, mrb_symbol(idx));
           goto name_to_backref;
           break;
         case MRB_TT_STRING:
diff --git a/src/struct.c b/src/struct.c
index 2ae904fa5..85d0fa094 100644
--- a/src/struct.c
+++ b/src/struct.c
@@ -220,7 +220,7 @@ mrb_struct_set(mrb_state *mrb, mrb_value obj, mrb_value val)
   ptr = RSTRUCT_PTR(obj);
   for (i=0; i<len; i++) {
     slot = ptr_members[i];
-    if (SYM2ID(slot) == mid) {
+    if (mrb_symbol(slot) == mid) {
       return ptr[i] = val;
     }
   }
@@ -290,7 +290,7 @@ make_struct(mrb_state *mrb, mrb_value name, mrb_value members, struct RClass * k
     ptr_members = RARRAY_PTR(members);
     len = RARRAY_LEN(members);
     for (i=0; i< len; i++) {
-      mrb_sym id = SYM2ID(ptr_members[i]);
+      mrb_sym id = mrb_symbol(ptr_members[i]);
       if (mrb_is_local_id(id) || mrb_is_const_id(id)) {
           if (i < N_REF_FUNC) {
             mrb_define_method_id(mrb, c, id, ref_func[i], ARGS_NONE());
@@ -492,7 +492,7 @@ inspect_struct(mrb_state *mrb, mrb_value s, mrb_value dummy, int recur)
           mrb_str_cat2(mrb, str, " ");
       }
       slot = ptr_members[i];
-      id = SYM2ID(slot);
+      id = mrb_symbol(slot);
       if (mrb_is_local_id(id) || mrb_is_const_id(id)) {
 	const char *name;
 	int len;
@@ -556,7 +556,7 @@ mrb_struct_aref_id(mrb_state *mrb, mrb_value s, mrb_sym id)
     ptr_members = RARRAY_PTR(members);
     len = RARRAY_LEN(members);
     for (i=0; i<len; i++) {
-      if (SYM2ID(ptr_members[i]) == id) {
+      if (mrb_symbol(ptr_members[i]) == id) {
           return ptr[i];
       }
     }
@@ -628,7 +628,7 @@ mrb_struct_aset_id(mrb_state *mrb, mrb_value s, mrb_sym id, mrb_value val)
     ptr = RSTRUCT_PTR(s);
     ptr_members = RARRAY_PTR(members);
     for (i=0; i<len; i++) {
-      if (SYM2ID(ptr_members[i]) == id) {
+      if (mrb_symbol(ptr_members[i]) == id) {
           ptr[i] = val;
           return val;
       }
diff --git a/src/symbol.c b/src/symbol.c
index 353245bb1..81c28d265 100644
--- a/src/symbol.c
+++ b/src/symbol.c
@@ -177,7 +177,7 @@ sym_equal(mrb_state *mrb, mrb_value sym1)
 mrb_value
 mrb_sym_to_s(mrb_state *mrb, mrb_value sym)
 {
-  mrb_sym id = SYM2ID(sym);
+  mrb_sym id = mrb_symbol(sym);
   const char *p;
   int len;
 
@@ -331,7 +331,7 @@ sym_inspect(mrb_state *mrb, mrb_value sym)
   mrb_value str;
   const char *name;
   int len;
-  mrb_sym id = SYM2ID(sym);
+  mrb_sym id = mrb_symbol(sym);
 
   name = mrb_sym2name_len(mrb, id, &len);
   str = mrb_str_new(mrb, 0, len+1);
diff --git a/src/variable.c b/src/variable.c
index eebe81575..2978637b4 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -927,5 +927,5 @@ mrb_class_sym(mrb_state *mrb, struct RClass *c, struct RClass *outer)
       return arg.sym;
     }
   }
-  return SYM2ID(name);
+  return mrb_symbol(name);
 }