matz	2007-10-26 01:52:40 +0900 (Fri, 26 Oct 2007)

  New Revision: 13775

  Modified files:
    trunk/ChangeLog
    trunk/array.c
    trunk/version.h

  Log:
    * array.c (rb_ary_assoc): check and convert inner arrays (assocs)
      using #to_ary.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=13775&r2=13774
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/array.c?r1=13775&r2=13774
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13775&r2=13774

Index: array.c
===================================================================
--- array.c	(revision 13774)
+++ array.c	(revision 13775)
@@ -2283,9 +2283,8 @@
     VALUE v;
 
     for (i = 0; i < RARRAY_LEN(ary); ++i) {
-	v = RARRAY_PTR(ary)[i];
-	if (TYPE(v) == T_ARRAY &&
-	    RARRAY_LEN(v) > 0 &&
+	v = rb_check_array_type(RARRAY_PTR(ary)[i]);
+	if (!NIL_P(v) && RARRAY_LEN(v) > 0 &&
 	    rb_equal(RARRAY_PTR(v)[0], key))
 	    return v;
     }
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13774)
+++ ChangeLog	(revision 13775)
@@ -1,3 +1,8 @@
+Fri Oct 26 01:48:28 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* array.c (rb_ary_assoc): check and convert inner arrays (assocs)
+	  using #to_ary.
+
 Thu Oct 25 14:19:33 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (rb_io_tell, rb_io_seek): check errno too.  [ruby-dev:32093]
Index: version.h
===================================================================
--- version.h	(revision 13774)
+++ version.h	(revision 13775)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-10-25"
+#define RUBY_RELEASE_DATE "2007-10-26"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071025
+#define RUBY_RELEASE_CODE 20071026
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 25
+#define RUBY_RELEASE_DAY 26
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml