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

* array.c: Avoid zip bug by not using obsolete rb_check_block_call [Bug #8153]

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
marcandre 2013-03-22 22:30:45 +00:00
parent 4edd787b14
commit cb0093d545
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Mar 23 07:30:31 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* array.c: Avoid zip bug by not using obsolete rb_check_block_call
[Bug #8153]
Fri Mar 22 17:48:34 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Mar 22 17:48:34 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/forwardable.rb (Forwardable::FILE_REGEXP): create regexp object * lib/forwardable.rb (Forwardable::FILE_REGEXP): create regexp object

22
array.c
View File

@ -17,6 +17,7 @@
#include "ruby/encoding.h" #include "ruby/encoding.h"
#include "internal.h" #include "internal.h"
#include "probes.h" #include "probes.h"
#include "node.h"
#include "id.h" #include "id.h"
#ifndef ARRAY_DEBUG #ifndef ARRAY_DEBUG
@ -3032,11 +3033,11 @@ rb_ary_delete_if(VALUE ary)
} }
static VALUE static VALUE
take_i(VALUE val, VALUE *args, int argc, VALUE *argv) take_i(VALUE i, VALUE args, int argc, VALUE *argv)
{ {
if (args[1]-- == 0) rb_iter_break(); NODE *memo = RNODE(args);
if (argc > 1) val = rb_ary_new4(argc, argv); rb_ary_push(memo->u1.value, rb_enum_values_pack(argc, argv));
rb_ary_push(args[0], val); if (--memo->u3.cnt == 0) rb_iter_break();
return Qnil; return Qnil;
} }
@ -3044,18 +3045,19 @@ static VALUE
take_items(VALUE obj, long n) take_items(VALUE obj, long n)
{ {
VALUE result = rb_check_array_type(obj); VALUE result = rb_check_array_type(obj);
VALUE args[2]; NODE *memo;
if (!NIL_P(result)) return rb_ary_subseq(result, 0, n); if (!NIL_P(result)) return rb_ary_subseq(result, 0, n);
if (!rb_respond_to(obj, idEach)) {
rb_raise(rb_eTypeError, "wrong argument type %s (must respond to :each)",
rb_obj_classname(obj));
}
result = rb_ary_new2(n); result = rb_ary_new2(n);
args[0] = result; args[1] = (VALUE)n; memo = NEW_MEMO(result, 0, n);
if (rb_check_block_call(obj, idEach, 0, 0, take_i, (VALUE)args) == Qundef) rb_block_call(obj, idEach, 0, 0, take_i, (VALUE)memo);
rb_raise(rb_eTypeError, "wrong argument type %s (must respond to :each)",
rb_obj_classname(obj));
return result; return result;
} }
/* /*
* call-seq: * call-seq:
* ary.zip(arg, ...) -> new_ary * ary.zip(arg, ...) -> new_ary

9
test/ruby/test_array.rb
View File

@ -1918,6 +1918,15 @@ class TestArray < Test::Unit::TestCase
assert_equal([['a', 5], ['b', 6]], %w(a b).zip(ary)) assert_equal([['a', 5], ['b', 6]], %w(a b).zip(ary))
end end
def test_zip_bug
bug8153 = "ruby-core:53650"
r = 1..1
def r.respond_to?(*)
super
end
assert_equal [[42, 1]], [42].zip(r), bug8153
end
def test_transpose def test_transpose
assert_equal([[1, :a], [2, :b], [3, :c]], assert_equal([[1, :a], [2, :b], [3, :c]],
[[1, 2, 3], [:a, :b, :c]].transpose) [[1, 2, 3], [:a, :b, :c]].transpose)