diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-20 16:45:41 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-20 16:45:41 +0000 |
commit | 45f539317e3b65a41d85236b9cb5e8ad0e6daf31 (patch) | |
tree | 77a3e260242dc179917075ae3e9b73f75a60fd3c /array.c | |
parent | fdb5c5e28de29952c4fc2988b38bbd1294855ce8 (diff) | |
download | ruby-45f539317e3b65a41d85236b9cb5e8ad0e6daf31.tar.gz ruby-45f539317e3b65a41d85236b9cb5e8ad0e6daf31.tar.xz ruby-45f539317e3b65a41d85236b9cb5e8ad0e6daf31.zip |
* eval.c (rb_require_safe): preserve old ruby_errinfo.
[ruby-talk:95409]
* eval.c (rb_f_raise): should not clear backtrace information if
exception object already have one.
* parse.y (assoc_list): allow {sym: val} style Hash. [Ruby2]
this change is done by Nobuyoshi Nakada <nobu@ruby-lang.org>.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -213,6 +213,13 @@ to_ary(ary) return rb_convert_type(ary, T_ARRAY, "Array", "to_ary"); } +static VALUE +to_a(ary) + VALUE ary; +{ + return rb_convert_type(ary, T_ARRAY, "Array", "to_a"); +} + VALUE rb_check_array_type(ary) VALUE ary; @@ -2025,7 +2032,7 @@ rb_ary_zip(argc, argv, ary) VALUE result; for (i=0; i<argc; i++) { - argv[i] = to_ary(argv[i]); + argv[i] = to_a(argv[i]); } if (rb_block_given_p()) { for (i=0; i<RARRAY(ary)->len; i++) { |