[ruby-dev:26679] Re: SEGV at zsuper with anonymous rest args.

なかだです。

At Sun, 31 Jul 2005 12:42:34 +0900,
H.Yamamoto wrote in [ruby-dev:26661]:
> うーん、まだ落ちます。

とりあえずこれではどうでしょうか。なんかまだオプショナル引数あ
るとおかしいような気もしますが。


Index: eval.c
===================================================================
RCS file: /cvs/ruby/src/ruby/eval.c,v
retrieving revision 1.808
diff -U2 -p -r1.808 eval.c
--- eval.c	29 Jul 2005 00:59:55 -0000	1.808
+++ eval.c	1 Aug 2005 06:49:17 -0000
@@ -1106,5 +1106,5 @@ static VALUE module_setup _((VALUE,NODE*
 static VALUE massign _((VALUE,NODE*,VALUE,int));
 static void assign _((VALUE,NODE*,VALUE,int));
-static void formal_assign _((VALUE, NODE*, int, VALUE*, VALUE*));
+static int formal_assign _((VALUE, NODE*, int, VALUE*, VALUE*));
 
 typedef struct event_hook {
@@ -5716,5 +5716,5 @@ call_cfunc(func, recv, len, argc, argv)
 }
 
-static void
+static int
 formal_assign(recv, node, argc, argv, local_vars)
     VALUE recv;
@@ -5767,4 +5767,5 @@ formal_assign(recv, node, argc, argv, lo
 	    assign(recv, opt->nd_head, *argv, 1);
 	    argv++; argc--;
+	    ++i;
 	    opt = opt->nd_next;
 	}
@@ -5773,5 +5774,5 @@ formal_assign(recv, node, argc, argv, lo
 	}
     }
-    if (RTEST(node->nd_rest)) {
+    if (node->nd_rest) {
 	VALUE v;
 
@@ -5781,5 +5782,7 @@ formal_assign(recv, node, argc, argv, lo
 	    v = rb_ary_new2(0);
 	assign(recv, node->nd_rest, v, 1);
+	if (argc > 0) return -i - 1;
     }
+    return i;
 }
 
@@ -5924,8 +5927,5 @@ rb_call0(klass, recv, id, oid, argc, arg
 		}
 		if (node) {
-		    formal_assign(recv, node, argc, argv, local_vars);
-		    if (RTEST(node->nd_rest)) {
-			ruby_frame->argc = -(ruby_frame->argc - argc)-1;
-		    }
+		    ruby_frame->argc = formal_assign(recv, node, argc, argv, local_vars);
 		}
 
Index: parse.y
===================================================================
RCS file: /cvs/ruby/src/ruby/parse.y,v
retrieving revision 1.398
diff -U2 -p -r1.398 parse.y
--- parse.y	29 Jul 2005 00:58:14 -0000	1.398
+++ parse.y	1 Aug 2005 06:32:49 -0000
@@ -4170,5 +4170,10 @@ f_rest_arg	: restarg_mark tIDENTIFIER
 		    {
 		    /*%%%*/
-			$$ = (NODE*)Qnil;
+			if (dyna_in_block()) {
+			    $$ = NEW_DASGN_CURR(internal_id(), 0);
+			}
+			else {
+			    $$ = NEW_NODE(NODE_LASGN,0,0,local_append(0));
+			}
 		    /*%
 			$$ = dispatch1(restparam, Qnil);


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦