* eval.c (rb_eval): bad influence on frame node.

* eval.c (eval): reverted wrongly removed condition.  [ruby-dev:23638]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 8 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 40b4a1e0e7..1a5d821ca3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri May 28 11:20:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval): bad influence on frame node.
+
+	* eval.c (eval): reverted wrongly removed condition.  [ruby-dev:23638]
+
 Thu May 27 21:37:50 2004  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pathname.rb (Pathname#initialize): fix pathname initialization
@@ -11,7 +17,7 @@ Thu May 27 15:54:02 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/ftp.rb (MDTM_REGEXP): fix for demon's ftp server.
 	Thanks, Rutger Nijlunsing.
-	
+
 Thu May 27 14:53:13 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* io.c (rb_io_fwrite): workaround for bcc32's fwrite bug.
diff --git a/eval.c b/eval.c
index 8af47bba9b..76178c998b 100644
--- a/eval.c
+++ b/eval.c
@@ -2931,7 +2931,6 @@ 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 {
@@ -6043,7 +6042,7 @@ 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)) {
+	if ((file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) && data->frame.node) {
 	    file = data->frame.node->nd_file;
 	    if (!file) file = "__builtin__";
 	    line = nd_line(data->frame.node);
@@ -8033,7 +8032,6 @@ proc_invoke(proc, args, self, klass)
     struct BLOCK *data;
     volatile VALUE result = Qundef;
     int state;
-    volatile int orphan;
     volatile int safe = ruby_safe_level;
     volatile VALUE old_wrapper = ruby_wrapper;
     struct RVarmap * volatile old_dvars = ruby_dyna_vars;
@@ -8048,7 +8046,6 @@ proc_invoke(proc, args, self, klass)
 
     Data_Get_Struct(proc, struct BLOCK, data);
     pcall = (data->flags & BLOCK_LAMBDA) ? YIELD_LAMBDA_CALL : 0;
-//    orphan = pcall ? 0 : block_orphan(data);
     if (!pcall && RARRAY(args)->len == 1) {
 	avalue = Qfalse;
 	args = RARRAY(args)->ptr[0];