Commit 312b2c7b authored by Masaki Muranaka's avatar Masaki Muranaka

Optimize range check.

parent 8268ba27
...@@ -566,10 +566,12 @@ mrb_ary_set(mrb_state *mrb, mrb_value ary, mrb_int n, mrb_value val) /* rb_ary_s ...@@ -566,10 +566,12 @@ mrb_ary_set(mrb_state *mrb, mrb_value ary, mrb_int n, mrb_value val) /* rb_ary_s
ary_modify(mrb, a); ary_modify(mrb, a);
/* range check */ /* range check */
if (n < 0) n += a->len; if (n < 0) {
n += a->len;
if (n < 0) { if (n < 0) {
mrb_raise(mrb, E_INDEX_ERROR, "index %ld out of array", n - a->len); mrb_raise(mrb, E_INDEX_ERROR, "index %ld out of array", n - a->len);
} }
}
if (a->len <= (int)n) { if (a->len <= (int)n) {
if (a->aux.capa <= (int)n) if (a->aux.capa <= (int)n)
ary_expand_capa(mrb, a, n + 1); ary_expand_capa(mrb, a, n + 1);
...@@ -592,10 +594,12 @@ mrb_ary_splice(mrb_state *mrb, mrb_value ary, mrb_int head, mrb_int len, mrb_val ...@@ -592,10 +594,12 @@ mrb_ary_splice(mrb_state *mrb, mrb_value ary, mrb_int head, mrb_int len, mrb_val
ary_modify(mrb, a); ary_modify(mrb, a);
/* range check */ /* range check */
if (head < 0) head += a->len; if (head < 0) {
head += a->len;
if (head < 0) { if (head < 0) {
mrb_raise(mrb, E_INDEX_ERROR, "index is out of array"); mrb_raise(mrb, E_INDEX_ERROR, "index is out of array");
} }
}
tail = head + len; tail = head + len;
/* size check */ /* size check */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment