From 0ed97584549db7b9a8cc35b9765da759385ccaf1 Mon Sep 17 00:00:00 2001 From: matz Date: Sun, 6 Jun 2004 08:43:56 +0000 Subject: [PATCH] * 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/branches/ruby_1_8@6430 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ eval.c | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea26b16fa8..2840ecf386 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,12 @@ Wed Jun 2 12:41:53 2004 Yukihiro Matsumoto * io.c (rb_io_gets_m): set lastline ($_) even when read line is nil. [ruby-dev:23663] +Fri May 28 11:20:31 2004 Nobuyoshi Nakada + + * eval.c (rb_eval): bad influence on frame node. + + * eval.c (eval): reverted wrongly removed condition. [ruby-dev:23638] + Thu May 27 23:15:18 2004 NAKAMURA, Hiroshi * lib/logger.rb: leading 0 padding of timestamp usec part. diff --git a/eval.c b/eval.c index 43a85cd840..e837a9be5f 100644 --- a/eval.c +++ b/eval.c @@ -2964,7 +2964,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 { @@ -6056,7 +6055,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); @@ -8053,7 +8052,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; @@ -8069,7 +8067,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];