From 74ab20eb3756f0061c89c2acda5ac972bd9cf69e Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 26 May 2004 05:19:50 +0000 Subject: * eval.c (rb_eval, eval): make line number consistent on eval with Proc. [ruby-talk:101253] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index 6158bf2720..8af47bba9b 100644 --- a/eval.c +++ b/eval.c @@ -2931,6 +2931,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 { @@ -6042,10 +6043,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; -- cgit v1.2.3