diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | eval.c | 7 |
2 files changed, 10 insertions, 4 deletions
@@ -1,6 +1,11 @@ +Wed May 26 14:19:42 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * eval.c (rb_eval, eval): make line number consistent on eval with + Proc. [ruby-talk:101253] + Wed May 26 13:59:17 2004 Dave Thomas <dave@pragprog.com> - * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::skip_for_variable): Allow for + * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::skip_for_variable): Allow for 'do' after for statement Wed May 26 13:56:03 2004 Dave Thomas <dave@pragprog.com> @@ -2964,6 +2964,7 @@ rb_eval(self, n) iter_retry: PUSH_ITER(ITER_PRE); if (nd_type(node) == NODE_ITER) { + ruby_frame->node = node; result = rb_eval(self, node->nd_iter); } else { @@ -6055,10 +6056,10 @@ eval(self, src, scope, file, line) ruby_cref = data->cref; old_wrapper = ruby_wrapper; ruby_wrapper = data->wrapper; - if ((file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) && data->body) { - file = data->body->nd_file; + if (file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) { + file = data->frame.node->nd_file; if (!file) file = "__builtin__"; - line = nd_line(data->body); + line = nd_line(data->frame.node); } self = data->self; |