ruby-dev

ワナベです。

08/04/21 に Yusuke ENDOH<mame@tsg.ne.jp> さんは書きました:
>  2008/04/21 9:57 SASADA Koichi <ko1@atdot.net>:
>  > これ，ぱっと例が出ないんですが，本当に大丈夫でしょうか．iseq に対
>  > するアクセスなので，副作用が．
>
> こんな感じのコードで挙動が変わりますね。

iseq に触らず、rb_block_t に cref を持たせるように書き直しました。
遠藤さんの書かれた例が動作するようにするため、1.8と同じように
instance_eval/module_eval のブロックに引数 self を与えるようにしています。
（yield_under(klass, self, rb_ary_new3(1, self))の部分）
問題がありましたらこの部分は無視してください。


Index: vm_core.h
===================================================================
--- vm_core.h	(revision 16174)
+++ vm_core.h	(working copy)
@@ -337,6 +337,7 @@
     VALUE *dfp;			/* share with method frame if it's only block */
     rb_iseq_t *iseq;
     VALUE proc;
+    NODE *cref;
 } rb_block_t;

 #define GetThreadPtr(obj, ptr) \
Index: eval.c
===================================================================
--- eval.c	(revision 16174)
+++ eval.c	(working copy)
@@ -1845,6 +1845,9 @@
 	block = *blockptr;
 	block.self = self;
 	*th->cfp->lfp = GC_GUARDED_PTR(&block);
+	stored_cref = block.cref;
+	block.cref = vm_cref_push(th, under, NOEX_PUBLIC);
+	block.cref->nd_file = stored_cref;
     }

     while (!RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) {
@@ -1922,7 +1925,7 @@
 	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)",
 		     argc);
 	}
-	return yield_under(klass, self, Qundef);
+	return yield_under(klass, self, rb_ary_new3(1, self));
     }
     else {
 	char *file = "(eval)";
Index: vm.c
===================================================================
--- vm.c	(revision 16174)
+++ vm.c	(working copy)
@@ -261,6 +261,7 @@
     env->block.lfp = cfp->lfp;
     env->block.dfp = cfp->dfp;
     env->block.iseq = cfp->iseq;
+    env->block.cref = 0;

     if (VMDEBUG &&
 	(!(cfp->lfp[-1] == Qnil ||
@@ -388,6 +389,7 @@
     proc->block.lfp = block->lfp;
     proc->block.dfp = block->dfp;
     proc->block.iseq = block->iseq;
+    proc->block.cref = 0;
     proc->block.proc = procval;
     proc->envval = envval;
     proc->safe_level = th->safe_level;
@@ -539,6 +541,8 @@
     return vm_call_super(GET_THREAD(), argc, argv);
 }

+void vm_cfp_svar_set(rb_thread_t *th, rb_control_frame_t *cfp, VALUE
key, VALUE val);
+
 /* C -> Ruby: block */

 static VALUE
@@ -568,6 +572,10 @@
 		      self, GC_GUARDED_PTR(block->dfp),
 		      iseq->iseq_encoded + opt_pc, cfp->sp + arg_size, block->lfp,
 		      iseq->local_size - arg_size);
+	if (block->cref) {
+	    vm_cfp_svar_set(th, th->cfp, 2, (VALUE)block->cref);
+	    block->cref = block->cref->nd_file;
+	}

 	val = vm_eval_body(th);
     }
Index: vm_insnhelper.c
===================================================================
--- vm_insnhelper.c	(revision 16174)
+++ vm_insnhelper.c	(working copy)
@@ -233,6 +233,7 @@
 	    blockptr = RUBY_VM_GET_BLOCK_PTR_IN_CFP(cfp);
 	    blockptr->iseq = blockiseq;
 	    blockptr->proc = 0;
+	    blockptr->cref = 0;
 	    *block = blockptr;
 	}
     }



-- 
ワナベ

Thread

Prev Next

In This Thread

Prev Next