1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add spaces [ci skip]

Browse Source
This commit is contained in:
卜部昌平 2020-06-12 11:04:46 +09:00
parent 86c869fb59
commit 2d6f8db3d6
Notes: git 2020-06-29 11:07:18 +09:00 
Merged: https://github.com/ruby/ruby/pull/3247
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
array.c
View File

@ -1573,15 +1573,18 @@ make_room_for_unshift(VALUE ary, const VALUE *head, VALUE *sharedp, int argc, lo
{ {
if (head - sharedp < argc) { if (head - sharedp < argc) {
long room = capa - len - argc; long room = capa - len - argc;
room -= room >> 4; room -= room >> 4;
MEMMOVE((VALUE *)sharedp + argc + room, head, VALUE, len); MEMMOVE((VALUE *)sharedp + argc + room, head, VALUE, len);
head = sharedp + argc + room; head = sharedp + argc + room;
} }
ARY_SET_PTR(ary, head - argc); ARY_SET_PTR(ary, head - argc);
assert(ARY_SHARED_ROOT_OCCUPIED(ARY_SHARED_ROOT(ary))); assert(ARY_SHARED_ROOT_OCCUPIED(ARY_SHARED_ROOT(ary)));
ary_verify(ary); ary_verify(ary);
return ARY_SHARED_ROOT(ary); return ARY_SHARED_ROOT(ary);
} }
static VALUE static VALUE
ary_modify_for_unshift(VALUE ary, int argc) ary_modify_for_unshift(VALUE ary, int argc)
{ {
@ -1617,11 +1620,13 @@ ary_modify_for_unshift(VALUE ary, int argc)
return ary; return ary;
} }
} }
static VALUE static VALUE
ary_ensure_room_for_unshift(VALUE ary, int argc) ary_ensure_room_for_unshift(VALUE ary, int argc)
{ {
long len = RARRAY_LEN(ary); long len = RARRAY_LEN(ary);
long new_len = len + argc; long new_len = len + argc;
if (len > ARY_MAX_SIZE - argc) { if (len > ARY_MAX_SIZE - argc) {
rb_raise(rb_eIndexError, "index %ld too big", new_len); rb_raise(rb_eIndexError, "index %ld too big", new_len);
} }
@ -1631,6 +1636,7 @@ ary_ensure_room_for_unshift(VALUE ary, int argc)
else { else {
VALUE shared_root = ARY_SHARED_ROOT(ary); VALUE shared_root = ARY_SHARED_ROOT(ary);
long capa = RARRAY_LEN(shared_root); long capa = RARRAY_LEN(shared_root);
if (! ARY_SHARED_ROOT_OCCUPIED(shared_root)) { if (! ARY_SHARED_ROOT_OCCUPIED(shared_root)) {
return ary_modify_for_unshift(ary, argc); return ary_modify_for_unshift(ary, argc);
} }
@ -1638,9 +1644,10 @@ ary_ensure_room_for_unshift(VALUE ary, int argc)
return ary_modify_for_unshift(ary, argc); return ary_modify_for_unshift(ary, argc);
} }
else { else {
rb_ary_modify_check(ary);
const VALUE * head = RARRAY_CONST_PTR_TRANSIENT(ary); const VALUE * head = RARRAY_CONST_PTR_TRANSIENT(ary);
void *sharedp = (void *)RARRAY_CONST_PTR_TRANSIENT(shared_root); void *sharedp = (void *)RARRAY_CONST_PTR_TRANSIENT(shared_root);
rb_ary_modify_check(ary);
return make_room_for_unshift(ary, head, sharedp, argc, capa, len); return make_room_for_unshift(ary, head, sharedp, argc, capa, len);
} }
} }