Merge new change

1 files changed, 5 insertions, 6 deletions

diff --git a/src/re.c b/src/re.c
index ff637aecb..091c35f61 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:
@@ -344,8 +344,8 @@ mrb_reg_options(mrb_state *mrb, mrb_value re)
 
     mrb_reg_check(mrb, re);
     options = RREGEXP(re)->ptr->options & ARG_REG_OPTION_MASK;
-    if (RBASIC(re)->flags & KCODE_FIXED) options |= ARG_ENCODING_FIXED;
-    if (RBASIC(re)->flags & REG_ENCODING_NONE) options |= ARG_ENCODING_NONE;
+    if (mrb_basic(re)->flags & KCODE_FIXED) options |= ARG_ENCODING_FIXED;
+    if (mrb_basic(re)->flags & REG_ENCODING_NONE) options |= ARG_ENCODING_NONE;
     return options;
 }
 
@@ -361,7 +361,7 @@ mrb_reg_desc(mrb_state *mrb, const char *s, long len, mrb_value re)
     mrb_reg_check(mrb, re);
     if (*option_to_str(opts, RREGEXP(re)->ptr->options))
         mrb_str_buf_cat(mrb, str, opts, strlen(opts));//mrb_str_buf_cat2(str, opts);
-    if (RBASIC(re)->flags & REG_ENCODING_NONE)
+    if (mrb_basic(re)->flags & REG_ENCODING_NONE)
         mrb_str_buf_cat(mrb, str, "n", 1);
   }
 
@@ -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: