зеркало из https://github.com/github/ruby.git
* enum.c (enum_zip): Fix error message
* array.c (take_items): Same, for Array#zip [Bug #7706] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
aab2f788d7
Коммит
96af5360a4
|
@ -1,3 +1,9 @@
|
|||
Thu Jan 24 16:49:17 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
|
||||
|
||||
* enum.c (enum_zip): Fix error message
|
||||
|
||||
* array.c (take_items): Same, for Array#zip
|
||||
|
||||
Thu Jan 24 16:47:26 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
|
||||
|
||||
* enumerator.c (lazy_zip): raise error for bad arguments
|
||||
|
|
3
array.c
3
array.c
|
@ -3047,7 +3047,8 @@ take_items(VALUE obj, long n)
|
|||
result = rb_ary_new2(n);
|
||||
args[0] = result; args[1] = (VALUE)n;
|
||||
if (rb_check_block_call(obj, idEach, 0, 0, take_i, (VALUE)args) == Qundef)
|
||||
Check_Type(obj, T_ARRAY);
|
||||
rb_raise(rb_eTypeError, "wrong argument type %s (must respond to :each)",
|
||||
rb_obj_classname(obj));
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
5
enum.c
5
enum.c
|
@ -2051,7 +2051,10 @@ enum_zip(int argc, VALUE *argv, VALUE obj)
|
|||
if (!allary) {
|
||||
CONST_ID(conv, "to_enum");
|
||||
for (i=0; i<argc; i++) {
|
||||
if (!rb_respond_to(argv[i], id_each)) Check_Type(argv[i], T_ARRAY);
|
||||
if (!rb_respond_to(argv[i], id_each)) {
|
||||
rb_raise(rb_eTypeError, "wrong argument type %s (must respond to :each)",
|
||||
rb_obj_classname(argv[i]));
|
||||
}
|
||||
argv[i] = rb_funcall(argv[i], conv, 1, ID2SYM(id_each));
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче