1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* hash.c (Hash#merge doc): Added explanation for form with block.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
marcandre 2010-03-06 17:03:48 +00:00
parent c3c8c1e37c
commit 69fd8a9011
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hash.c
View File

@ -1715,7 +1715,7 @@ rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash)
* hsh.update(other_hash){|key, oldval, newval| block} => hsh * hsh.update(other_hash){|key, oldval, newval| block} => hsh
* *
* Adds the contents of <i>other_hash</i> to <i>hsh</i>. If no * Adds the contents of <i>other_hash</i> to <i>hsh</i>. If no
* block is specified entries with duplicate keys are overwritten * block is specified, entries with duplicate keys are overwritten
* with the values from <i>other_hash</i>, otherwise the value * with the values from <i>other_hash</i>, otherwise the value
* of each duplicate key is determined by calling the block with * of each duplicate key is determined by calling the block with
* the key, its value in <i>hsh</i> and its value in <i>other_hash</i>. * the key, its value in <i>hsh</i> and its value in <i>other_hash</i>.
@ -1750,12 +1750,16 @@ rb_hash_update(VALUE hash1, VALUE hash2)
* hsh.merge(other_hash){|key, oldval, newval| block} -> a_hash * hsh.merge(other_hash){|key, oldval, newval| block} -> a_hash
* *
* Returns a new hash containing the contents of <i>other_hash</i> and * Returns a new hash containing the contents of <i>other_hash</i> and
* the contents of <i>hsh</i>, overwriting entries in <i>hsh</i> with * the contents of <i>hsh</i>. If no block is specified, the value for
* duplicate keys with those from <i>other_hash</i>. * entries with duplicate keys will be that of <i>other_hash</i>. Otherwise
* the value for each duplicate key is determined by calling the block
* with the key, its value in <i>hsh</i> and its value in <i>other_hash</i>.
* *
* h1 = { "a" => 100, "b" => 200 } * h1 = { "a" => 100, "b" => 200 }
* h2 = { "b" => 254, "c" => 300 } * h2 = { "b" => 254, "c" => 300 }
* h1.merge(h2) #=> {"a"=>100, "b"=>254, "c"=>300} * h1.merge(h2) #=> {"a"=>100, "b"=>254, "c"=>300}
* h1.merge(h2){|key, oldval, newval| newval - oldval}
* #=> {"a"=>100, "b"=>54, "c"=>300}
* h1 #=> {"a"=>100, "b"=>200} * h1 #=> {"a"=>100, "b"=>200}
* *
*/ */