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

merges r20050 from ruby_1_9_1 into trunk.

Browse Source 
* array.c (rb_ary_sort_bang): refactoring.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-11-08 11:09:20 +00:00
parent 877ac7236a
commit 16285e768e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
array.c
View File

@ -1769,19 +1769,25 @@ rb_ary_sort_bang(VALUE ary)
assert(ARY_EMBED_P(tmp)); assert(ARY_EMBED_P(tmp));
if (ARY_SHARED_P(ary)) { /* ary might be destructively operated in the given block */ if (ARY_SHARED_P(ary)) { /* ary might be destructively operated in the given block */
rb_ary_unshare(ary); rb_ary_unshare(ary);
FL_SET_EMBED(ary);
} }
FL_SET_EMBED(ary);
MEMCPY(RARRAY_PTR(ary), ARY_EMBED_PTR(tmp), VALUE, ARY_EMBED_LEN(tmp)); MEMCPY(RARRAY_PTR(ary), ARY_EMBED_PTR(tmp), VALUE, ARY_EMBED_LEN(tmp));
ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp)); ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp));
} }
else { else {
assert(!ARY_EMBED_P(tmp)); assert(!ARY_EMBED_P(tmp));
if (ARY_EMBED_P(ary) || RARRAY_PTR(ary) != RARRAY_PTR(tmp)) { if (ARY_HEAP_PTR(ary) == ARY_HEAP_PTR(tmp)) {
assert(!ARY_EMBED_P(ary));
FL_UNSET_SHARED(ary);
ARY_SET_CAPA(ary, ARY_CAPA(tmp));
}
else {
assert(!ARY_SHARED_P(tmp)); assert(!ARY_SHARED_P(tmp));
if (ARY_EMBED_P(ary)) { if (ARY_EMBED_P(ary)) {
FL_UNSET_EMBED(ary); FL_UNSET_EMBED(ary);
} }
else if (ARY_SHARED_P(ary)) { else if (ARY_SHARED_P(ary)) {
/* ary might be destructively operated in the given block */
rb_ary_unshare(ary); rb_ary_unshare(ary);
} }
else { else {
@ -1791,10 +1797,6 @@ rb_ary_sort_bang(VALUE ary)
ARY_SET_HEAP_LEN(ary, RARRAY_LEN(tmp)); ARY_SET_HEAP_LEN(ary, RARRAY_LEN(tmp));
ARY_SET_CAPA(ary, ARY_CAPA(tmp)); ARY_SET_CAPA(ary, ARY_CAPA(tmp));
} }
else {
FL_UNSET_SHARED(ary);
ARY_SET_CAPA(ary, ARY_CAPA(tmp));
}
/* tmp was lost ownership for the ptr */ /* tmp was lost ownership for the ptr */
FL_UNSET(tmp, FL_FREEZE); FL_UNSET(tmp, FL_FREEZE);
FL_SET_EMBED(tmp); FL_SET_EMBED(tmp);