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

mruby-struct (struct_index): unify indexing access code

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2022-12-08 08:01:53 +09:00
parent de0ed25fbf
commit a7e304a51c
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-struct/src/struct.c
+14 -17
View File
@@ -376,18 +376,24 @@ struct_aref_sym(mrb_state *mrb, mrb_value obj, mrb_sym id)
return mrb_nil_value(); /* not reached */
}
static mrb_value
struct_aref_int(mrb_state *mrb, mrb_value s, mrb_int i)
static mrb_int
struct_index(mrb_state *mrb, mrb_int i, mrb_int len)
{
mrb_int idx = i < 0 ? RSTRUCT_LEN(s) + i : i;
mrb_int idx = i < 0 ? len + i : i;
if (idx < 0)
mrb_raisef(mrb, E_INDEX_ERROR,
"offset %i too small for struct(size:%i)", i, RSTRUCT_LEN(s));
if (RSTRUCT_LEN(s) <= idx)
"offset %i too small for struct(size:%i)", i, len);
if (len <= idx)
mrb_raisef(mrb, E_INDEX_ERROR,
"offset %i too large for struct(size:%i)", i, RSTRUCT_LEN(s));
return RSTRUCT_PTR(s)[idx];
"offset %i too large for struct(size:%i)", i, len);
return idx;
}
static mrb_value
struct_aref_int(mrb_state *mrb, mrb_value s, mrb_int i)
{
return RSTRUCT_PTR(s)[struct_index(mrb, i, RSTRUCT_LEN(s))];
}
/* 15.2.18.4.2 */
@@ -486,16 +492,7 @@ mrb_struct_aset(mrb_state *mrb, mrb_value s)
return mrb_struct_aset_sym(mrb, s, mrb_symbol(idx), val);
}
i = mrb_as_int(mrb, idx);
if (i < 0) i = RSTRUCT_LEN(s) + i;
if (i < 0) {
mrb_raisef(mrb, E_INDEX_ERROR,
"offset %i too small for struct(size:%i)", i, RSTRUCT_LEN(s));
}
if (RSTRUCT_LEN(s) <= i) {
mrb_raisef(mrb, E_INDEX_ERROR,
"offset %i too large for struct(size:%i)", i, RSTRUCT_LEN(s));
}
i = struct_index(mrb, mrb_as_int(mrb, idx), RSTRUCT_LEN(s));
mrb_struct_modify(mrb, s);
mrb_field_write_barrier_value(mrb, mrb_basic_ptr(s), val);
return RSTRUCT_PTR(s)[i] = val;