* eval.c (rb_load): should preserve current source file/line.

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

2 files changed, 13 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index b064a14cf..e86337b2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug  5 15:47:34 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_load): should preserve current source file/line.
+
 Mon Aug  4 17:25:18 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* stable version 1.8.0 released.
diff --git a/eval.c b/eval.c
index 35fed1413..acfb22068 100644
--- a/eval.c
+++ b/eval.c
@@ -5715,6 +5715,7 @@ rb_load(fname, wrap)
     volatile ID last_func;
     volatile VALUE wrapper = 0;
     volatile VALUE self = ruby_top_self;
+    NODE *volatile last_node;
     NODE *saved_cref = ruby_cref;
     TMP_PROTECT;
 
@@ -5759,6 +5760,11 @@ rb_load(fname, wrap)
     PUSH_TAG(PROT_NONE);
     state = EXEC_TAG();
     last_func = ruby_frame->last_func;
+    last_node = ruby_current_node;
+    if (!ruby_current_node && ruby_sourcefile) {
+	last_node = NEW_NEWLINE(0);
+    }
+    ruby_current_node = 0;
     if (state == 0) {
 	NODE *node;
 	volatile int critical;
@@ -5777,6 +5783,9 @@ rb_load(fname, wrap)
     }
     ALLOW_INTS;
     ruby_frame->last_func = last_func;
+    ruby_current_node = last_node;
+    ruby_sourcefile = 0;
+    ruby_set_current_source();
     if (ruby_scope->flags == SCOPE_ALLOCA && ruby_class == rb_cObject) {
 	if (ruby_scope->local_tbl) /* toplevel was empty */
 	    free(ruby_scope->local_tbl);