kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r27716 from trunk into ruby_1_9_2.

Browse source 
--
* vm_eval.c (eval_string_with_cref): propagative filename and line_no
  of binding.  [ruby-dev:38767] [ruby-core:28307]

* vm_core.h (rb_binding_t), proc.c: add filename and line_no fields to
  preserve them.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-05-16 03:07:45 +00:00
parent ee56b16552
commit a81daa6833
5 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Mon May 10 03:36:56 2010 Yusuke Endoh <mame@tsg.ne.jp>
* vm_eval.c (eval_string_with_cref): propagative filename and line_no
of binding. [ruby-dev:38767] [ruby-core:28307]
* vm_core.h (rb_binding_t), proc.c: add filename and line_no fields to
preserve them.
Mon May 10 02:29:51 2010 Yusuke Endoh <mame@tsg.ne.jp>
* cont.c (fiber_switch): raise FiberError when returning to dead

2
bootstraptest/test_eval.rb
View file

@ -287,7 +287,7 @@ assert_normal_exit %q{
eval("", method(:proc).call {}.binding)
}
assert_equal "(eval):1:in `block in <main>': ", %q{
assert_equal "", %q{
b = binding
10.times{
eval('', b)

7
proc.c
View file

@ -254,6 +254,7 @@ binding_mark(void *ptr)
if (ptr) {
bind = ptr;
RUBY_MARK_UNLESS_NULL(bind->env);
RUBY_MARK_UNLESS_NULL(bind->filename);
}
RUBY_MARK_LEAVE("binding");
}
@ -289,6 +290,8 @@ binding_dup(VALUE self)
GetBindingPtr(self, src);
GetBindingPtr(bindval, dst);
dst->env = src->env;
dst->filename = src->filename;
dst->line_no = src->line_no;
return bindval;
}
@ -315,6 +318,8 @@ rb_binding_new(void)
GetBindingPtr(bindval, bind);
bind->env = rb_vm_make_env_object(th, cfp);
bind->filename = cfp->iseq->filename;
bind->line_no = rb_vm_get_sourceline(cfp);
return bindval;
}
@ -1893,6 +1898,8 @@ 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);
return bindval;
}

2
vm_core.h
View file

@ -524,6 +524,8 @@ typedef struct {
typedef struct {
VALUE env;
VALUE filename;
unsigned short line_no;
} rb_binding_t;
/* used by compile time and send insn */

4
vm_eval.c
View file

@ -966,6 +966,10 @@ 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) {
file = RSTRING_PTR(bind->filename);
line = bind->line_no;
}
}
else {
rb_raise(rb_eTypeError,