nobu	2012-01-30 19:08:23 +0900 (Mon, 30 Jan 2012)

  New Revision: 34399

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

  Log:
    * vm_eval.c (vm_call0): should pass block to enumerators.  patched
      by Kazuki Tsujimoto.  [ruby-dev:44961][Bug #5731]
    * vm_eval.c (method_missing), vm_insnhelper.c (vm_call_method):
      ditto.  patched by satoshi shiba.

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_object.rb
    trunk/vm_eval.c
    trunk/vm_insnhelper.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34398)
+++ ChangeLog	(revision 34399)
@@ -1,3 +1,11 @@
+Mon Jan 30 19:08:19 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* vm_eval.c (vm_call0): should pass block to enumerators.  patched
+	  by Kazuki Tsujimoto.  [ruby-dev:44961][Bug #5731]
+
+	* vm_eval.c (method_missing), vm_insnhelper.c (vm_call_method):
+	  ditto.  patched by satoshi shiba.
+
 Mon Jan 30 12:31:05 2012  NAKAMURA Usaku  <usa@r...>
 
 	* file.c (append_fspath): need to set the encoding to result always.
Index: vm_eval.c
===================================================================
--- vm_eval.c	(revision 34398)
+++ vm_eval.c	(revision 34399)
@@ -118,6 +118,7 @@
 
 	RB_GC_GUARD(new_args);
 	rb_ary_unshift(new_args, ID2SYM(id));
+	th->passed_block = blockptr;
 	return rb_funcall2(recv, idMethodMissing,
 			   argc+1, RARRAY_PTR(new_args));
       }
@@ -563,6 +564,7 @@
 {
     VALUE *nargv, result, argv_ary = 0;
     rb_thread_t *th = GET_THREAD();
+    const rb_block_t *blockptr = th->passed_block;
 
     th->method_missing_reason = call_status;
     th->passed_block = 0;
@@ -589,6 +591,7 @@
     if (rb_method_basic_definition_p(CLASS_OF(obj) , idMethodMissing)) {
 	raise_method_missing(th, argc+1, nargv, obj, call_status | NOEX_MISSING);
     }
+    th->passed_block = blockptr;
     result = rb_funcall2(obj, idMethodMissing, argc + 1, nargv);
     if (argv_ary) rb_ary_clear(argv_ary);
     return result;
Index: vm_insnhelper.c
===================================================================
--- vm_insnhelper.c	(revision 34398)
+++ vm_insnhelper.c	(revision 34399)
@@ -599,6 +599,7 @@
 		argv[0] = ID2SYM(me->def->original_id);
 		MEMCPY(argv+1, cfp->sp - num, VALUE, num);
 		cfp->sp += - num - 1;
+		th->passed_block = blockptr;
 		val = rb_funcall2(recv, rb_intern("method_missing"), num+1, argv);
 		break;
 	      }
Index: test/ruby/test_object.rb
===================================================================
--- test/ruby/test_object.rb	(revision 34398)
+++ test/ruby/test_object.rb	(revision 34399)
@@ -446,6 +446,57 @@
     assert_equal([[:respond_to?, :to_ary, true]], called, bug5158)
   end
 
+  def test_method_missing_passed_block
+    bug5731 = '[ruby-dev:44961]'
+
+    c = Class.new do
+      def method_missing(meth, *args) yield(meth, *args) end
+    end
+    a = c.new
+    result = nil
+    assert_nothing_raised(LocalJumpError, bug5731) do
+      a.foo {|x| result = x}
+    end
+    assert_equal(:foo, result, bug5731)
+    result = nil
+    e = a.enum_for(:foo)
+    assert_nothing_raised(LocalJumpError, bug5731) do
+      e.each {|x| result = x}
+    end
+    assert_equal(:foo, result, bug5731)
+
+    c = Class.new do
+      def respond_to_missing?(id, priv)
+        true
+      end
+      def method_missing(id, *args, &block)
+        return block.call(:foo, *args)
+      end
+    end
+    foo = c.new
+
+    result = nil
+    assert_nothing_raised(LocalJumpError, bug5731) do
+      foo.foobar {|x| result = x}
+    end
+    assert_equal(:foo, result, bug5731)
+    result = nil
+    assert_nothing_raised(LocalJumpError, bug5731) do
+      foo.enum_for(:foobar).each {|x| result = x}
+    end
+    assert_equal(:foo, result, bug5731)
+
+    result = nil
+    foobar = foo.method(:foobar)
+    foobar.call {|x| result = x}
+    assert_equal(:foo, result, bug5731)
+
+    result = nil
+    foobar = foo.method(:foobar)
+    foobar.enum_for(:call).each {|x| result = x}
+    assert_equal(:foo, result, bug5731)
+  end
+
   def test_send_with_no_arguments
     assert_raise(ArgumentError) { 1.send }
   end

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