diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-03-29 02:56:18 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-03-29 02:56:18 +0000 |
commit | fec60bc7c4f851d0cf1c4670ef8f2d9c597b7598 (patch) | |
tree | fe375a324a27f43bd07a192814a516ee99557656 /object.c | |
parent | 95785964f693e4af9b93513dce3960ebc5aab452 (diff) | |
download | ruby-fec60bc7c4f851d0cf1c4670ef8f2d9c597b7598.tar.gz |
* eval.c (avalue_to_svalue): use rb_check_array_type() again.
Clarify how "to_ary" and "to_a" work. [ruby-talk:68155]
* eval.c (svalue_to_avalue): ditto.
* eval.c (svalue_to_mrhs): ditto.
* eval.c (rb_eval): unary splat to use to_a, but we need a hack to
exclude Object#to_a until it's removed.
* object.c (rb_Array): check obj.respond_to?("to_a"). Currently
all object respond_to "to_a", but Object#to_a will be removed.
* range.c (Init_Range): undefine to_ary.
* re.c (Init_Regexp): ditto.
* regex.c (re_compile_pattern): do not warn if "-" is at the top
or last of character class.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'object.c')
-rw-r--r-- | object.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -1270,10 +1270,16 @@ rb_Array(val) val = rb_funcall(val, to_ary, 0); } else { - val = rb_funcall(val, rb_intern("to_a"), 0); + to_ary = rb_intern("to_a"); + if (rb_respond_to(val, to_ary)) { + val = rb_funcall(val, to_ary, 0); + } + else { + val = rb_ary_new3(1, val); + } } if (TYPE(val) != T_ARRAY) { - rb_raise(rb_eTypeError, "`to_a' did not return Array"); + rb_raise(rb_eTypeError, "`%s' did not return Array", rb_id2name(to_ary)); } return val; } |