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

* proc.c (rb_block_arity): should not call GetProcPtr() for symbols.

Browse source 
[ruby-core:72205] [Bug #11830]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53170 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2015-12-17 07:16:14 +00:00
parent 61c19c9d43
commit 94b3c4121b
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Dec 17 16:13:10 2015 Shugo Maeda <shugo@ruby-lang.org>
* proc.c (rb_block_arity): should not call GetProcPtr() for symbols.
[ruby-core:72205] [Bug #11830]
Thu Dec 17 14:16:29 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Dec 17 14:16:29 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_scrub): the result should be infected by the * string.c (rb_str_scrub): the result should be infected by the

5
proc.c
View file

@ -956,11 +956,16 @@ rb_block_arity(void)
min = rb_block_min_max_arity(block, &max); min = rb_block_min_max_arity(block, &max);
proc_value = block->proc; proc_value = block->proc;
if (proc_value) { if (proc_value) {
if (SYMBOL_P(proc_value)) {
return -1;
}
else {
rb_proc_t *proc; rb_proc_t *proc;
GetProcPtr(proc_value, proc); GetProcPtr(proc_value, proc);
if (proc) if (proc)
return (proc->is_lambda ? min == max : max != UNLIMITED_ARGUMENTS) ? min : -min-1; return (proc->is_lambda ? min == max : max != UNLIMITED_ARGUMENTS) ? min : -min-1;
} }
}
return max != UNLIMITED_ARGUMENTS ? min : -min-1; return max != UNLIMITED_ARGUMENTS ? min : -min-1;
} }

7
test/ruby/test_symbol.rb
View file

@ -157,6 +157,13 @@ class TestSymbol < Test::Unit::TestCase
assert_equal(1, first, bug11594) assert_equal(1, first, bug11594)
end end
def test_to_proc_for_hash_each
bug11830 = '[ruby-core:72205] [Bug #11830]'
assert_normal_exit(<<-'end;', bug11830) # do
{}.each(&:destroy)
end;
end
def test_call def test_call
o = Object.new o = Object.new
def o.foo(x, y); x + y; end def o.foo(x, y); x + y; end