naruse	2011-06-17 19:18:39 +0900 (Fri, 17 Jun 2011)

  New Revision: 32146

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32146

  Log:
    * compile.c (iseq_compile_each): fix return value of obj[a,*b]=c.

  Modified files:
    trunk/ChangeLog
    trunk/bootstraptest/test_method.rb
    trunk/compile.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32145)
+++ ChangeLog	(revision 32146)
@@ -1,3 +1,7 @@
+Fri Jun 17 18:57:36 2011  NARUSE, Yui  <naruse@r...>
+
+	* compile.c (iseq_compile_each): fix return value of obj[a,*b]=c.
+
 Fri Jun 17 13:09:45 2011  Eric Hodel  <drbrain@s...>
 
 	* ext/curses/curses.c:  Clean up documentation.
Index: bootstraptest/test_method.rb
===================================================================
--- bootstraptest/test_method.rb	(revision 32145)
+++ bootstraptest/test_method.rb	(revision 32146)
@@ -402,6 +402,10 @@
 $result
 }
 
+# aset and splat
+assert_equal '4', %q{class Foo;def []=(a,b,c,d);end;end;Foo.new[1,*a=[2,3]]=4}
+assert_equal '4', %q{class Foo;def []=(a,b,c,d);end;end;def m(&blk)Foo.new[1,*a=[2,3],&blk]=4;end;m{}}
+
 # post test
 assert_equal %q{[1, 2, :o1, :o2, [], 3, 4, NilClass, nil, nil]}, %q{
 def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
Index: compile.c
===================================================================
--- compile.c	(revision 32145)
+++ compile.c	(revision 32146)
@@ -4968,9 +4968,20 @@
 
 	    if (flag & VM_CALL_ARGS_BLOCKARG_BIT) {
 		ADD_INSN1(ret, nd_line(node), topn, INT2FIX(1));
+		if (flag & VM_CALL_ARGS_SPLAT_BIT) {
+		    ADD_INSN1(ret, nd_line(node), putobject, INT2FIX(-1));
+		    ADD_SEND(ret, nd_line(node), ID2SYM(idAREF), INT2FIX(1));
+		}
 		ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 3));
 		ADD_INSN (ret, nd_line(node), pop);
 	    }
+	    else if (flag & VM_CALL_ARGS_SPLAT_BIT) {
+		ADD_INSN(ret, nd_line(node), dup);
+		ADD_INSN1(ret, nd_line(node), putobject, INT2FIX(-1));
+		ADD_SEND(ret, nd_line(node), ID2SYM(idAREF), INT2FIX(1));
+		ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 2));
+		ADD_INSN (ret, nd_line(node), pop);
+	    }
 	    else {
 		ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 1));
 	    }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/