nobu	2009-06-01 11:21:31 +0900 (Mon, 01 Jun 2009)

  New Revision: 23616

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

  Log:
    * cont.c (cont_capture, fiber_store): reraise transferred error.
    * cont.c (fiber_switch): transfers dead fiber error to the previouse
      or root fiber if the current fiber is dead.  [ruby-core:23651]

  Modified files:
    trunk/ChangeLog
    trunk/cont.c
    trunk/test/ruby/test_fiber.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23615)
+++ ChangeLog	(revision 23616)
@@ -1,3 +1,10 @@
+Mon Jun  1 11:21:29 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* cont.c (cont_capture, fiber_store): reraise transferred error.
+
+	* cont.c (fiber_switch): transfers dead fiber error to the previouse
+	  or root fiber if the current fiber is dead.  [ruby-core:23651]
+
 Mon Jun  1 10:41:41 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/intern.h (rb_exc_new2): optimization for literal.
Index: cont.c
===================================================================
--- cont.c	(revision 23615)
+++ cont.c	(revision 23616)
@@ -279,6 +279,7 @@
 	VALUE value;
 
 	value = cont->value;
+	if (cont->argc == -1) rb_exc_raise(value);
 	cont->value = Qnil;
 	*stat = 1;
 	return value;
@@ -850,6 +851,7 @@
     if (ruby_setjmp(fib->cont.jmpbuf)) {
 	/* restored */
 	GetFiberPtr(th->fiber, fib);
+	if (fib->cont.argc == -1) rb_exc_raise(fib->cont.value);
 	return fib->cont.value;
     }
     else {
@@ -875,7 +877,15 @@
 	rb_raise(rb_eFiberError, "fiber called across trap");
     }
     else if (fib->status == TERMINATED) {
-	rb_raise(rb_eFiberError, "dead fiber called");
+	value = rb_exc_new2(rb_eFiberError, "dead fiber called");
+	if (th->fiber != fibval) rb_exc_raise(value);
+	fibval = fib->prev;
+	if (NIL_P(fibval)) fibval = th->root_fiber;
+	GetFiberPtr(fibval, fib);
+	cont = &fib->cont;
+	cont->argc = -1;
+	cont->value = value;
+	cont_restore_0(cont, &value);
     }
 
     if (is_resume) {
@@ -886,7 +896,7 @@
     cont->value = make_passing_arg(argc, argv);
 
     if ((value = fiber_store(fib)) == Qundef) {
-	cont_restore_0(&fib->cont, &value);
+	cont_restore_0(cont, &value);
 	rb_bug("rb_fiber_resume: unreachable");
     }
 
Index: test/ruby/test_fiber.rb
===================================================================
--- test/ruby/test_fiber.rb	(revision 23615)
+++ test/ruby/test_fiber.rb	(revision 23616)
@@ -173,5 +173,10 @@
     fib.resume
     assert_equal(false, fib.alive?)
   end
+
+  def test_resume_self
+    f = Fiber.new {f.resume}
+    assert_raise(FiberError, '[ruby-core:23651]') {f.transfer}
+  end
 end
 

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