* eval.c (rb_eval, eval): make line number consistent on eval with

  Proc.  [ruby-talk:101253]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f3acd620..6671ef0f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
diff --git a/eval.c b/eval.c
index ada023fff..43a85cd84 100644
--- a/eval.c
+++ b/eval.c
@@ -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;