kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* 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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Mon Sep 25 08:14:43 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (rb_ary_shift): should clear shifting top element.
[ruby-talk:216055]
* array.c (rb_ary_shift): avoid creating shared object if array
size is small.
Mon Sep 25 08:11:35 2006 Yukihiro Matsumoto <matz@ruby-lang.org> Mon Sep 25 08:11:35 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* random.c (rb_f_rand): RDoc typo fix. a patch from Frederick * random.c (rb_f_rand): RDoc typo fix. a patch from Frederick

7
array.c
View file

@ -578,11 +578,14 @@ rb_ary_shift(VALUE ary)
rb_ary_modify_check(ary); rb_ary_modify_check(ary);
if (RARRAY_LEN(ary) == 0) return Qnil; if (RARRAY_LEN(ary) == 0) return Qnil;
top = RARRAY_PTR(ary)[0]; 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)); 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 { else {
if (!FL_TEST(ary, ELTS_SHARED)) {
RARRAY(ary)->ptr[0] = Qnil;
}
ary_make_shared(ary); ary_make_shared(ary);
RARRAY(ary)->as.heap.ptr++; /* shift ptr */ RARRAY(ary)->as.heap.ptr++; /* shift ptr */
RARRAY(ary)->as.heap.len--; RARRAY(ary)->as.heap.len--;

5
gc.c
View file

@ -866,10 +866,6 @@ gc_mark_children(VALUE ptr, int lev)
ptr = (VALUE)obj->as.node.u1.node; ptr = (VALUE)obj->as.node.u1.node;
goto again; goto again;
case NODE_POSTEXE: /* 2 */
ptr = (VALUE)obj->as.node.u2.node;
goto again;
case NODE_SCOPE: /* 2,3 */ case NODE_SCOPE: /* 2,3 */
case NODE_CDECL: case NODE_CDECL:
gc_mark((VALUE)obj->as.node.u3.node, lev); gc_mark((VALUE)obj->as.node.u3.node, lev);
@ -896,6 +892,7 @@ gc_mark_children(VALUE ptr, int lev)
case NODE_ERRINFO: case NODE_ERRINFO:
case NODE_ATTRSET: case NODE_ATTRSET:
case NODE_BLOCK_ARG: case NODE_BLOCK_ARG:
case NODE_POSTEXE:
break; break;
case NODE_ALLOCA: case NODE_ALLOCA:
mark_locations_array((VALUE*)obj->as.node.u1.value, mark_locations_array((VALUE*)obj->as.node.u1.value,