1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32146 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2011-06-17 10:18:39 +00:00
parent becd789625
commit 021f166509
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Jun 17 18:57:36 2011 NARUSE, Yui <naruse@ruby-lang.org>
* compile.c (iseq_compile_each): fix return value of obj[a,*b]=c.
Fri Jun 17 13:09:45 2011 Eric Hodel <drbrain@segment7.net> Fri Jun 17 13:09:45 2011 Eric Hodel <drbrain@segment7.net>
* ext/curses/curses.c: Clean up documentation. * ext/curses/curses.c: Clean up documentation.

4
bootstraptest/test_method.rb
View File

@ -402,6 +402,10 @@ m(1,2,*ary,&b)
$result $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 # post test
assert_equal %q{[1, 2, :o1, :o2, [], 3, 4, NilClass, nil, nil]}, %q{ 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) def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)

11
compile.c
View File

@ -4968,9 +4968,20 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
if (flag & VM_CALL_ARGS_BLOCKARG_BIT) { if (flag & VM_CALL_ARGS_BLOCKARG_BIT) {
ADD_INSN1(ret, nd_line(node), topn, INT2FIX(1)); 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_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 3));
ADD_INSN (ret, nd_line(node), pop); 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 { else {
ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 1)); ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 1));
} }