arity bug

matz · matz · commit c59869494a1a · 1999-05-18T00:34:41.000Z
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@470 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,13 @@
 Mon May 17 12:26:31 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
+	* numeric.c (fix_rev): should treat Fixnum as signed long.
+
+	* eval.c (massign): add strict number check for yield (and call).
+
+	* eval.c (proc_arity): new method to return number of arguments.
+
+	* eval.c (method_arity): new method to return number of arguments.
+
 	* parse.y (read_escape): char may be unsigned.
 
 	* string.c (rb_str_succ): ditto.
diff --git a/eval.c b/eval.c
@@ -5523,18 +5523,18 @@ proc_arity(proc)
     int n;
 
     Data_Get_Struct(proc, struct BLOCK, data);
-    if (data->var == 0) return 0;
+    if (data->var == 0) return FIX2INT(-1);
     switch (nd_type(data->var)) {
       default:
-	return INT2FIX(-1);
+	return INT2FIX(-2);
       case NODE_MASGN:
 	list = data->var->nd_head;
 	n = 0;
 	while (list) {
 	    n++;
 	    list = list->nd_next;
 	}
-	if (data->var->nd_args) return INT2FIX(-n);
+	if (data->var->nd_args) return INT2FIX(-n-1);
 	return INT2FIX(n);
     }
 }
@@ -5717,7 +5717,7 @@ method_arity(method)
 	    body = body->nd_head;
 	if (!body) return INT2FIX(0);
 	n = body->nd_cnt;
-	if (body->nd_rest) n = -n;
+	if (body->nd_rest) n = -n-1;
 	return INT2FIX(n);
     }
 }
diff --git a/numeric.c b/numeric.c
@@ -1100,7 +1100,7 @@ static VALUE
 fix_rev(num)
     VALUE num;
 {
-    unsigned long val = FIX2ULONG(num);
+    long val = FIX2LONG(num);
 
     val = ~val;
     return rb_int2inum(val);

Original file line number	Diff line number	Diff line change
`@@ -5523,18 +5523,18 @@ proc_arity(proc)`
`5523`	`5523`	`int n;`
`5524`	`5524`
`5525`	`5525`	`Data_Get_Struct(proc, struct BLOCK, data);`
`5526`		`- if (data->var == 0) return 0;`
	`5526`	`+ if (data->var == 0) return FIX2INT(-1);`
`5527`	`5527`	`switch (nd_type(data->var)) {`
`5528`	`5528`	`default:`
`5529`		`- return INT2FIX(-1);`
	`5529`	`+ return INT2FIX(-2);`
`5530`	`5530`	`case NODE_MASGN:`
`5531`	`5531`	`list = data->var->nd_head;`
`5532`	`5532`	`n = 0;`
`5533`	`5533`	`while (list) {`
`5534`	`5534`	`n++;`
`5535`	`5535`	`list = list->nd_next;`
`5536`	`5536`	`}`
`5537`		`- if (data->var->nd_args) return INT2FIX(-n);`
	`5537`	`+ if (data->var->nd_args) return INT2FIX(-n-1);`
`5538`	`5538`	`return INT2FIX(n);`
`5539`	`5539`	`}`
`5540`	`5540`	`}`
`@@ -5717,7 +5717,7 @@ method_arity(method)`
`5717`	`5717`	`body = body->nd_head;`
`5718`	`5718`	`if (!body) return INT2FIX(0);`
`5719`	`5719`	`n = body->nd_cnt;`
`5720`		`- if (body->nd_rest) n = -n;`
	`5720`	`+ if (body->nd_rest) n = -n-1;`
`5721`	`5721`	`return INT2FIX(n);`
`5722`	`5722`	`}`
`5723`	`5723`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1100,7 +1100,7 @@ static VALUE`
`1100`	`1100`	`fix_rev(num)`
`1101`	`1101`	`VALUE num;`
`1102`	`1102`	`{`
`1103`		`- unsigned long val = FIX2ULONG(num);`
	`1103`	`+ long val = FIX2LONG(num);`
`1104`	`1104`
`1105`	`1105`	`val = ~val;`
`1106`	`1106`	`return rb_int2inum(val);`