diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | proc.c | 10 | ||||
| -rw-r--r-- | vm_eval.c | 2 |
3 files changed, 16 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Sun May 16 17:16:09 2010 Yusuke Endoh <mame@tsg.ne.jp> + + * proc.c (proc_binding): don't propagative filename and line_no of + binding that is created from C level. [ruby-dev:41322] + + * vm_eval.c (eval_string_with_cref): ditto. + Sun May 16 15:09:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * dln.c (rb_w32_check_imported): check if extension library to be @@ -1897,8 +1897,14 @@ proc_binding(VALUE self) bindval = binding_alloc(rb_cBinding); GetBindingPtr(bindval, bind); bind->env = proc->envval; - bind->filename = proc->block.iseq->filename; - bind->line_no = rb_iseq_first_lineno(proc->block.iseq); + if (RUBY_VM_NORMAL_ISEQ_P(proc->block.iseq)) { + bind->filename = proc->block.iseq->filename; + bind->line_no = rb_iseq_first_lineno(proc->block.iseq); + } + else { + bind->filename = Qnil; + bind->line_no = 0; + } return bindval; } @@ -966,7 +966,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char if (rb_obj_is_kind_of(scope, rb_cBinding)) { GetBindingPtr(scope, bind); envval = bind->env; - if (strcmp(file, "(eval)") == 0) { + if (strcmp(file, "(eval)") == 0 && bind->filename != Qnil) { file = RSTRING_PTR(bind->filename); line = bind->line_no; } |