matz: 1.6.0 final (hopufully)

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 9 insertions, 1 deletions

diff --git a/object.c b/object.c
index 8e1c25b51..3db26148e 100644
--- a/object.c
+++ b/object.c
@@ -990,8 +990,16 @@ VALUE
 rb_Array(val)
     VALUE val;
 {
+    ID to_ary;
+
     if (TYPE(val) == T_ARRAY) return val;
-    val = rb_funcall(val, rb_intern("to_a"), 0);
+    to_ary = rb_intern("to_ary");
+    if (rb_respond_to(val, to_ary)) {
+	val = rb_funcall(val, to_ary, 0);
+    }
+    else {
+	val = rb_funcall(val, rb_intern("to_a"), 0);
+    }
     if (TYPE(val) != T_ARRAY) {
 	rb_raise(rb_eTypeError, "`to_a' did not return Array");
     }