diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-16 12:46:17 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-16 12:46:17 +0000 |
commit | 8bd4d73e85e09be3d7d96660853d6ae09541be8b (patch) | |
tree | dba5a5a4e5f0d1885077ed4798b8275d5a7cf8da /vm_eval.c | |
parent | 2479d4264ec55578d1629ba6762de85cb5004553 (diff) |
merges r27817 from trunk into ruby_1_9_2.
--
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_eval.c')
-rw-r--r-- | vm_eval.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; } |