* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@5987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 1 deletions

diff --git a/array.c b/array.c
index 058b669a8c..0f3fc1b202 100644
--- a/array.c
+++ b/array.c
@@ -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++) {