kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* hash.c (rb_hash_update): Documentation for Hash#merge and shallow

Browse source 
copies Patch by Yorick Peterse [Fixes Github #228]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
zzak 2013-01-01 17:17:28 +00:00
parent 10c8aa81fb
commit 1290747cfb
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Jan 02 02:16:00 2012 Zachary Scott <zachary@zacharyscott.net>
* hash.c (rb_hash_update): Documentation for Hash#merge and shallow
copies Patch by Yorick Peterse [Fixes Github #228]
Mon Dec 31 15:10:00 2012 Zachary Scott <zachary@zacharyscott.net>
* vm_backtrace.c: Add documentation for Kernel#caller_locations,

23
hash.c
View file

@ -1879,11 +1879,11 @@ rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash)
* hsh.merge!(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
* block is specified, entries with duplicate keys are overwritten
* with the values from <i>other_hash</i>, otherwise the value
* 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>.
* Adds the contents of _other_hash_ to _hsh_. If no block is specified,
* entries with duplicate keys are overwritten with the values from
* _other_hash_, otherwise the value of each duplicate key is determined by
* calling the block with the key, its value in _hsh_ and its value in
* _other_hash_.
*
* h1 = { "a" => 100, "b" => 200 }
* h2 = { "b" => 254, "c" => 300 }
@ -1893,6 +1893,19 @@ rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash)
* h2 = { "b" => 254, "c" => 300 }
* h1.merge!(h2) { |key, v1, v2| v1 }
* #=> {"a"=>100, "b"=>200, "c"=>300}
*
* Note that this method creates a shallow copy of the value in _other_hash_.
* This means that when for example Array#select! is used on one of the values
* in _other_hash_ both the original object as well as the copy will be
* modified. This is illustrated in the following example:
*
* original = { "numbers" => [10, 20, 30] }
* copy = {}.merge(original)
*
* copy["numbers"].select! { |number| number <= 20 }
*
* puts copy # => { "numbers" => [10, 20] }
* puts original # => { "numbers" => [10, 20] }
*/
static VALUE