diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-11 05:57:19 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-11 05:57:19 +0000 |
commit | fedfa6e5fac9ffc3b1ac7fbbcbaec39ca0cf54a1 (patch) | |
tree | 0e3ee427847ac3b29d8cea63bc402e9ae9231f26 /array.c | |
parent | cd58f3313e1dd60895e1888290f7e433bec67208 (diff) | |
download | ruby-fedfa6e5fac9ffc3b1ac7fbbcbaec39ca0cf54a1.tar.gz |
* ext/digest/sha1/sha1ossl.h: libssl 0.9.8c-3 defines no
SHA_BLOCK_LENGTH.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 34 |
1 files changed, 21 insertions, 13 deletions
@@ -1227,6 +1227,24 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary) return ary; } +VALUE +each_internal(VALUE ary) +{ + long i; + + for (i=0; i<RARRAY_LEN(ary); i++) { + rb_yield(RARRAY_PTR(ary)[i]); + } + return ary; +} + +static VALUE +iter_unlock(VALUE ary) +{ + FL_UNSET(ary, ARY_TMPLOCK); + return ary; +} + /* * call-seq: * array.each {|item| block } -> array @@ -1245,12 +1263,9 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary) VALUE rb_ary_each(VALUE ary) { - long i; - RETURN_ENUMERATOR(ary, 0, 0); - for (i=0; i<RARRAY_LEN(ary); i++) { - rb_yield(RARRAY_PTR(ary)[i]); - } + FL_SET(ary, ARY_TMPLOCK); /* prohibit modification during each */ + rb_ensure(each_internal, ary, iter_unlock, ary); return ary; } @@ -1623,13 +1638,6 @@ sort_internal(VALUE ary) return ary; } -static VALUE -sort_unlock(VALUE ary) -{ - FL_UNSET(ary, ARY_TMPLOCK); - return ary; -} - /* * call-seq: * array.sort! -> array @@ -1652,7 +1660,7 @@ rb_ary_sort_bang(VALUE ary) rb_ary_modify(ary); if (RARRAY_LEN(ary) > 1) { FL_SET(ary, ARY_TMPLOCK); /* prohibit modification during sort */ - rb_ensure(sort_internal, ary, sort_unlock, ary); + rb_ensure(sort_internal, ary, iter_unlock, ary); } return ary; } |