From 883c45b931a7f1ed44fa3c629520f5481fe4fad3 Mon Sep 17 00:00:00 2001 From: Jun Hiroe Date: Fri, 12 Jul 2013 01:00:50 +0900 Subject: Replace mrb_intern() func with mrb_intern2() func or mrb_intern_cstr() func. --- src/backtrace.c | 4 ++-- src/object.c | 2 +- src/proc.c | 6 +++--- src/symbol.c | 4 ++-- src/variable.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/backtrace.c b/src/backtrace.c index d5d0818ae..e05ad4326 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -18,7 +18,7 @@ mrb_print_backtrace(mrb_state *mrb) int i, line; fputs("trace:\n", stderr); - ciidx = mrb_fixnum(mrb_obj_iv_get(mrb, mrb->exc, mrb_intern(mrb, "ciidx"))); + ciidx = mrb_fixnum(mrb_obj_iv_get(mrb, mrb->exc, mrb_intern2(mrb, "ciidx", 5))); if (ciidx >= mrb->c->ciend - mrb->c->cibase) ciidx = 10; /* ciidx is broken... */ @@ -41,7 +41,7 @@ mrb_print_backtrace(mrb_state *mrb) pc = mrb->c->cibase[i+1].pc; } else { - pc = (mrb_code*)mrb_voidp(mrb_obj_iv_get(mrb, mrb->exc, mrb_intern(mrb, "lastpc"))); + pc = (mrb_code*)mrb_voidp(mrb_obj_iv_get(mrb, mrb->exc, mrb_intern2(mrb, "lastpc", 6))); } if (irep->iseq <= pc && pc < irep->iseq + irep->ilen) { line = irep->lines[pc - irep->iseq - 1]; diff --git a/src/object.c b/src/object.c index c09ae3072..4003452cc 100644 --- a/src/object.c +++ b/src/object.c @@ -297,7 +297,7 @@ convert_type(mrb_state *mrb, mrb_value val, const char *tname, const char *metho { mrb_sym m = 0; - m = mrb_intern(mrb, method); + m = mrb_intern_cstr(mrb, method); if (!mrb_respond_to(mrb, val, m)) { if (raise) { mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %S into %S", val, mrb_str_new_cstr(mrb, tname)); diff --git a/src/proc.c b/src/proc.c index e21a37736..c8d09e62d 100644 --- a/src/proc.c +++ b/src/proc.c @@ -139,7 +139,7 @@ mrb_proc_arity(mrb_state *mrb, mrb_value self) mrb_code *iseq = mrb_proc_iseq(mrb, p); mrb_aspec aspec = GETARG_Ax(*iseq); int ma, ra, pa, arity; - + ma = MRB_ASPEC_REQ(aspec); ra = MRB_ASPEC_REST(aspec); pa = MRB_ASPEC_POST(aspec); @@ -201,8 +201,8 @@ mrb_init_proc(mrb_state *mrb) mrb_define_method(mrb, mrb->proc_class, "arity", mrb_proc_arity, MRB_ARGS_NONE()); m = mrb_proc_new(mrb, call_irep); - mrb_define_method_raw(mrb, mrb->proc_class, mrb_intern(mrb, "call"), m); - mrb_define_method_raw(mrb, mrb->proc_class, mrb_intern(mrb, "[]"), m); + mrb_define_method_raw(mrb, mrb->proc_class, mrb_intern2(mrb, "call", 4), m); + mrb_define_method_raw(mrb, mrb->proc_class, mrb_intern2(mrb, "[]", 2), m); mrb_define_class_method(mrb, mrb->kernel_module, "lambda", proc_lambda, MRB_ARGS_NONE()); /* 15.3.1.2.6 */ mrb_define_method(mrb, mrb->kernel_module, "lambda", proc_lambda, MRB_ARGS_NONE()); /* 15.3.1.3.27 */ diff --git a/src/symbol.c b/src/symbol.c index e913f95c8..c29f7c6ae 100644 --- a/src/symbol.c +++ b/src/symbol.c @@ -382,7 +382,7 @@ mrb_sym2str(mrb_state *mrb, mrb_sym sym) size_t len; const char *name = mrb_sym2name_len(mrb, sym, &len); mrb_value str; - + if (!name) return mrb_undef_value(); /* can't happen */ str = mrb_str_new_static(mrb, name, len); if (symname_p(name) && strlen(name) == len) { @@ -452,5 +452,5 @@ mrb_init_symbol(mrb_state *mrb) mrb_define_method(mrb, sym, "to_sym", sym_to_sym, MRB_ARGS_NONE()); /* 15.2.11.3.4 */ mrb_define_method(mrb, sym, "inspect", sym_inspect, MRB_ARGS_NONE()); /* 15.2.11.3.5(x) */ mrb_define_method(mrb, sym, "<=>", sym_cmp, MRB_ARGS_REQ(1)); - mrb->init_sym = mrb_intern(mrb, "initialize"); + mrb->init_sym = mrb_intern2(mrb, "initialize", 10); } diff --git a/src/variable.c b/src/variable.c index 2610c5d7a..36ad24d09 100644 --- a/src/variable.c +++ b/src/variable.c @@ -916,7 +916,7 @@ mrb_const_remove(mrb_state *mrb, mrb_value mod, mrb_sym sym) void mrb_define_const(mrb_state *mrb, struct RClass *mod, const char *name, mrb_value v) { - mrb_obj_iv_set(mrb, (struct RObject*)mod, mrb_intern(mrb, name), v); + mrb_obj_iv_set(mrb, (struct RObject*)mod, mrb_intern_cstr(mrb, name), v); } void -- cgit v1.2.3 From b8f4e47676785c04c45c2b2fe01bddfc5e98f46d Mon Sep 17 00:00:00 2001 From: Jun Hiroe Date: Fri, 12 Jul 2013 01:27:42 +0900 Subject: 2.Replace mrb_intern() func with mrb_intern2() func or mrb_intern_cstr() func. --- src/kernel.c | 2 +- src/vm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kernel.c b/src/kernel.c index 0fe374e73..965b80b95 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -1101,5 +1101,5 @@ mrb_init_kernel(mrb_state *mrb) mrb_define_method(mrb, krn, "to_s", mrb_any_to_s, MRB_ARGS_NONE()); /* 15.3.1.3.46 */ mrb_include_module(mrb, mrb->object_class, mrb->kernel_module); - mrb_alias_method(mrb, mrb->module_class, mrb_intern(mrb, "dup"), mrb_intern(mrb, "clone")); + mrb_alias_method(mrb, mrb->module_class, mrb_intern2(mrb, "dup", 3), mrb_intern2(mrb, "clone", 5)); } diff --git a/src/vm.c b/src/vm.c index 38e3cd6ed..d4e7fd483 100644 --- a/src/vm.c +++ b/src/vm.c @@ -279,7 +279,7 @@ ecall(mrb_state *mrb, int i) mrb_value mrb_funcall(mrb_state *mrb, mrb_value self, const char *name, int argc, ...) { - mrb_sym mid = mrb_intern(mrb, name); + mrb_sym mid = mrb_intern_cstr(mrb, name); if (argc == 0) { return mrb_funcall_argv(mrb, self, mid, 0, 0); -- cgit v1.2.3