diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | compile.c | 4 | ||||
| -rw-r--r-- | insns.def | 2 | ||||
| -rw-r--r-- | test/ruby/test_lambda.rb | 7 | ||||
| -rw-r--r-- | version.h | 6 |
5 files changed, 22 insertions, 6 deletions
@@ -1,3 +1,12 @@ +Sun Feb 26 12:26:26 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. + Sat Feb 25 23:47:49 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * file.c (utime_internal): fix a variable missed to replace. @@ -208,7 +208,7 @@ r_value(VALUE value) ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)INT2FIX(0)) #define ADD_CALL_RECEIVER(seq, line) \ - ADD_INSN((seq), (line), putnil) + ADD_INSN((seq), (line), putself) #define ADD_CALL(seq, line, id, argc) \ ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)INT2FIX(VM_CALL_FCALL_BIT)) @@ -5052,7 +5052,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) /* compile same as lambda{...} */ VALUE block = NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, nd_line(node)); 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); if (poped) { @@ -1009,7 +1009,7 @@ send ID id = op_id; /* get receiver */ - recv = (flag & VM_CALL_FCALL_BIT) ? GET_SELF() : TOPN(num); + recv = TOPN(num); klass = CLASS_OF(recv); me = vm_method_search(id, klass, ic); CALL_METHOD(num, blockptr, flag, id, me, recv); diff --git a/test/ruby/test_lambda.rb b/test/ruby/test_lambda.rb index 02bb26939d..ae12c6d609 100644 --- a/test/ruby/test_lambda.rb +++ b/test/ruby/test_lambda.rb @@ -63,4 +63,11 @@ class TestLambdaParameters < Test::Unit::TestCase def foo assert_equal(nil, ->(&b){ b }.call) 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 @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 149 +#define RUBY_PATCHLEVEL 150 -#define RUBY_RELEASE_DATE "2012-02-25" +#define RUBY_RELEASE_DATE "2012-02-26" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_DAY 26 #include "ruby/version.h" |