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

* compile.c (iseq_compile_each): call on special object instead of

Browse Source 
self.  since stabby lambda is a syntax, so it should not be
  affected by the context.  [ruby-core:42349][Bug #5966]
* insns.def (send): no special deal for FCALL.  self should be put
  on TOS instead.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-02-26 02:26:49 +00:00
parent 767848e0b7
commit 6a8d009709
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Sun Feb 26 11:26:44 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (iseq_compile_each): call on special object instead of
self. since stabby lambda is a syntax, so it should not be
affected by the context. [ruby-core:42349][Bug #5966]
* insns.def (send): no special deal for FCALL. self should be put
on TOS instead.
Sun Feb 26 05:35:43 2012 NARUSE, Yui <naruse@ruby-lang.org> Sun Feb 26 05:35:43 2012 NARUSE, Yui <naruse@ruby-lang.org>
* error.c (report_bug): use buf and snprintf to avoid consuming stack. * error.c (report_bug): use buf and snprintf to avoid consuming stack.

4
compile.c
View File

@ -208,7 +208,7 @@ r_value(VALUE value)
ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)INT2FIX(0)) ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)INT2FIX(0))
#define ADD_CALL_RECEIVER(seq, line) \ #define ADD_CALL_RECEIVER(seq, line) \
ADD_INSN((seq), (line), putnil) ADD_INSN((seq), (line), putself)
#define ADD_CALL(seq, line, id, argc) \ #define ADD_CALL(seq, line, id, argc) \
ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)INT2FIX(VM_CALL_FCALL_BIT)) ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)INT2FIX(VM_CALL_FCALL_BIT))
@ -5098,7 +5098,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
/* compile same as lambda{...} */ /* compile same as lambda{...} */
VALUE block = NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, nd_line(node)); VALUE block = NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, nd_line(node));
VALUE argc = INT2FIX(0); VALUE argc = INT2FIX(0);
ADD_CALL_RECEIVER(ret, nd_line(node)); ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
ADD_CALL_WITH_BLOCK(ret, nd_line(node), ID2SYM(idLambda), argc, block); ADD_CALL_WITH_BLOCK(ret, nd_line(node), ID2SYM(idLambda), argc, block);
if (poped) { if (poped) {

2
insns.def
View File

@ -1012,7 +1012,7 @@ send
ID id = op_id; ID id = op_id;
/* get receiver */ /* get receiver */
recv = (flag & VM_CALL_FCALL_BIT) ? GET_SELF() : TOPN(num); recv = TOPN(num);
klass = CLASS_OF(recv); klass = CLASS_OF(recv);
me = vm_method_search(id, klass, ic); me = vm_method_search(id, klass, ic);
CALL_METHOD(num, blockptr, flag, id, me, recv); CALL_METHOD(num, blockptr, flag, id, me, recv);

7
test/ruby/test_lambda.rb
View File

@ -63,4 +63,11 @@ class TestLambdaParameters < Test::Unit::TestCase
def foo def foo
assert_equal(nil, ->(&b){ b }.call) assert_equal(nil, ->(&b){ b }.call)
end end
def test_in_basic_object
bug5966 = '[ruby-core:42349]'
called = false
BasicObject.new.instance_eval {->() {called = true}.()}
assert_equal(true, called, bug5966)
end
end end