* proc.c (proc_arity): fix an arity bug ([ruby-core:11060]).

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12232 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 18 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 51eedc90d..a16bc8eca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue May  1 13:59:18 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c (proc_arity): fix an arity bug ([ruby-core:11060]).
+
 Tue May  1 13:12:49 2007  Koichi Sasada  <ko1@atdot.net>
 
 	* yarvcore.h, compile.c (set_arguments): support post arguments.
diff --git a/proc.c b/proc.c
index 66eebec8a..d11f486e3 100644
--- a/proc.c
+++ b/proc.c
@@ -443,17 +443,24 @@ proc_arity(VALUE self)
     rb_iseq_t *iseq;
     GetProcPtr(self, proc);
     iseq = proc->block.iseq;
-    if (iseq && BUILTIN_TYPE(iseq) != T_NODE) {
-	if (iseq->arg_rest < 0) {
-	    return INT2FIX(iseq->argc);
+    if (iseq) {
+	if (BUILTIN_TYPE(iseq) != T_NODE) {
+	    if (iseq->arg_rest < 0) {
+		return INT2FIX(iseq->argc);
+	    }
+	    else {
+		return INT2FIX(-(iseq->argc + 1 + iseq->arg_post_len));
+	    }
 	}
 	else {
-	    return INT2FIX(-(iseq->argc + 1 + iseq->arg_post_len));
+	    NODE *node = (NODE *)iseq;
+	    if (nd_type(node) == NODE_IFUNC && node->nd_cfnc == bmcall) {
+		/* method(:foo).to_proc.arity */
+		return INT2FIX(method_arity(node->nd_tval));
+	    }
 	}
     }
-    else {
-	return INT2FIX(-1);
-    }
+    return INT2FIX(-1);
 }
 
 int