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

Revert r33921.

Browse source 
Revert "* proc.c (rb_proc_arity): Fix Proc#arity in case of optional arguments"
Because following two reason:
* Proc#arity's return value with optional arguments is not clear.
  The optional argument for proc/lambda is Ruby 1.9 feature.
  In 1.9, proc(a, b=1){} can receive 1 or more arguments.
  But lambda(a, b=1){} can receive only 1 or two arguments.
  r33921 breaks lambda's arity.
  The spec arround optional arguments of proc/lambda needs more
  discussion.

* No tests.
  Add tests to test-all.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2011-12-01 22:14:45 +00:00
parent 72af26207b
commit 0b1651753c
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -7,11 +7,6 @@ Thu Dec 1 22:31:16 2011 Tanaka Akira <akr@fsij.org>
* io.c (linux_get_maxfd): change local variable name.
Thu Dec 1 20:33:22 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* proc.c (rb_proc_arity): Fix Proc#arity in case of optional
arguments. [bug #5694] [rubyspec:b8b259]
Thu Dec 1 16:59:24 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/socket/extconf.rb: add arguments for macro calls.

18
proc.c
View file

@ -615,14 +615,14 @@ rb_proc_call_with_block(VALUE self, int argc, VALUE *argv, VALUE pass_procval)
* arguments. A <code>proc</code> with no argument declarations
* is the same a block declaring <code>||</code> as its arguments.
*
* Proc.new {}.arity #=> 0
* Proc.new {||}.arity #=> 0
* Proc.new {|a|}.arity #=> 1
* Proc.new {|a, b|}.arity #=> 2
* Proc.new {|a, b, c|}.arity #=> 3
* Proc.new {|*a|}.arity #=> -1
* Proc.new {|a, b=42|}.arity #=> -2
* Proc.new {|a, *b, c|}.arity #=> -3
* Proc.new {}.arity #=> 0
* Proc.new {||}.arity #=> 0
* Proc.new {|a|}.arity #=> 1
* Proc.new {|a,b|}.arity #=> 2
* Proc.new {|a,b,c|}.arity #=> 3
* Proc.new {|*a|}.arity #=> -1
* Proc.new {|a,*b|}.arity #=> -2
* Proc.new {|a,*b, c|}.arity #=> -3
*/
static VALUE
@ -641,7 +641,7 @@ rb_proc_arity(VALUE self)
iseq = proc->block.iseq;
if (iseq) {
if (BUILTIN_TYPE(iseq) != T_NODE) {
if (iseq->arg_rest < 0 && iseq->arg_opts == 0) {
if (iseq->arg_rest < 0) {
return iseq->argc;
}
else {