matz	2007-12-21 14:59:20 +0900 (Fri, 21 Dec 2007)

  New Revision: 14404

  Modified files:
    trunk/ChangeLog
    trunk/enumerator.c

  Log:
    * enumerator.c (enumerator_init_copy): prohibit cloning of
      generators since Fibers cannot be copied.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14404&r2=14403
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enumerator.c?r1=14404&r2=14403

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14403)
+++ ChangeLog	(revision 14404)
@@ -1,3 +1,8 @@
+Fri Dec 21 14:58:27 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* enumerator.c (enumerator_init_copy): prohibit cloning of
+	  generators since Fibers cannot be copied.
+
 Fri Dec 21 14:46:07 2007  Tanaka Akira  <akr@f...>
 
 	* io.c (Init_IO): define IO::BINARY even if O_BINARY is not exist.
Index: enumerator.c
===================================================================
--- enumerator.c	(revision 14403)
+++ enumerator.c	(revision 14404)
@@ -285,14 +285,20 @@
 static VALUE
 enumerator_init_copy(VALUE obj, VALUE orig)
 {
-    struct enumerator *ptr0 = enumerator_ptr(orig);
-    struct enumerator *ptr1 = enumerator_ptr(obj);
+    struct enumerator *ptr0, *ptr1;
 
+    ptr0 = enumerator_ptr(orig);
+    if (ptr1->fib) {
+	/* Fibers cannot be copied */
+	rb_raise(rb_eTypeError, "can't copy execution context");
+    }
+    ptr1 = enumerator_ptr(obj);
+
     ptr1->method = ptr0->method;
     ptr1->proc = ptr0->proc;
     ptr1->iter = ptr0->iter;
     ptr1->args = ptr0->args;
-    ptr1->fib  = ptr0->fib;
+    ptr1->fib  = 0;
 
     return obj;
 }

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