archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 21:49:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* array.c (rb_ary_shift): should clear shifting top element.

Browse source 
[ruby-talk:216055]

* array.c (rb_ary_shift): avoid creating shared object if array
  size is small.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2006-09-24 23:17:42 +00:00
parent 860b9bf47f
commit fe2b0129cc
3 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
array.c
View file

@ -578,11 +578,14 @@ rb_ary_shift(VALUE ary)
rb_ary_modify_check(ary);
if (RARRAY_LEN(ary) == 0) return Qnil;
top = RARRAY_PTR(ary)[0];
if (ARY_EMBED_P(ary)) {
if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) {
MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+1, VALUE, RARRAY_LEN(ary));
ARY_SET_EMBED_LEN(ary, RARRAY_LEN(ary)-1);
ARY_SET_LEN(ary, RARRAY_LEN(ary)-1);
}
else {
if (!FL_TEST(ary, ELTS_SHARED)) {
RARRAY(ary)->ptr[0] = Qnil;
}
ary_make_shared(ary);
RARRAY(ary)->as.heap.ptr++; /* shift ptr */
RARRAY(ary)->as.heap.len--;