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

Make ary_replace() to take struct RArray* argument.

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2018-04-17 12:33:01 +09:00
parent 66b1695ba9
commit c078783a5a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/array.c
+6 -4
View File
@@ -344,12 +344,14 @@ mrb_ary_plus(mrb_state *mrb, mrb_value self)
}
static void
ary_replace(mrb_state *mrb, struct RArray *a, mrb_value *argv, mrb_int len)
ary_replace(mrb_state *mrb, struct RArray *a, struct RArray *b)
{
mrb_int len = ARY_LEN(b);
ary_modify(mrb, a);
if (ARY_CAPA(a) < len)
ary_expand_capa(mrb, a, len);
array_copy(ARY_PTR(a), argv, len);
array_copy(ARY_PTR(a), ARY_PTR(b), len);
mrb_write_barrier(mrb, (struct RBasic*)a);
ARY_SET_LEN(a, len);
}
@@ -361,7 +363,7 @@ mrb_ary_replace(mrb_state *mrb, mrb_value self, mrb_value other)
struct RArray *a2 = mrb_ary_ptr(other);
if (a1 != a2) {
ary_replace(mrb, a1, ARY_PTR(a2), ARY_LEN(a2));
ary_replace(mrb, a1, a2);
}
}
@@ -645,7 +647,7 @@ ary_dup(mrb_state *mrb, struct RArray *a)
mrb_int len = ARY_LEN(a);
struct RArray *d = ary_new_capa(mrb, len);
ary_replace(mrb, d, ARY_PTR(a), len);
ary_replace(mrb, d, a);
return d;
}