* cont.c: check across trap violation.

* eval.c, yarvcore.h: ditto.



git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12382 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 2 deletions

diff --git a/cont.c b/cont.c
index 099cdde07..928f9381a 100644
--- a/cont.c
+++ b/cont.c
@@ -270,8 +270,9 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
     if (cont->saved_thread.value != th->value) {
 	rb_raise(rb_eRuntimeError, "continuation called across threads");
     }
-    /* TODO: check "continuation called across trap" */
-    printf("--> %p\n", cont);
+    if (cont->saved_thread.trap_tag != th->trap_tag) {
+	rb_raise(rb_eRuntimeError, "continuation called across trap");
+    }
 
     switch(argc) {
       case 0: