From 35c9feaeb72c1bf6c8642d05e9b0974649d12651 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 2 Nov 2007 06:30:26 +0000
Subject: * array.c (rb_ary_assoc): check and convert inner arrays (assocs)  
 using #to_ary.

* hash.c (rb_hash_s_create): check and convert argument hash
  using #to_hash.

* hash.c (rb_hash_s_create): Hash#[] now takes assocs as source of
  hash conversion.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13803 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 array.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'array.c')

diff --git a/array.c b/array.c
index 835e76bbd1..44ca19a62c 100644
--- a/array.c
+++ b/array.c
@@ -2420,10 +2420,9 @@ rb_ary_assoc(ary, key)
     VALUE v;
 
     for (i = 0; i < RARRAY(ary)->len; ++i) {
-	v = RARRAY(ary)->ptr[i];
-	if (TYPE(v) == T_ARRAY &&
-	    RARRAY(v)->len > 0 &&
-	    rb_equal(RARRAY(v)->ptr[0], key))
+	v = rb_check_array_type(RARRAY_PTR(ary)[i]);
+	if (!NIL_P(v) && RARRAY(v)->len > 0 &&
+	    rb_equal(RARRAY_PTR(v)[0], key))
 	    return v;
     }
     return Qnil;
-- 
cgit v1.2.3

y_1_9_2'>ruby_1_9_2</option>
<option value='ruby_1_9_3'>ruby_1_9_3</option>
<option value='ruby_2_0_0'>ruby_2_0_0</option>
<option value='ruby_2_1'>ruby_2_1</option>
<option value='ruby_2_2'>ruby_2_2</option>
<option value='ruby_2_3'>ruby_2_3</option>
<option value='ruby_2_4'>ruby_2_4</option>
<option value='ruby_2_5'>ruby_2_5</option>
<option value='ruby_2_6'>ruby_2_6</option>
<option value='ruby_2_7'>ruby_2_7</option>
<option value='ruby_3_0'>ruby_3_0</option>
<option value='ruby_3_1'>ruby_3_1</option>
<option value='ruby_3_2'>ruby_3_2</option>
<option value='ruby_3_3'>ruby_3_3</option>
<option value='ruby_3_4'>ruby_3_4</option>
<option value='ruby_4_0'>ruby_4_0</option>
<option value='v1_0r'>v1_0r</option>
<option value='v1_1dev'>v1_1dev</option>
<option value='v1_1r'>v1_1r</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>The Ruby Programming Language</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/ruby.git/?h=v3_2_9'>summary</a><a href='/ruby.git/refs/?h=v3_2_9'>refs</a><a href='/ruby.git/log/?h=v3_2_9'>log</a><a href='/ruby.git/tree/?h=v3_2_9'>tree</a><a href='/ruby.git/commit/?h=v3_2_9'>commit</a><a class='active' href='/ruby.git/diff/?h=v3_2_9&amp;id2=c09fc47a9fc0c44509859a264cd06ecc46d6469f'>diff</a></td><td class='form'><form class='right' method='get' action='/ruby.git/log/'>
<input type='hidden' name='h' value='v3_2_9'/><input type='hidden' name='id2' value='c09fc47a9fc0c44509859a264cd06ecc46d6469f'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='v3_2_9'/><input type='hidden' name='id2' value='c09fc47a9fc0c44509859a264cd06ecc46d6469f'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><div class='diffstat-header'><a href='/ruby.git/diff/?h=v3_2_9&amp;id2=c09fc47a9fc0c44509859a264cd06ecc46d6469f'>Diffstat</a></div><table summary='diffstat' class='diffstat'>