admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove a meaningless branch condition in mruby-struct

Browse Source 
The following branch condition is always true:

  // mrbgems/mruby-struct/src/struct.c:187 in make_struct_define_accessors()
  if (is_local_id(mrb, name) || is_const_id(mrb, name)) {
This commit is contained in:
KOBAYASHI Shuji
2019-06-14 10:26:19 +09:00
parent 27109d1ae0
commit 6084048b28
1 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-struct/src/struct.c
+9 -27
View File
@@ -158,20 +158,6 @@ mrb_struct_set_m(mrb_state *mrb, mrb_value obj)
return val;
}
static mrb_bool
is_local_id(mrb_state *mrb, const char *name)
{
if (!name) return FALSE;
return !ISUPPER(name[0]);
}
static mrb_bool
is_const_id(mrb_state *mrb, const char *name)
{
if (!name) return FALSE;
return ISUPPER(name[0]);
}
static void
make_struct_define_accessors(mrb_state *mrb, mrb_value members, struct RClass *c)
{
@@ -182,19 +168,15 @@ make_struct_define_accessors(mrb_state *mrb, mrb_value members, struct RClass *c
for (i=0; i<len; i++) {
mrb_sym id = mrb_symbol(ptr_members[i]);
const char *name = mrb_sym2name_len(mrb, id, NULL);
if (is_local_id(mrb, name) || is_const_id(mrb, name)) {
mrb_method_t m;
mrb_value at = mrb_fixnum_value(i);
struct RProc *aref = mrb_proc_new_cfunc_with_env(mrb, mrb_struct_ref, 1, &at);
struct RProc *aset = mrb_proc_new_cfunc_with_env(mrb, mrb_struct_set_m, 1, &at);
MRB_METHOD_FROM_PROC(m, aref);
mrb_define_method_raw(mrb, c, id, m);
MRB_METHOD_FROM_PROC(m, aset);
mrb_define_method_raw(mrb, c, mrb_id_attrset(mrb, id), m);
mrb_gc_arena_restore(mrb, ai);
}
mrb_method_t m;
mrb_value at = mrb_fixnum_value(i);
struct RProc *aref = mrb_proc_new_cfunc_with_env(mrb, mrb_struct_ref, 1, &at);
struct RProc *aset = mrb_proc_new_cfunc_with_env(mrb, mrb_struct_set_m, 1, &at);
MRB_METHOD_FROM_PROC(m, aref);
mrb_define_method_raw(mrb, c, id, m);
MRB_METHOD_FROM_PROC(m, aset);
mrb_define_method_raw(mrb, c, mrb_id_attrset(mrb, id), m);
mrb_gc_arena_restore(mrb, ai);
}
}