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

* hash.c (rb_hash_set_default_proc): Accept nil, patch by Run Paint

Browse Source 
[Feature #4234]

* test/ruby/test_hash.rb: test for above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35268 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
marcandre 2012-04-09 04:07:53 +00:00
parent 6cb7ac7e15
commit 6b18a8c2e9
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Mon Apr 9 13:06:58 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* hash.c (rb_hash_set_default_proc): Accept nil, patch by Run Paint
[Feature #4234]
* test/ruby/test_hash.rb: test for above.
Mon Apr 9 08:01:15 2012 Tadayoshi Funaba <tadf@dotrb.org> Mon Apr 9 08:01:15 2012 Tadayoshi Funaba <tadf@dotrb.org>
* ext/date/date_strftime.c: gets the value with range() consistetly. * ext/date/date_strftime.c: gets the value with range() consistetly.

4
NEWS
View File

@ -21,6 +21,10 @@ with all sufficient information, see the ChangeLog file.
* added method: * added method:
* added Enumerable#lazy method for lazy enumeration. * added Enumerable#lazy method for lazy enumeration.
* Hash
* extended method:
* Hash#default_proc= can be passed nil to clear the default proc.
* Kernel * Kernel
* added method: * added method:
* added Kernel#Hash conversion method like Array() or Float(). * added Kernel#Hash conversion method like Array() or Float().

9
hash.c
View File

@ -689,9 +689,9 @@ rb_hash_default_proc(VALUE hash)
/* /*
* call-seq: * call-seq:
* hsh.default_proc = proc_obj -> proc_obj * hsh.default_proc = proc_obj or nil
* *
* Sets the default proc to be executed on each key lookup. * Sets the default proc to be executed on each failed key lookup.
* *
* h.default_proc = proc do |hash, key| * h.default_proc = proc do |hash, key|
* hash[key] = key + key * hash[key] = key + key
@ -706,6 +706,11 @@ rb_hash_set_default_proc(VALUE hash, VALUE proc)
VALUE b; VALUE b;
rb_hash_modify_check(hash); rb_hash_modify_check(hash);
if (NIL_P(proc)) {
FL_UNSET(hash, HASH_PROC_DEFAULT);
RHASH_IFNONE(hash) = proc;
return proc;
}
b = rb_check_convert_type(proc, T_DATA, "Proc", "to_proc"); b = rb_check_convert_type(proc, T_DATA, "Proc", "to_proc");
if (NIL_P(b) || !rb_obj_is_proc(b)) { if (NIL_P(b) || !rb_obj_is_proc(b)) {
rb_raise(rb_eTypeError, rb_raise(rb_eTypeError,

4
test/ruby/test_hash.rb
View File

@ -718,6 +718,10 @@ class TestHash < Test::Unit::TestCase
def test_default_proc def test_default_proc
h = Hash.new {|hh, k| hh + k + "baz" } h = Hash.new {|hh, k| hh + k + "baz" }
assert_equal("foobarbaz", h.default_proc.call("foo", "bar")) assert_equal("foobarbaz", h.default_proc.call("foo", "bar"))
assert_nil(h.default_proc = nil)
assert_nil(h.default_proc)
h.default_proc = ->(h, k){ true }
assert(h[:nope])
h = {} h = {}
assert_nil(h.default_proc) assert_nil(h.default_proc)
end end