Skip to content

array.c: steel shared array's container when ARY_SHARED_NUM == 1 #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
funny-falcon wants to merge 4 commits into from
Closed

array.c: steel shared array's container when ARY_SHARED_NUM == 1 #133

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ba6eeb
array.c: steal shared array's container when ARY_SHARED_NUM == 1
funny-falcon Sep 2, 2012
9f43064
array.c : make array really suitable for queue
funny-falcon Sep 2, 2012
88d6ab2
array.c: use shared array in rb_ary_slice
funny-falcon Sep 2, 2012
a98fa0f
array.c : speedup Array#unshift by using space in shared array
funny-falcon Sep 2, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
array.c: use shared array in rb_ary_slice 
- use ary_ensure_room_for_push when rb_ary_slice used to add at the end of
  array, cause rb_ary_concat use rb_ary_slice
  • Loading branch information
@funny-falcon
funny-falcon committed Sep 2, 2012
commit 88d6ab2d9e4c35f9c76c69c34b7cdba01720adb0
6 changes: 2 additions & 4 deletions array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1374,15 +1374,12 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
rpl = rb_ary_to_ary(rpl);
rlen = RARRAY_LEN(rpl);
}
rb_ary_modify(ary);
if (beg >= RARRAY_LEN(ary)) {
if (beg > ARY_MAX_SIZE - rlen) {
rb_raise(rb_eIndexError, "index %ld too big", beg);
}
ary_ensure_room_for_push(ary, rlen);
len = beg + rlen;
if (len >= ARY_CAPA(ary)) {
ary_double_capa(ary, len);
}
rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary), beg - RARRAY_LEN(ary));
if (rlen > 0) {
MEMCPY(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen);
Expand All @@ -1392,6 +1389,7 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
else {
long alen;

rb_ary_modify(ary);
alen = RARRAY_LEN(ary) + rlen - len;
if (alen >= ARY_CAPA(ary)) {
ary_double_capa(ary, alen);
Expand Down